Add execution_id to the Sidekiq middleware

This means that all jobs will have improved logging:
- `jid` is the same across retry runs of the same job (this already
  existed in the previous implementation). This is now also sent to 
  Sentry.
- `execution_id` is the replacement for `tx_id`. This changes between
  retry runs, but still doesn't tag the `Start #perform` and
  `Completed #perform` log messages. This is seemingly much more
  difficult.

Jira-Issue: MAV-4085

Author: alistair-white-horne-tng

app/jobs/gias_import_job.rb

@@ -6,17 +6,11 @@ class GIASImportJob < ApplicationJob
   queue_as :third_party_data_imports
 
   def perform(dry_run: false)
-    tx_id = SecureRandom.urlsafe_base64(16)
+    GIAS.download
 
-    SemanticLogger.tagged(tx_id:, job_id:) do
-      Sentry.set_tags(tx_id:, job_id:)
+    results = GIAS.check_import
+    GIAS.log_import_check_results(results)
 
-      GIAS.download
-
-      results = GIAS.check_import
-      GIAS.log_import_check_results(results)
-
-      GIAS.import unless dry_run
-    end
+    GIAS.import unless dry_run
   end
 end

app/jobs/search_vaccination_records_in_nhs_job.rb

@@ -14,46 +14,40 @@ def perform(patient_id)
       return
     end
 
-    tx_id = SecureRandom.urlsafe_base64(16)
+    @programmes = Programme.all_as_variants
 
-    SemanticLogger.tagged(tx_id:, job_id:) do
-      Sentry.set_tags(tx_id:, job_id:)
+    return unless feature_flags_enabled
 
-      @programmes = Programme.all_as_variants
-
-      return unless feature_flags_enabled
-
-      existing_vaccination_records.find_each do |vaccination_record|
-        incoming_vaccination_record =
-          incoming_vaccination_records.find do
-            it.nhs_immunisations_api_id ==
-              vaccination_record.nhs_immunisations_api_id
-          end
+    existing_vaccination_records.find_each do |vaccination_record|
+      incoming_vaccination_record =
+        incoming_vaccination_records.find do
+          it.nhs_immunisations_api_id ==
+            vaccination_record.nhs_immunisations_api_id
+        end
 
-        if incoming_vaccination_record
-          vaccination_record.update!(
-            incoming_vaccination_record
-              .attributes
-              .except("id", "uuid", "created_at")
-              .merge(updated_at: Time.current)
-          )
+      if incoming_vaccination_record
+        vaccination_record.update!(
+          incoming_vaccination_record
+            .attributes
+            .except("id", "uuid", "created_at")
+            .merge(updated_at: Time.current)
+        )
 
-          incoming_vaccination_records.delete(incoming_vaccination_record)
-        else
-          vaccination_record.destroy!
-        end
+        incoming_vaccination_records.delete(incoming_vaccination_record)
+      else
+        vaccination_record.destroy!
       end
+    end
 
-      # Remaining incoming_vaccination_records are new
-      incoming_vaccination_records.each(&:save!)
+    # Remaining incoming_vaccination_records are new
+    incoming_vaccination_records.each(&:save!)
 
-      update_vaccination_search_timestamps if patient.nhs_number.present?
+    update_vaccination_search_timestamps if patient.nhs_number.present?
 
-      PatientStatusUpdater.call(patient:)
+    PatientStatusUpdater.call(patient:)
 
-      incoming_vaccination_records.each do |vaccination_record|
-        AlreadyHadNotificationSender.call(vaccination_record:)
-      end
+    incoming_vaccination_records.each do |vaccination_record|
+      AlreadyHadNotificationSender.call(vaccination_record:)
     end
   end
 

app/jobs/sync_vaccination_record_to_nhs_job.rb

@@ -10,12 +10,6 @@ def perform(vaccination_record_id)
       return
     end
 
-    tx_id = SecureRandom.urlsafe_base64(16)
-
-    SemanticLogger.tagged(tx_id:, job_id:) do
-      Sentry.set_tags(tx_id:, job_id:)
-
-      NHS::ImmunisationsAPI.sync_immunisation(vaccination_record)
-    end
+    NHS::ImmunisationsAPI.sync_immunisation(vaccination_record)
   end
 end

config/initializers/sidekiq.rb

@@ -19,6 +19,19 @@
 
   config.server_middleware do |chain|
     chain.add SidekiqUniqueJobs::Middleware::Server
+
+    chain.add(
+      Class.new do
+        def call(_worker, job, _queue)
+          execution_id = SecureRandom.urlsafe_base64(8)
+
+          SemanticLogger.tagged(execution_id:) do
+            Sentry.set_tags(execution_id:, jid: job["jid"])
+            yield
+          end
+        end
+      end
+    )
   end
 
   SidekiqUniqueJobs::Server.configure(config)