appsignal 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47595d1e052146b00f68ff86f47b27dd6517c0a4ac48f3b2cddc41647a864ecd
-  data.tar.gz: 4d1a4a75650f1282237fb69427c9f98ba2328e0f45322d2b2d1b5748ab57edad
+  metadata.gz: 68aa8e0a32d494192799fdb4deb139a9e0fd0820d0c319c7ff9508f0f031c180
+  data.tar.gz: 73d42e3fc21d20f6d4b5e4e4606bcafcb7a084c05ecfca2200e6c3e2bbcefc97
 SHA512:
-  metadata.gz: 7a6d756685176f8f5c200ed8eb73033319bc04de42ce8985b3c801932612f5bd811c309e310cab9c44dbe01f30a3689c9b4d200d45a6d1fa2b166d499cbc5c34
-  data.tar.gz: 24f32b9e25ccfbf41613124213bf4a5280380442516ab1c18d64fe29335375d6d9b403a73ae43a6d3295a4324035e360ff5ae388f3c088a11da1152605eb02c0
+  metadata.gz: 2c642513ac8122f2d2adbe248cc1c6c77383579dd52ac9bd327bfa64b984110e2b5eb21b3e2bf9498d7090c957f8df7c052cfa4baf6b52174e02cb9f753cfa3b
+  data.tar.gz: 400074db43e66759d091b4623e000fb63a9e45365b813ede6935289c917778f0e91918de528d1b4dd2a200558884cb9d56a0032f9cfa66ce2047b0a647851081

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.7.3
+
+_Published on 2024-05-08._
+
+### Added
+
+- [28a36ba1](https://github.com/appsignal/appsignal-ruby/commit/28a36ba17c236cf3f2f4991f3ff224a98c76eec7) patch - Add option to `activejob_report_errors` option to only report errors when a job is discard by Active Job. In the example below the job is retried twice. If it fails with an error twice the job is discarded. If `activejob_report_errors` is set to `discard`, you will only get an error reported when the job is discarded. This new `discard` value only works for Active Job 7.1 and newer.
+  
+  
+  ```ruby
+  class ExampleJob < ActiveJob::Base
+    retry_on StandardError, :attempts => 2
+  
+    # ...
+  end
+  ```
+- [d6d233de](https://github.com/appsignal/appsignal-ruby/commit/d6d233de8d1dd6aa203924e66db0635287aaea7b) patch - Track Active Job executions per job. When a job is retried the "executions" metadata for Active Job jobs goes up by one for every retry. We now track this as the `executions` tag on the job sample.
+
 ## 3.7.2
 
 _Published on 2024-05-06._

data/Gemfile

@@ -3,3 +3,7 @@
 source "https://rubygems.org"
 
 gemspec
+
+# Fix install issue for jruby on gem 3.1.8.
+# No java stub is published.
+gem "bigdecimal", "3.1.7" if RUBY_PLATFORM == "java"

data/gemfiles/no_dependencies.gemfile

@@ -1,8 +1,10 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 ruby_version = Gem::Version.new(RUBY_VERSION)
-if ruby_version < Gem::Version.new("2.3.0")
-  gem 'rack', '~> 1.6'
-end
+gem "rack", "~> 1.6" if ruby_version < Gem::Version.new("2.3.0")
 
-gemspec :path => '../'
+# Fix install issue for jruby on gem 3.1.8.
+# No java stub is published.
+gem "bigdecimal", "3.1.7" if RUBY_PLATFORM == "java"
+
+gemspec :path => "../"

data/gemfiles/rails-6.0.gemfile

@@ -1,6 +1,10 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rails', '~> 6.0.0'
+gem "rails", "~> 6.0.0"
 gem "sidekiq"
 
-gemspec :path => '../'
+# Fix install issue for jruby on gem 3.1.8.
+# No java stub is published.
+gem "bigdecimal", "3.1.7" if RUBY_PLATFORM == "java"
+
+gemspec :path => "../"

data/gemfiles/rails-6.1.gemfile

@@ -1,7 +1,11 @@
 source "https://rubygems.org"
 
+gem "net-smtp", :require => false
 gem "rails", "~> 6.1.0"
-gem "net-smtp", require: false
 gem "sidekiq"
 
+# Fix install issue for jruby on gem 3.1.8.
+# No java stub is published.
+gem "bigdecimal", "3.1.7" if RUBY_PLATFORM == "java"
+
 gemspec :path => "../"

data/gemfiles/rails-7.0.gemfile

@@ -1,7 +1,11 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rails', "~> 7.0.1"
-gem "sidekiq"
+gem "rails", "~> 7.0.1"
 gem "rake", "> 12.2"
+gem "sidekiq"
+
+# Fix install issue for jruby on gem 3.1.8.
+# No java stub is published.
+gem "bigdecimal", "3.1.7" if RUBY_PLATFORM == "java"
 
-gemspec :path => '../'
+gemspec :path => "../"

data/gemfiles/rails-7.1.gemfile

@@ -4,4 +4,8 @@ gem "rails", "~> 7.1.0"
 gem "rake", "> 12.2"
 gem "sidekiq"
 
+# Fix install issue for jruby on gem 3.1.8.
+# No java stub is published.
+gem "bigdecimal", "3.1.7" if RUBY_PLATFORM == "java"
+
 gemspec :path => "../"

data/lib/appsignal/config.rb

@@ -558,6 +558,11 @@ module Appsignal
         config[:send_session_data] = !skip_session_data if send_session_data.nil?
       end
 
+      if config_hash[:activejob_report_errors] == "discard" &&
+          !Appsignal::Hooks::ActiveJobHook.version_7_1_or_higher?
+        config[:activejob_report_errors] = "all"
+      end
+
       config
     end
 

data/lib/appsignal/hooks/active_job.rb

@@ -6,14 +6,38 @@ module Appsignal
     class ActiveJobHook < Appsignal::Hooks::Hook
       register :active_job
 
-      def dependencies_present?
+      def self.version_7_1_or_higher?
+        @version_7_1_or_higher ||=
+          if dependencies_present?
+            major = ::ActiveJob::VERSION::MAJOR
+            minor = ::ActiveJob::VERSION::MINOR
+            major > 7 || (major == 7 && minor >= 1)
+          else
+            false
+          end
+      end
+
+      def self.dependencies_present?
         defined?(::ActiveJob)
       end
 
+      def dependencies_present?
+        self.class.dependencies_present?
+      end
+
       def install
         ActiveSupport.on_load(:active_job) do
           ::ActiveJob::Base
             .extend ::Appsignal::Hooks::ActiveJobHook::ActiveJobClassInstrumentation
+
+          return unless Appsignal::Hooks::ActiveJobHook.version_7_1_or_higher?
+
+          # Only works on Active Job 7.1 and newer
+          ::ActiveJob::Base.after_discard do |_job, exception|
+            next unless Appsignal.config[:activejob_report_errors] == "discard"
+
+            Appsignal::Transaction.current.set_error(exception)
+          end
         end
       end
 
@@ -86,7 +110,9 @@ module Appsignal
         private
 
         def transaction_set_error(transaction, exception)
-          return if Appsignal.config[:activejob_report_errors] == "none"
+          # Only report errors when the config option is set to "all".
+          # To report errors on discard, see the `after_discard` callback.
+          return unless Appsignal.config[:activejob_report_errors] == "all"
 
           transaction.set_error(exception)
         end
@@ -136,6 +162,8 @@ module Appsignal
           tags[:queue] = queue if queue
           priority = job["priority"]
           tags[:priority] = priority if priority
+          executions = job["executions"]
+          tags[:executions] = executions.to_i + 1 if executions
           tags
         end
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.7.2"
+  VERSION = "3.7.3"
 end

data/spec/lib/appsignal/config_spec.rb

@@ -559,6 +559,30 @@ describe Appsignal::Config do
         end
       end
     end
+
+    if DependencyHelper.rails_present?
+      require "active_job"
+
+      context "activejob_report_errors" do
+        let(:config_options) { { :activejob_report_errors => "discard" } }
+
+        if DependencyHelper.rails_version >= Gem::Version.new("7.1.0")
+          context "when Active Job >= 7.1 and 'discard'" do
+            it "does not override the activejob_report_errors value" do
+              expect(config[:activejob_report_errors]).to eq("discard")
+              expect(config.override_config[:activejob_report_errors]).to be_nil
+            end
+          end
+        else
+          context "when Active Job < 7.1 and 'discard'" do
+            it "sets activejob_report_errors to 'all'" do
+              expect(config[:activejob_report_errors]).to eq("all")
+              expect(config.override_config[:activejob_report_errors]).to eq("all")
+            end
+          end
+        end
+      end
+    end
   end
 
   describe "config keys" do

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

@@ -88,6 +88,14 @@ if DependencyHelper.active_job_present?
         end
       end
 
+      class ActiveJobErrorWithRetryTestJob < ActiveJob::Base
+        retry_on StandardError, :wait => 0.seconds, :attempts => 2
+
+        def perform
+          raise "uh oh"
+        end
+      end
+
       class ActiveJobCustomQueueTestJob < ActiveJob::Base
         queue_as :custom_queue
 
@@ -99,6 +107,7 @@ if DependencyHelper.active_job_present?
     after do
       Object.send(:remove_const, :ActiveJobTestJob)
       Object.send(:remove_const, :ActiveJobErrorTestJob)
+      Object.send(:remove_const, :ActiveJobErrorWithRetryTestJob)
       Object.send(:remove_const, :ActiveJobCustomQueueTestJob)
     end
 
@@ -107,7 +116,7 @@ if DependencyHelper.active_job_present?
       expect(Appsignal).to receive(:increment_counter)
         .with("active_job_queue_job_count", 1, tags.merge(:status => :processed))
 
-      perform_job(ActiveJobTestJob)
+      queue_job(ActiveJobTestJob)
 
       transaction = last_transaction
       transaction_hash = transaction.to_h
@@ -120,7 +129,8 @@ if DependencyHelper.active_job_present?
           "params" => [],
           "tags" => {
             "active_job_id" => kind_of(String),
-            "queue" => queue
+            "queue" => queue,
+            "executions" => 1
           }
         )
       )
