plain_apm 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8f0536583fe9d0f9e7f99214a9d79cffe852317716627d358e5b94fd786ab3
-  data.tar.gz: d118718d929c8ef6de1d1a746c6061b744a37fd08ee49bff5c917556af611860
+  metadata.gz: ae9d484b8cae829dc9a8159030fb3075493b7a164fc007c2f7a4688e5f0e7657
+  data.tar.gz: 5c0e75c7ed7c549c13de43d44e8ff3733bda46d38994b77af93d48782a2855a3
 SHA512:
-  metadata.gz: 853aac9cc8a7bc97041fa2462e200153878c2e7ab703dcc25543d8b059f18f494e7b795b865d93c49a418fa3b1203bfc7d84f86f55d6792b0abc35aad075a30f
-  data.tar.gz: 8d446a123c4a66f6bc99a9586f414a0e135177266603795b09cc8ab131f6925a44d3606ad27707971eb349fc91f51d541b5e167a01d5e1236fccb3ebf6ccbd3a
+  metadata.gz: 74432ea0610f7d525e77aa2173de4adba0f723d713b5870d4a5dfdda1bf3fdb8e812b4b7b08b55d7c3729415d98890d2dd491bb0e94922cb8e8fa6d8a98916a1
+  data.tar.gz: b5d84121648c14f64dbb76c4c7a9e040283465f0d9a9263dcf48292e6c2e3a604714e00a480f323b40fce13e80047890b4c6f7c7b269e0edaac7b3c0645f0fd9

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/deploy.rb

@@ -34,17 +34,25 @@ module PlainApm
       #
       # Also, we might not be in the app root.
       def git_revision
-        return nil unless File.exist?(".git")
+        return unless File.exist?(".git")
 
-        ["git", `git rev-parse --short HEAD`.strip]
+        rev = `git rev-parse --short=8 HEAD`.strip
+
+        return if rev.empty?
+
+        ["git", rev]
       rescue Error::ENOENT # No git installed
         nil
       end
 
       def hg_revision
-        return nil unless File.exist?(".hg")
+        return unless File.exist?(".hg")
+
+        rev = `hg log -l 1 -r . -T '{node}'`.strip
+
+        return if rev.empty?
 
-        ["hg", `hg log -l 1 -r . -T '{node}'`]
+        ["hg", rev]
       rescue Error::ENOENT # No mercurial installed
         nil
       end

data/lib/plain_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-12-12 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