scout_apm 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8fea1cfd66466534fa0ca5e7aaac6cdb332156e02a4e933d6fb883eb9fd68e
-  data.tar.gz: d6f8ab26c4a7d77cde8f0f4fce2b1ef4f849635e839169fe9163e9b64b796294
+  metadata.gz: 2f7da6e5dce565451022406d4bbf06ccba3eb60cca723d391886083584595ca8
+  data.tar.gz: a9001c043e9f4b7afb9c556474e0b50baecbb191a05bc3b308f85072443df914
 SHA512:
-  metadata.gz: 1d38a64cd133729432a38611167a4551e5ebb208eeddd1d346a5622d0484ba82a4fedb1ac14e385cc48671cd1902726350662202db35a88a28cbde9fb7613702
-  data.tar.gz: 7755eb50a09652dba9fa4168893f51f3684b0f14c3fa681c8b2b0af3473eeb9d5b1cec98da46e49612b9f490bc5e9355a187d8658ced8616af0d6d0ad2bdef25
+  metadata.gz: 39de9f2fe98871ab474a43c784c9db73a800832e5ac6757004036065c0ea9f68955f36e953fa36249d5ce7d78c289aa9e373d8f01fe83c22c6987bd149eeab34
+  data.tar.gz: 588d9fad7ad1fe3084ed28b2ce9565cda61eb694389bfefae3f065ace19f09b463c5de801766ab105540385350ed8d8ee2e6be545842794b8f60821cc2f0d5b1

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+# 6.0.1
+- Fix capturing of job params for non ActiveJob
+
 # 6.0.0
 - Add Prism AutoInstruments Support (#582) (#594)
 - Add OpenSearch instrumentation (#563)

data/lib/scout_apm/background_job_integrations/sidekiq.rb

@@ -153,13 +153,16 @@ module ScoutApm
 
         return if known_parameters.empty?
 
-        arguments = msg.fetch('args', [])
-        
-        # Don't think this can actually happen. With perform_all_later, 
-        # it appears we go through this middleware individually (even with multiples of the same job type).
-        return if arguments.length > 1
+        job_args = if msg["class"] == ACTIVE_JOB_KLASS
+            arguments = msg.fetch('args', [])
+            # Don't think this can actually happen. With perform_all_later, 
+            # it appears we go through this middleware individually (even with multiples of the same job type).
+            return if arguments.length > 1
 
-        job_args = arguments.first.fetch('arguments', [])
+            arguments.first.fetch('arguments', [])
+          else
+            msg.fetch('args', [])
+          end
 
         # Reduce known parameters to just the ones that are present in the job arguments (excluding non altered optional params)
         known_parameters = known_parameters[0...job_args.length]

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end

data/test/unit/background_job_integrations/sidekiq_test.rb

@@ -153,7 +153,8 @@ class SidekiqTest < Minitest::Test
     ScoutApm::Context.expects(:add).with({ user_id: 123, email: 'test@example.com', filter_param: '[FILTERED]', dict_val: '[UNSUPPORTED TYPE]' })
 
     msg = {
-      'class' => 'TestJobWithArgs',
+      "class" => SidekiqMiddleware::ACTIVE_JOB_KLASS,
+      "wrapped" => "TestJobWithArgs",
       'args' => [{ 'arguments' => [123, 'test@example.com', 'secret', {a: 1}] }]
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Derek Haynes