@@ -136,7 +146,7 @@ if DependencyHelper.active_job_present?
         tags = { :queue => "custom_queue" }
         expect(Appsignal).to receive(:increment_counter)
           .with("active_job_queue_job_count", 1, tags.merge(:status => :processed))
-        perform_job(ActiveJobCustomQueueTestJob)
+        queue_job(ActiveJobCustomQueueTestJob)
 
         transaction = last_transaction
         transaction_hash = transaction.to_h
@@ -170,7 +180,7 @@ if DependencyHelper.active_job_present?
             .with("active_job_queue_priority_job_count", 1, tags.merge(:priority => 10,
               :status => :processed))
 
-          perform_job(ActiveJobPriorityTestJob)
+          queue_job(ActiveJobPriorityTestJob)
 
           transaction = last_transaction
           transaction_hash = transaction.to_h
@@ -193,7 +203,7 @@ if DependencyHelper.active_job_present?
           .with("active_job_queue_job_count", 1, tags.merge(:status => :processed))
 
         expect do
-          perform_job(ActiveJobErrorTestJob)
+          queue_job(ActiveJobErrorTestJob)
         end.to raise_error(RuntimeError, "uh oh")
 
         transaction = last_transaction
@@ -211,7 +221,8 @@ if DependencyHelper.active_job_present?
             "params" => [],
             "tags" => {
               "active_job_id" => kind_of(String),
-              "queue" => queue
+              "queue" => queue,
+              "executions" => 1
             }
           )
         )
