scout_apm 5.6.2 → 5.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6825b0cb6be5706305fa47b48fe8f84a89f0bf6019deb5914547d720e13db875
-  data.tar.gz: 5a5163d1c0f05f6ebe87aa0948e426b9332ff66121bc04c33048cad1ddef5e89
+  metadata.gz: 9c929de92cd0a3b2690bac6ef665c8c4d7187dd3ecc838cc881033d8cf5c413c
+  data.tar.gz: 3148b06815beb3e506e271bb560fb700b5882d503c1a94f646011117ee424d9b
 SHA512:
-  metadata.gz: d2853cef258799e5330896df9a6af7ee979eef4288e8853207ea150d9e4b6d176a4626570795692ab2faf7a6c4790d07eaa3d927e8e2143e53b304748c08558f
-  data.tar.gz: ec7d60860118f0e8b46e2ae3d147e1065d548d891706cfc26f1d4d45f47fdf87dce130dd62e75763fe01dacca79d32a1a1a485f8b5f9da8a843b2b239a693a85
+  metadata.gz: 28afece432426708eb8ce9bdb527dddd2820261574ca299887ba1294ecc98b34663c04dc15c9cf0ffb78f5211abb9b8d78ba6e202c7a6d28867edda65727b902
+  data.tar.gz: 3e81497fa32092e4f037d272ee1a76f555bd9a557c9855a304e96acc93cdedaf24e0a4b21d86e895dddb1db569ec35954cbff30340f8e9803b7d799b28866522

data/CHANGELOG.markdown

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 5.6.4
+- Use new ActiveJob class name and timestamp units for Sidekiq 8+ (#544)
+
 # 5.6.2
 - Fix deprecation warning for Sidekiq 7.1.5+ (#535)
 - Add support for Mongoid 8 and 9. Remove support for old versions. (#538)

data/lib/scout_apm/background_job_integrations/sidekiq.rb

@@ -69,8 +69,21 @@ module ScoutApm
         end
       end
 
+      def self.sidekiq_version_8?
+        if defined?(::Sidekiq::VERSION)
+          ::Sidekiq::VERSION.to_i >= 8
+        else
+          false
+        end
+      end
+
       UNKNOWN_CLASS_PLACEHOLDER = 'UnknownJob'.freeze
-      ACTIVE_JOB_KLASS = 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'.freeze
+      # This name was changed in Sidekiq 8
+      ACTIVE_JOB_KLASS = if sidekiq_version_8?
+                          'Sidekiq::ActiveJob::Wrapper'.freeze
+                        else
+                          'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'.freeze
+                        end
       DELAYED_WRAPPER_KLASS = 'Sidekiq::Extensions::DelayedClass'.freeze
 
 
@@ -119,7 +132,14 @@ module ScoutApm
       def latency(msg, time = Time.now.to_f)
         created_at = msg['enqueued_at'] || msg['created_at']
         if created_at
-          (time - created_at)
+          # Sidekiq 8+ uses milliseconds, older versions use seconds.
+          # Do it this way because downstream expects seconds.
+          if self.class.sidekiq_version_8?
+            # Convert milliseconds to seconds for consistency.
+            (time - (created_at.to_f / 1000.0))
+          else
+            (time - created_at)
+          end
         else
           0
         end

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "5.6.2"
+  VERSION = "5.6.4"
 end

data/test/unit/background_job_integrations/sidekiq_test.rb

@@ -102,13 +102,21 @@ class SidekiqTest < Minitest::Test
   ########################################
   def test_latency_from_created_at
     # Created at time 80, but now it is 200. Latency was 120
-    msg = { 'created_at' => 80 }
+    msg = if SidekiqMiddleware.sidekiq_version_8?
+            { 'created_at' => 80000 } # milliseconds for Sidekiq 8+
+          else
+            { 'created_at' => 80 }
+          end
     assert_equal 120, SidekiqMiddleware.new.latency(msg, 200)
   end
 
   def test_latency_from_enqueued_at
     # Created at time 80, but now it is 200. Latency was 120
-    msg = { 'enqueued_at' => 80 }
+    msg = if SidekiqMiddleware.sidekiq_version_8?
+            { 'enqueued_at' => 80000 } # milliseconds for Sidekiq 8+
+          else
+            { 'enqueued_at' => 80 }
+          end
     assert_equal 120, SidekiqMiddleware.new.latency(msg, 200)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.6.4
 platform: ruby
 authors:
 - Derek Haynes
 - Andre Lewis
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest