Merge pull request #7895 from tchak/feat-active-job-request-id

feat(jobs): add request_id to jobs payload

app/controllers/application_controller.rb

@@ -24,6 +24,10 @@ class ApplicationController < ActionController::Base
   helper_method :multiple_devise_profile_connect?, :instructeur_signed_in?, :current_instructeur, :current_expert, :expert_signed_in?,
     :administrateur_signed_in?, :current_administrateur, :current_account, :localization_enabled?, :set_locale
 
+  before_action do
+    Current.request_id = request.uuid
+  end
+
   def staging_authenticate
     if StagingAuthService.enabled? && !authenticate_with_http_basic { |username, password| StagingAuthService.authenticate(username, password) }
       request_http_basic_authentication

app/jobs/application_job.rb

@@ -3,11 +3,13 @@ class ApplicationJob < ActiveJob::Base
 
   DEFAULT_MAX_ATTEMPTS_JOBS = 25
 
-  before_perform do |job|
+  attr_writer :request_id
-    Rails.logger.info("#{job.class.name} started at #{Time.zone.now}")
-  end
 
-  after_perform do |job|
+  around_perform do |job, block|
+    Rails.logger.info("#{job.class.name} started at #{Time.zone.now}")
+    Current.set(request_id: job.request_id) do
+      block.call
+    end
     Rails.logger.info("#{job.class.name} ended at #{Time.zone.now}")
   end
 
@@ -18,4 +20,17 @@ class ApplicationJob < ActiveJob::Base
   def max_attempts
     ENV.fetch("MAX_ATTEMPTS_JOBS", DEFAULT_MAX_ATTEMPTS_JOBS).to_i
   end
+
+  def request_id
+    @request_id ||= Current.request_id
+  end
+
+  def serialize
+    super.merge('request_id' => request_id)
+  end
+
+  def deserialize(job_data)
+    super
+    self.request_id = job_data['request_id']
+  end
 end

app/models/current.rb

@@ -1,3 +1,3 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :instructeur, :administrateur
+  attribute :instructeur, :administrateur, :request_id
 end