@@ -227,23 +238,76 @@ if DependencyHelper.active_job_present?
           Appsignal.config = project_fixture_config("production")
           Appsignal.config[:activejob_report_errors] = "none"
 
-          # Other calls we're testing in another test
           allow(Appsignal).to receive(:increment_counter)
           tags = { :queue => queue }
           expect(Appsignal).to receive(:increment_counter)
             .with("active_job_queue_job_count", 1, tags.merge(:status => :failed))
-          expect(Appsignal).to receive(:increment_counter)
-            .with("active_job_queue_job_count", 1, tags.merge(:status => :processed))
 
           expect do
-            perform_job(ActiveJobErrorTestJob)
+            queue_job(ActiveJobErrorTestJob)
           end.to raise_error(RuntimeError, "uh oh")
 
           transaction = last_transaction
           transaction_hash = transaction.to_h
-          expect(transaction_hash).to include(
-            "error" => nil
-          )
+          expect(transaction_hash).to include("error" => nil)
+        end
+      end
+
+      if DependencyHelper.rails_version >= Gem::Version.new("7.1.0")
+        context "with activejob_report_errors set to discard" do
+          before do
+            Appsignal.config = project_fixture_config("production")
+            Appsignal.config[:activejob_report_errors] = "discard"
+          end
+
+          it "does not report error on first failure" do
+            with_test_adapter do
+              # Prevent the job from being instantly retried so we can test
+              # what happens before it's retried
+              allow_any_instance_of(ActiveJobErrorWithRetryTestJob).to receive(:retry_job)
+
+              queue_job(ActiveJobErrorWithRetryTestJob)
+            end
+
+            transaction = last_transaction
+            transaction_hash = transaction.to_h
+            expect(transaction_hash).to include(
+              "error" => nil,
+              "sample_data" => hash_including(
+                "tags" => hash_including(
+                  "executions" => 1
+                )
+              )
+            )
+          end
+
+          it "reports error when discarding the job" do
+            allow(Appsignal).to receive(:increment_counter)
+            tags = { :queue => queue }
+            expect(Appsignal).to receive(:increment_counter)
+              .with("active_job_queue_job_count", 1, tags.merge(:status => :failed))
+
+            with_test_adapter do
+              expect do
+                queue_job(ActiveJobErrorWithRetryTestJob)
+              end.to raise_error(RuntimeError, "uh oh")
+            end
+
+            transaction = last_transaction
+            transaction_hash = transaction.to_h
+            expect(transaction_hash).to include(
+              "error" => {
+                "name" => "RuntimeError",
+                "message" => "uh oh",
+                "backtrace" => kind_of(String)
+              },
+              "sample_data" => hash_including(
+                "tags" => hash_including(
+                  "executions" => 2
+                )
+              )
+            )
+          end
         end
       end
 
