appsignal 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d677b53c12a5761308ea3158780deea694d4b7
-  data.tar.gz: 0dcbadafab0f964c27814aa38f365eb922d327e0
+  metadata.gz: a71ef0ab84d14af51ac3acc5e650ffa795c1f47d
+  data.tar.gz: 5aac40d09039f0489fbba6dd635824854e3de470
 SHA512:
-  metadata.gz: 244d06180b82d6188f9f7bd4bd100c89772e2eb1ed826dea3605d897436ed070def86a94c593da9fb826aee173880b8b2b69414f82f0c3f16c10a8664454e919
-  data.tar.gz: 63683d63c2e268146b652bdf4b0bb7946368c8db76ebed184bbc643918e3604ad74459d8b43a8e08f9d0acef06af131c923da9606ba8d778748f1ff2a0a3cb29
+  metadata.gz: 8a1d8af6158df8b788beedb029af5c8ff73e9240bf9c8f7b1899f32c95138cd291000b6c61786d33f8ec053f9504a14f1e352e1364deb8e7ac132b731359494e
+  data.tar.gz: 15686c8a6ebd22a44ea4a88278876f366010b643bf66218656ca5e7dc1a6cae99e9bfbd1cac46d59db4f2098bcfb11958413a7a08638bf327343e7c1b01acc05

data/.travis.yml

@@ -32,6 +32,7 @@ gemfile:
   - "gemfiles/sequel-435.gemfile"
   - "gemfiles/sinatra.gemfile"
   - "gemfiles/grape.gemfile"
+  - "gemfiles/webmachine.gemfile"
 
 matrix:
   fast_finish: true

data/CHANGELOG.md

@@ -1,4 +1,5 @@
-# Unreleased version
+# 2.3.4
+* Fix naming for ActiveJob integration with DelayedJob. PR #345
 
 # 2.3.3
 * Accept mixed case env variable values for the `true` value. PR #333

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -15,20 +15,21 @@ module Appsignal
       end
 
       def self.invoke_with_instrumentation(job, block)
-        if job.respond_to?(:payload_object)
-          # Direct Delayed Job
+        payload = job.payload_object
+
+        if payload.respond_to? :job_data
+          # ActiveJob
+          job_data = payload.job_data
+          args = job_data.fetch("arguments", {})
+          class_name = job_data["job_class"]
+          method_name = "perform"
+        else
+          # Delayed Job
+          args = extract_value(job.payload_object, :args, {})
           class_and_method_name = extract_value(job.payload_object, :appsignal_name, job.name)
           class_name, method_name = class_and_method_name.split("#")
-          args = extract_value(job.payload_object, :args, {})
-          job_data = job
-        elsif job.respond_to?(:job_data)
-          # Via ActiveJob
-          class_name, method_name = job.job_data[:name].split("#")
-          args = job.job_data[:args] || {}
-          job_data = job.job_data
-        else
-          args = {}
         end
+
         params = Appsignal::Utils::ParamsSanitizer.sanitize args,
           :filter_parameters => Appsignal.config[:filter_parameters]
 
@@ -37,13 +38,13 @@ module Appsignal
           :class    => class_name,
           :method   => method_name,
           :metadata => {
-            :id       => extract_value(job_data, :id, nil, true),
-            :queue    => extract_value(job_data, :queue),
-            :priority => extract_value(job_data, :priority, 0),
-            :attempts => extract_value(job_data, :attempts, 0)
+            :id       => extract_value(job, :id, nil, true),
+            :queue    => extract_value(job, :queue),
+            :priority => extract_value(job, :priority, 0),
+            :attempts => extract_value(job, :attempts, 0)
           },
           :params      => params,
-          :queue_start => extract_value(job_data, :run_at)
+          :queue_start => extract_value(job, :run_at)
         ) do
           block.call(job)
         end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require "yaml"
 
 module Appsignal
-  VERSION = "2.3.3".freeze
+  VERSION = "2.3.4".freeze
 end

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

@@ -215,7 +215,27 @@ describe Appsignal::Hooks::DelayedJobHook do
           require "active_job"
 
           context "when wrapped by ActiveJob" do
-            let(:job) { ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(job_data) }
+            let(:wrapped_job) do
+              ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(
+                "arguments"  => args,
+                "job_class"  => "TestClass",
+                "job_id"     => 123,
+                "locale"     => :en,
+                "queue_name" => "default"
+              )
+            end
+            let(:job) do
+              double(
+                :id             => 123,
+                :name           => "ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper",
+                :priority       => 1,
+                :attempts       => 1,
+                :queue          => "default",
+                :created_at     => created_at,
+                :run_at         => run_at,
+                :payload_object => wrapped_job
+              )
+            end
             let(:default_params) do
               {
                 :class    => "TestClass",
@@ -231,7 +251,6 @@ describe Appsignal::Hooks::DelayedJobHook do
               }
             end
             let(:args) { ["activejob_argument"] }
-            before { job_data[:args] = args }
 
             context "with simple params" do
               it "wraps it in a transaction with the correct params" do

data/spec/lib/appsignal/integrations/webmachine_spec.rb

@@ -36,7 +36,7 @@ if DependencyHelper.webmachine_present?
       end
 
       it "should set the action" do
-        expect(transaction).to receive(:set_action_if_nil).with("RSpec::Mocks::Mock#GET")
+        expect(transaction).to receive(:set_action_if_nil).with("RSpec::Mocks::Double#GET")
       end
 
       it "should call the original method" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack