appsignal 2.5.2-java → 2.5.3.alpha.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d9bc6665c2a3112a1aa24d8194a1c404ca933d
-  data.tar.gz: e0450850d9a358e78d3391050a1c43bfbb1b5705
+  metadata.gz: ea3a27e8ba696561f20b761ac6f98e28aaebf384
+  data.tar.gz: a2676271086288a7e4c6de3e3be6b4b45acc8a7d
 SHA512:
-  metadata.gz: 2b1bc35ce5ef95dc7f04332bb2e8f347477b13d60a19edfbe2891e27a07f409f8678efb653da4b2517d4991fd2267dddbe4077b3c48d11ded7421ce5c2594a9f
-  data.tar.gz: bcdf191cb6943a854503e5504ee69c41cde23bad18ffa77374d056cb61f616af208e696674a97d72a6008a62bf80ddc513e4bbbe94ee9b631138c52b7e1da57c
+  metadata.gz: 811444b7be89ff7e4da044fac781acb0666122e594a08543dafa76966804152910f196396c8e7681845b1f9d4e045702fbc1f68be7f00bddf2a356556b435e75
+  data.tar.gz: f6b75547626577f17e143b1fb801182a5d77be7494ba3d6e43d0d7c8a8b59d9a51501d3bfabc5725f577fe814bdc1bb7e92811cb7938350ac54d6da1bb94610a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.5.3
+- Fix Sidekiq action names containing arguments. PR #401
+
 # 2.5.2
 - Support Sidekiq delay extension for ActiveRecord instances. If using this
   feature in your app, an update is strongly recommended! PR #387

data/lib/appsignal/hooks/sidekiq.rb

@@ -22,6 +22,7 @@ module Appsignal
     class SidekiqPlugin # rubocop:disable Metrics/ClassLength
       include Appsignal::Hooks::Helpers
 
+      UNKNOWN_ACTION_NAME = "unknown".freeze
       JOB_KEYS = %w[
         args backtrace class created_at enqueued_at error_backtrace error_class
         error_message failed_at jid retried_at retry wrapped
@@ -60,7 +61,10 @@ module Appsignal
 
       def formatted_action_name(job)
         sidekiq_action_name = parse_action_name(job)
-        return sidekiq_action_name if sidekiq_action_name =~ /\.|#/
+        complete_action = sidekiq_action_name =~ /\.|#/
+        if complete_action || sidekiq_action_name == UNKNOWN_ACTION_NAME
+          return sidekiq_action_name
+        end
         "#{sidekiq_action_name}#perform"
       end
 
@@ -94,11 +98,16 @@ module Appsignal
           end
         when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
           job_class = job["wrapped"] || args[0]
-          if job_class == "ActionMailer::DeliveryJob"
+          case job_class
+          when "ActionMailer::DeliveryJob"
             # MailerClass#mailer_method
             args[0]["arguments"][0..1].join("#")
-          else
+          when String
             job_class
+          else
+            Appsignal.logger.debug \
+              "Unable to determine an action name from Sidekiq payload: #{job}"
+            UNKNOWN_ACTION_NAME
           end
         else
           job["class"]

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = "2.5.2".freeze
+  VERSION = "2.5.3.alpha.1".freeze
 end

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -317,6 +317,62 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
           )
         end
       end
+
+      context "when Sidekiq job payload is missing the 'wrapped' value" do
+        let(:item) do
+          {
+            "class" => "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper",
+            "queue" => "default",
+            "args" => [{
+              "job_class" => "ActiveMailerTestJob",
+              "job_id" => "23e79d48-6966-40d0-b2d4-f7938463a263",
+              "queue_name" => "default",
+              "arguments" => [
+                "MailerClass", "mailer_method", "deliver_now",
+                "foo", { "foo" => "Foo", "bar" => "Bar", "baz" => { 1 => :bar } }
+              ]
+            }],
+            "retry" => true,
+            "jid" => "efb140489485999d32b5504c",
+            "created_at" => Time.parse("2001-01-01 10:00:00UTC").to_f,
+            "enqueued_at" => Time.parse("2001-01-01 10:00:00UTC").to_f
+          }
+        end
+
+        it "sets the action name to unknown and without sample data" do
+          perform_job
+
+          transaction_hash = transaction.to_h
+          expect(transaction_hash).to include(
+            "id" => kind_of(String),
+            "action" => "unknown",
+            "error" => nil,
+            "namespace" => namespace,
+            "metadata" => {
+              "queue" => "default"
+            },
+            "sample_data" => {
+              "environment" => {},
+              "params" => [],
+              "tags" => {}
+            }
+          )
+          # TODO: Not available in transaction.to_h yet.
+          # https://github.com/appsignal/appsignal-agent/issues/293
+          expect(transaction.request.env).to eq(
+            :queue_start => Time.parse("2001-01-01 10:00:00UTC").to_f
+          )
+          expect_transaction_to_have_sidekiq_event(transaction_hash)
+        end
+
+        it "logs a debug message" do
+          perform_job
+
+          expect(log_contents(log)).to contains_log(
+            :debug, "Unable to determine an action name from Sidekiq payload: #{item}"
+          )
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3.alpha.1
 platform: java
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -371,9 +371,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14