@@ -276,7 +340,7 @@ if DependencyHelper.active_job_present?
                 :status => :failed))
 
             expect do
-              perform_job(ActiveJobErrorPriorityTestJob)
+              queue_job(ActiveJobErrorPriorityTestJob)
             end.to raise_error(RuntimeError, "uh oh")
 
             transaction = last_transaction
@@ -291,13 +355,31 @@ if DependencyHelper.active_job_present?
       end
     end
 
+    context "with retries" do
+      it "reports the number of retries as executions" do
+        with_test_adapter do
+          expect do
+            queue_job(ActiveJobErrorWithRetryTestJob)
+          end.to raise_error(RuntimeError, "uh oh")
+        end
+
+        transaction = last_transaction
+        transaction_hash = transaction.to_h
+        expect(transaction_hash).to include(
+          "sample_data" => hash_including(
+            "tags" => hash_including("executions" => 2)
+          )
+        )
+      end
+    end
+
     context "when wrapped in another transaction" do
       it "does not create a new transaction or close the currently open one" do
         current_transaction = background_job_transaction
         allow(current_transaction).to receive(:complete).and_call_original
         set_current_transaction current_transaction
 
-        perform_job(ActiveJobTestJob)
+        queue_job(ActiveJobTestJob)
 
         expect(created_transactions.count).to eql(1)
         expect(current_transaction).to_not have_received(:complete)
@@ -316,7 +398,8 @@ if DependencyHelper.active_job_present?
             "params" => [],
             "tags" => {
               "active_job_id" => kind_of(String),
-              "queue" => queue
+              "queue" => queue,
+              "executions" => 1
             }
           )
         )
@@ -333,7 +416,7 @@ if DependencyHelper.active_job_present?
       it "filters the configured params" do
         Appsignal.config = project_fixture_config("production")
         Appsignal.config[:filter_parameters] = ["foo"]
-        perform_job(ActiveJobTestJob, method_given_args)
+        queue_job(ActiveJobTestJob, method_given_args)
 
         transaction = last_transaction
         transaction_hash = transaction.to_h
@@ -382,7 +465,7 @@ if DependencyHelper.active_job_present?
       end
 
       it "sets provider_job_id as tag" do
-        perform_job(ProviderWrappedActiveJobTestJob)
+        queue_job(ProviderWrappedActiveJobTestJob)
 
         transaction = last_transaction
         transaction_hash = transaction.to_h
@@ -424,7 +507,7 @@ if DependencyHelper.active_job_present?
 
       it "sets queue time on transaction" do
         allow_any_instance_of(Appsignal::Transaction).to receive(:set_queue_start).and_call_original
