Merge pull request #55922 from Shopify/event_subscriber_additionss

Add missing structured event data for logs

Author: gmcgibbon

actionpack/lib/action_controller/structured_event_subscriber.rb

@@ -34,6 +34,7 @@ def process_action(event)
         controller: payload[:controller],
         action: payload[:action],
         status: status,
+        **additions_for(payload),
         duration_ms: event.duration.round(2),
         gc_time_ms: event.gc_time.round(1),
       }.compact)
@@ -101,6 +102,10 @@ def fragment_cache(method_name, event)
           duration_ms: event.duration.round(1)
         )
       end
+
+      def additions_for(payload)
+        payload.slice(:view_runtime, :db_runtime, :queries_count, :cached_queries_count)
+      end
   end
 end
 

activejob/lib/active_job/structured_event_subscriber.rb

@@ -64,7 +64,9 @@ def enqueue_all(event)
         job_count: jobs.size,
         enqueued_count: enqueued_count,
         failed_enqueue_count: failed_count,
-        enqueued_classes: jobs.filter_map { |job| job.class.name }.tally
+        enqueued_classes: jobs.filter_map do |job|
+          job.class.name if jobs.count == enqueued_count || job.successfully_enqueued?
+        end.tally
       )
     end
 
@@ -85,10 +87,12 @@ def perform_start(event)
     def perform(event)
       job = event.payload[:job]
       exception = event.payload[:exception_object]
+      adapter = event.payload[:adapter]
       payload = {
         job_class: job.class.name,
         job_id: job.job_id,
         queue: job.queue_name,
+        adapter: ActiveJob.adapter_name(adapter),
         aborted: event.payload[:aborted],
         duration: event.duration.round(2),
       }

activejob/test/cases/structured_event_subscriber_test.rb

@@ -159,6 +159,7 @@ def test_perform_failed_job
         end
       end
 
+      assert event[:payload][:exception_backtrace].is_a?(Array)
       assert event[:payload][:job_id].present?
       assert event[:payload][:duration].is_a?(Numeric)
     end
@@ -173,6 +174,7 @@ def test_enqueue_failed_job
       assert_event_reported("active_job.enqueued", payload: {
         job_class: failing_enqueue_job_class.name,
         queue: "default",
+        adapter: ActiveJob.adapter_name(ActiveJob::Base.queue_adapter),
         exception_class: "StandardError",
         exception_message: "Enqueue failed"
       }) do
@@ -192,6 +194,7 @@ def test_enqueue_aborted_job
       assert_event_reported("active_job.enqueued", payload: {
         job_class: aborting_enqueue_job_class.name,
         queue: "default",
+        adapter: ActiveJob.adapter_name(ActiveJob::Base.queue_adapter),
         aborted: true,
       }) do
         aborting_enqueue_job_class.perform_later

activerecord/lib/active_record/structured_event_subscriber.rb

@@ -12,7 +12,7 @@ def strict_loading_violation(event)
 
       emit_debug_event("active_record.strict_loading_violation",
         owner: owner.name,
-        class: reflection.klass.name,
+        class: reflection.polymorphic? ? nil : reflection.klass.name,
         name: reflection.name,
       )
     end