plain_apm 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73fd2b68ac333b85c9447cf1bfab720a5c292a325dc13eb4ba5775c2381aa9b3
-  data.tar.gz: 3cdd0a76f806988f0687e121087837fdf91d4743858c322a8e18501908434a5f
+  metadata.gz: 7eb6f9ae78ba81ff4559c68a7657c4531d00b1f9c45081b22740812932587676
+  data.tar.gz: 6b782946d81a1eca54d7b07ea28c066aaab207ebc6aa4e3379395c85c67376ef
 SHA512:
-  metadata.gz: b6de14e0c3e97da869110bf7e56daac8c7b25beeb54c862c33a99f98007d887964eaa4e435d284ecb095c972d2be028905235429ab20d02074872600545ecf8d
-  data.tar.gz: dc49c1a0d76013fe00dd66b12db07558fc86b06904846d7b138ab79721d1ccc5925af4da72d009140d98d8f4ad2569cb3f41ee038dc0d5292d79efa5d4038fb0
+  metadata.gz: f385e2ebb77259a98dda1c20e98a21d30c6a36da2a94c14f00cc86f981ca2880a22f20f4602a42ed4aee363c420e1e56c1ac0ddcad45ddc1ad0dad7ec9d98981
+  data.tar.gz: d7022c6dbec8d25c5de73fc5c2817969a9c911dcfa6ecf5d22103263741417c5a4dcadc9d77f880511adc97cd0797371d0d700e611d0335c3acfc2b243693c8c

data/lib/plain_apm/extensions/context/active_job.rb

@@ -4,16 +4,23 @@ module PlainApm
   module Extensions
     module Context
       module ActiveJob
+        # Timestamp when job was deserialized (popped off of the queue).
+        attr_accessor :dequeued_at
+
         # TODO: would it be useful to de-serialize the whole context (e.g. user
         # IDs, subscriptions, etc?)
         def serialize
           trace_id = PlainApm::Extensions::Context.trace_id || SecureRandom.uuid
-          super.update("trace_id" => trace_id)
+          # Rails wasn't preserving the nano-time, this has now been fixed
+          # upstream in #39698 and scheduled for Rails 7.1.
+          super.update("trace_id" => trace_id, "enqueued_at" => Time.now.utc.iso8601(9))
         end
 
         def deserialize(job)
           PlainApm::Extensions::Context.trace_id = job["trace_id"]
 
+          self.dequeued_at = Time.now.utc.iso8601(9)
+
           super(job)
         end
       end

data/lib/plain_apm/hooks/active_job.rb

@@ -29,6 +29,8 @@ module PlainApm
           "job_class" => job.class.name,
           "job_arguments" => job.arguments,
           "executions" => job.executions,
+          "enqueued_at" => enqueued_at(job),
+          "dequeued_at" => dequeued_at(job),
           "scheduled_at" => job.scheduled_at,
           "adapter" => payload[:adapter].class.name,
           "aborted" => payload[:aborted]
@@ -50,6 +52,16 @@ module PlainApm
           nil
         end
       end
+
+      private
+
+      def enqueued_at(job)
+        Time.parse(job.enqueued_at).to_f if job.enqueued_at
+      end
+
+      def dequeued_at(job)
+        Time.parse(job.dequeued_at).to_f if job.respond_to?(:dequeued_at) && job.dequeued_at
+      end
     end
   end
 end

data/lib/plain_apm/hooks/error_reporter.rb

@@ -36,6 +36,13 @@ module PlainApm
           "context" => context
         }
 
+        if context[:job] && context[:job].is_a?(ActiveJob::Base)
+          event.merge!({
+            "job_class" => context[:job].class.name,
+            "queue_name" => context[:job].queue_name
+          })
+        end
+
         if e.cause
           event.merge!({
             "cause_class" => e.cause.class.name,

data/lib/plain_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainApm
-  VERSION = "0.5.5"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: PlainAPM agent