-        perform_job(ProviderWrappedActiveJobTestJob)
+        queue_job(ProviderWrappedActiveJobTestJob)
 
         transaction = last_transaction
         queue_time = Time.parse("2020-10-10T10:10:10Z")
@@ -459,7 +542,8 @@ if DependencyHelper.active_job_present?
                            "deliver_now"] + active_job_args_wrapper,
               "tags" => {
                 "active_job_id" => kind_of(String),
-                "queue" => "mailers"
+                "queue" => "mailers",
+                "executions" => 1
               }
             )
           )
@@ -479,7 +563,8 @@ if DependencyHelper.active_job_present?
                            "deliver_now"] + active_job_args_wrapper(:args => method_expected_args),
               "tags" => {
                 "active_job_id" => kind_of(String),
-                "queue" => "mailers"
+                "queue" => "mailers",
+                "executions" => 1
               }
             )
           )
@@ -503,7 +588,8 @@ if DependencyHelper.active_job_present?
                 ] + active_job_args_wrapper(:params => parameterized_expected_args),
                 "tags" => {
                   "active_job_id" => kind_of(String),
-                  "queue" => "mailers"
+                  "queue" => "mailers",
+                  "executions" => 1
                 }
               )
             )
@@ -544,7 +630,8 @@ if DependencyHelper.active_job_present?
               ],
               "tags" => {
                 "active_job_id" => kind_of(String),
-                "queue" => "mailers"
+                "queue" => "mailers",
+                "executions" => 1
               }
             )
           )
@@ -570,7 +657,8 @@ if DependencyHelper.active_job_present?
                 ],
                 "tags" => {
                   "active_job_id" => kind_of(String),
-                  "queue" => "mailers"
+                  "queue" => "mailers",
+                  "executions" => 1
                 }
               )
             )
@@ -598,7 +686,8 @@ if DependencyHelper.active_job_present?
                 ],
                 "tags" => {
                   "active_job_id" => kind_of(String),
-                  "queue" => "mailers"
+                  "queue" => "mailers",
+                  "executions" => 1
                 }
               )
             )
@@ -607,11 +696,21 @@ if DependencyHelper.active_job_present?
       end
     end
 
+    def with_test_adapter
+      ActiveJob::Base.queue_adapter = :test
+      ActiveJob::Base.queue_adapter.performed_jobs.clear
+      ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+      ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = true
+      yield
+    ensure
+      ActiveJob::Base.queue_adapter = :inline # Restore to default
+    end
+
     def perform_active_job(&block)
       Timecop.freeze(time, &block)
     end
 
-    def perform_job(job_class, args = nil)
+    def queue_job(job_class, args = nil)
       perform_active_job do
         if args
           job_class.perform_later(args)

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

@@ -17,7 +17,7 @@ describe Appsignal::Hooks::ResqueHook do
 
   if DependencyHelper.resque_present?
     describe "#install" do
-      def perform_job(klass, options = {})
+      def perform_rescue_job(klass, options = {})
         payload = { "class" => klass.to_s }.merge(options)
         job = ::Resque::Job.new(queue, payload)
         keep_transactions { job.perform }
@@ -50,7 +50,7 @@ describe Appsignal::Hooks::ResqueHook do
       end
 
       it "tracks a transaction on perform" do
-        perform_job(ResqueTestJob)
+        perform_rescue_job(ResqueTestJob)
 
         transaction = last_transaction
         transaction_hash = transaction.to_h
@@ -72,7 +72,7 @@ describe Appsignal::Hooks::ResqueHook do
       context "with error" do
         it "tracks the error on the transaction" do
           expect do
-            perform_job(ResqueErrorTestJob)
+            perform_rescue_job(ResqueErrorTestJob)
           end.to raise_error(RuntimeError, "resque job error")
 
           transaction = last_transaction
@@ -102,7 +102,7 @@ describe Appsignal::Hooks::ResqueHook do
         end
 
         it "filters out configured arguments" do
-          perform_job(
+          perform_rescue_job(
             ResqueTestJob,
             "args" => [
               "foo",
@@ -161,7 +161,7 @@ describe Appsignal::Hooks::ResqueHook do
         after { Object.send(:remove_const, :ActiveJobMock) }
 
         it "does not set arguments but lets the ActiveJob integration handle it" do
-          perform_job(
+          perform_rescue_job(
             ResqueTestJob,
             "class" => "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper",
             "args" => [

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

@@ -10,7 +10,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
   before(:context) { start_agent }
   around { |example| keep_transactions { example.run } }
 
-  def perform_job(&block)
+  def perform_shoryuken_job(&block)
     block ||= lambda {}
     Timecop.freeze(Time.parse(time)) do
       Appsignal::Hooks::ShoryukenMiddleware.new.call(
@@ -34,7 +34,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
 
       it "wraps the job in a transaction with the correct params" do
         allow_any_instance_of(Appsignal::Transaction).to receive(:set_queue_start).and_call_original
-        expect { perform_job }.to change { created_transactions.length }.by(1)
+        expect { perform_shoryuken_job }.to change { created_transactions.length }.by(1)
 
         transaction = last_transaction
         expect(transaction).to be_completed
@@ -80,7 +80,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
         end
 
         it "filters selected arguments" do
-          perform_job
+          perform_shoryuken_job
 
           transaction_hash = last_transaction.to_h
           expect(transaction_hash["sample_data"]).to include(
@@ -94,7 +94,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
       let(:body) { "foo bar" }
 
       it "handles string arguments" do
-        perform_job
+        perform_shoryuken_job
 
         transaction_hash = last_transaction.to_h
         expect(transaction_hash["sample_data"]).to include(
@@ -107,7 +107,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
       let(:body) { 1 }
 
       it "handles primitive types as arguments" do
-        perform_job
+        perform_shoryuken_job
 
         transaction_hash = last_transaction.to_h
         expect(transaction_hash["sample_data"]).to include(
@@ -121,7 +121,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
     it "sets the exception on the transaction" do
       expect do
         expect do
-          perform_job { raise ExampleException, "error message" }
+          perform_shoryuken_job { raise ExampleException, "error message" }
         end.to raise_error(ExampleException)
       end.to change { created_transactions.length }.by(1)
 
@@ -167,7 +167,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
     it "creates a transaction for the batch" do
       allow_any_instance_of(Appsignal::Transaction).to receive(:set_queue_start).and_call_original
       expect do
-        perform_job {} # rubocop:disable Lint/EmptyBlock
+        perform_shoryuken_job {} # rubocop:disable Lint/EmptyBlock
       end.to change { created_transactions.length }.by(1)
 
       transaction = last_transaction

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

@@ -43,14 +43,14 @@ if DependencyHelper.que_present?
       end
       around { |example| keep_transactions { example.run } }
 
-      def perform_job(job)
+      def perform_que_job(job)
         job._run
       end
 
       context "success" do
         it "creates a transaction for a job" do
           expect do
-            perform_job(instance)
+            perform_que_job(instance)
           end.to change { created_transactions.length }.by(1)
 
           expect(last_transaction).to be_completed
@@ -96,7 +96,7 @@ if DependencyHelper.que_present?
 
           expect do
             expect do
-              perform_job(instance)
+              perform_que_job(instance)
             end.to raise_error(ExampleException)
           end.to change { created_transactions.length }.by(1)
 
@@ -131,7 +131,7 @@ if DependencyHelper.que_present?
         it "reports errors and not re-raise them" do
           allow(instance).to receive(:run).and_raise(error)
 
-          expect { perform_job(instance) }.to change { created_transactions.length }.by(1)
+          expect { perform_que_job(instance) }.to change { created_transactions.length }.by(1)
 
           expect(last_transaction).to be_completed
           transaction_hash = last_transaction.to_h
@@ -168,7 +168,7 @@ if DependencyHelper.que_present?
         end
 
         it "uses the custom action" do
-          perform_job(instance)
+          perform_que_job(instance)
 
           expect(last_transaction).to be_completed
           transaction_hash = last_transaction.to_h

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

@@ -95,7 +95,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
 
   describe "internal Sidekiq job values" do
     it "does not save internal Sidekiq values as metadata on transaction" do
-      perform_job
+      perform_sidekiq_job
 
       transaction_hash = transaction.to_h
       expect(transaction_hash["metadata"].keys)
@@ -110,7 +110,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
     end
 
     it "filters selected arguments" do
-      perform_job
+      perform_sidekiq_job
 
       transaction_hash = transaction.to_h
       expect(transaction_hash["sample_data"]).to include(
@@ -133,7 +133,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
     end
 
     it "replaces the last argument (the secret bag) with an [encrypted data] string" do
-      perform_job
+      perform_sidekiq_job
 
       transaction_hash = transaction.to_h
       expect(transaction_hash["sample_data"]).to include(
@@ -159,7 +159,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
     end
 
     it "uses the delayed class and method name for the action" do
-      perform_job
+      perform_sidekiq_job
 
       transaction_hash = transaction.to_h
       expect(transaction_hash["action"]).to eq("DelayedTestClass.foo_method")
@@ -172,7 +172,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
       before { item["args"] = [] }
 
       it "logs a warning and uses the default argument" do
-        perform_job
+        perform_sidekiq_job
 
         transaction_hash = transaction.to_h
         expect(transaction_hash["action"]).to eq("Sidekiq::Extensions::DelayedClass#perform")
@@ -199,7 +199,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
     end
 
     it "uses the delayed class and method name for the action" do
-      perform_job
+      perform_sidekiq_job
 
       transaction_hash = transaction.to_h
       expect(transaction_hash["action"]).to eq("DelayedTestClass#foo_method")
@@ -212,7 +212,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
       before { item["args"] = [] }
 
       it "logs a warning and uses the default argument" do
-        perform_job
+        perform_sidekiq_job
 
         transaction_hash = transaction.to_h
         expect(transaction_hash["action"]).to eq("Sidekiq::Extensions::DelayedModel#perform")
@@ -233,7 +233,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
       expect(Appsignal).to receive(:increment_counter)
         .with("sidekiq_queue_job_count", 1, { :queue => "default", :status => :processed })
       expect do
-        perform_job { raise error, "uh oh" }
+        perform_sidekiq_job { raise error, "uh oh" }
       end.to raise_error(error)
 
       transaction_hash = transaction.to_h
@@ -271,7 +271,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
       it "reports the worker name as the action, copies the namespace and tags" do
         Appsignal.config = project_fixture_config("production")
         with_rails_error_reporter do
-          perform_job do
+          perform_sidekiq_job do
             Appsignal.tag_job("test_tag" => "value")
             Rails.error.handle do
               raise ExampleStandardError, "uh oh"
@@ -301,7 +301,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
       # https://github.com/rspec/rspec-mocks/issues/1460
       expect(Appsignal).to receive(:increment_counter)
         .with("sidekiq_queue_job_count", 1, { :queue => "default", :status => :processed })
-      perform_job
+      perform_sidekiq_job
 
       transaction_hash = transaction.to_h
       expect(transaction_hash).to include(
@@ -330,7 +330,7 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
     end
   end
 
-  def perform_job
+  def perform_sidekiq_job
     Timecop.freeze(Time.parse("2001-01-01 10:01:00UTC")) do
       exception = nil
       plugin.call(worker, item, queue) do
@@ -407,7 +407,7 @@ if DependencyHelper.active_job_present?
       end
     end
     let(:expected_tags) do
-      {}.tap do |hash|
+      { "executions" => 1 }.tap do |hash|
         hash["active_job_id"] = kind_of(String)
         if DependencyHelper.rails_version >= Gem::Version.new("5.0.0")
           hash["provider_job_id"] = kind_of(String)
@@ -460,7 +460,7 @@ if DependencyHelper.active_job_present?
     end
 
     it "reports the transaction from the ActiveJob integration" do
-      perform_job(ActiveJobSidekiqTestJob, given_args)
+      perform_sidekiq_job(ActiveJobSidekiqTestJob, given_args)
 
       transaction = last_transaction
       transaction_hash = transaction.to_h
@@ -488,7 +488,7 @@ if DependencyHelper.active_job_present?
     context "with error" do
       it "reports the error on the transaction from the ActiveRecord integration" do
         expect do
-          perform_job(ActiveJobSidekiqErrorTestJob, given_args)
+          perform_sidekiq_job(ActiveJobSidekiqErrorTestJob, given_args)
         end.to raise_error(RuntimeError, "uh oh")
 
         transaction = last_transaction
@@ -557,7 +557,7 @@ if DependencyHelper.active_job_present?
       end
     end
 
-    def perform_job(job_class, args)
+    def perform_sidekiq_job(job_class, args)
       perform_sidekiq { job_class.perform_later(args) }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -452,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com