appsignal 2.11.0.beta.3-java → 2.11.1-java

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

@@ -110,7 +110,10 @@ if DependencyHelper.active_job_present?
         "metadata" => {},
         "sample_data" => hash_including(
           "params" => [],
-          "tags" => { "queue" => queue }
+          "tags" => {
+            "active_job_id" => kind_of(String),
+            "queue" => queue
+          }
         )
       )
       events = transaction_hash["events"]
@@ -130,7 +133,7 @@ if DependencyHelper.active_job_present?
         transaction_hash = transaction.to_h
         expect(transaction_hash).to include(
           "sample_data" => hash_including(
-            "tags" => { "queue" => "custom_queue" }
+            "tags" => hash_including("queue" => "custom_queue")
           )
         )
       end
@@ -151,9 +154,11 @@ if DependencyHelper.active_job_present?
         end
 
         it "reports the priority as tag on the transaction" do
-          tags = { :priority => 10, :queue => queue }
+          tags = { :queue => queue }
           expect(Appsignal).to receive(:increment_counter)
             .with("active_job_queue_job_count", 1, tags.merge(:status => :processed))
+          expect(Appsignal).to receive(:increment_counter)
+            .with("active_job_queue_priority_job_count", 1, tags.merge(:priority => 10, :status => :processed))
 
           perform_job(ActiveJobPriorityTestJob)
 
@@ -161,7 +166,7 @@ if DependencyHelper.active_job_present?
           transaction_hash = transaction.to_h
           expect(transaction_hash).to include(
             "sample_data" => hash_including(
-              "tags" => { "queue" => queue, "priority" => 10 }
+              "tags" => hash_including("queue" => queue, "priority" => 10)
             )
           )
         end
@@ -194,7 +199,10 @@ if DependencyHelper.active_job_present?
           "metadata" => {},
           "sample_data" => hash_including(
             "params" => [],
-            "tags" => { "queue" => queue }
+            "tags" => {
+              "active_job_id" => kind_of(String),
+              "queue" => queue
+            }
           )
         )
         events = transaction_hash["events"]
@@ -202,6 +210,47 @@ if DependencyHelper.active_job_present?
           .map { |event| event["name"] }
         expect(events).to eq(["perform_start.active_job", "perform.active_job"])
       end
+
+      if DependencyHelper.rails_version >= Gem::Version.new("5.0.0")
+        context "with priority" do
+          before do
+            class ActiveJobErrorPriorityTestJob < ActiveJob::Base
+              queue_with_priority 10
+
+              def perform(*_args)
+                raise "uh oh"
+              end
+            end
+          end
+          after do
+            Object.send(:remove_const, :ActiveJobErrorPriorityTestJob)
+          end
+
+          it "reports the priority as tag on the transaction" do
+            tags = { :queue => queue }
+            expect(Appsignal).to receive(:increment_counter)
+              .with("active_job_queue_job_count", 1, tags.merge(:status => :processed))
+            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_priority_job_count", 1, tags.merge(:priority => 10, :status => :processed))
+            expect(Appsignal).to receive(:increment_counter)
+              .with("active_job_queue_priority_job_count", 1, tags.merge(:priority => 10, :status => :failed))
+
+            expect do
+              perform_job(ActiveJobErrorPriorityTestJob)
+            end.to raise_error(RuntimeError, "uh oh")
+
+            transaction = last_transaction
+            transaction_hash = transaction.to_h
+            expect(transaction_hash).to include(
+              "sample_data" => hash_including(
+                "tags" => hash_including("queue" => queue, "priority" => 10)
+              )
+            )
+          end
+        end
+      end
     end
 
     context "when wrapped in another transaction" do
@@ -227,7 +276,10 @@ if DependencyHelper.active_job_present?
           "metadata" => {},
           "sample_data" => hash_including(
             "params" => [],
-            "tags" => { "queue" => queue }
+            "tags" => {
+              "active_job_id" => kind_of(String),
+              "queue" => queue
+            }
           )
         )
         events = transaction_hash["events"]
@@ -363,7 +415,10 @@ if DependencyHelper.active_job_present?
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
               "params" => ["ActionMailerTestJob", "welcome", "deliver_now"],
-              "tags" => { "queue" => "mailers" }
+              "tags" => {
+                "active_job_id" => kind_of(String),
+                "queue" => "mailers"
+              }
             )
           )
         end
@@ -379,7 +434,10 @@ if DependencyHelper.active_job_present?
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
               "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + method_expected_args,
-              "tags" => { "queue" => "mailers" }
+              "tags" => {
+                "active_job_id" => kind_of(String),
+                "queue" => "mailers"
+              }
             )
           )
         end
@@ -396,7 +454,10 @@ if DependencyHelper.active_job_present?
               "action" => "ActionMailerTestJob#welcome",
               "sample_data" => hash_including(
                 "params" => ["ActionMailerTestJob", "welcome", "deliver_now", parameterized_expected_args],
-                "tags" => { "queue" => "mailers" }
+                "tags" => {
+                  "active_job_id" => kind_of(String),
+                  "queue" => "mailers"
+                }
               )
             )
           end
@@ -434,7 +495,10 @@ if DependencyHelper.active_job_present?
                 "deliver_now",
                 { active_job_internal_key => ["args"], "args" => [] }
               ],
-              "tags" => { "queue" => "mailers" }
+              "tags" => {
+                "active_job_id" => kind_of(String),
+                "queue" => "mailers"
+              }
             )
           )
         end
@@ -457,7 +521,10 @@ if DependencyHelper.active_job_present?
                     "args" => method_expected_args
                   }
                 ],
-                "tags" => { "queue" => "mailers" }
+                "tags" => {
+                  "active_job_id" => kind_of(String),
+                  "queue" => "mailers"
+                }
               )
             )
           end
@@ -482,7 +549,10 @@ if DependencyHelper.active_job_present?
                     "params" => parameterized_expected_args
                   }
                 ],
-                "tags" => { "queue" => "mailers" }
+                "tags" => {
+                  "active_job_id" => kind_of(String),
+                  "queue" => "mailers"
+                }
               )
             )
           end

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

@@ -227,25 +227,14 @@ describe Appsignal::Hooks::DelayedJobHook do
           end
         end
 
-        context "without job name" do
-          let(:job_data) do
-            { :name => "", :payload_object => payload_object }
-          end
-
-          it "wraps it in a transaction using the class method job name" do
-            perform
-            expect(last_transaction.to_h["action"]).to eql("unknown")
-          end
-        end
-
-        context "with invalid job name" do
+        context "with only job class name" do
           let(:job_data) do
             { :name => "Banana", :payload_object => payload_object }
           end
 
-          it "wraps it in a transaction using the class method job name" do
+          it "appends #perform to the class name" do
             perform
-            expect(last_transaction.to_h["action"]).to eql("unknown")
+            expect(last_transaction.to_h["action"]).to eql("Banana#perform")
           end
         end
 

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

@@ -76,9 +76,10 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
     ]
   end
   let(:job_class) { "TestClass" }
+  let(:jid) { "b4a577edbccf1d805744efa9" }
   let(:item) do
     {
-      "jid"         => "b4a577edbccf1d805744efa9",
+      "jid"         => jid,
       "class"       => job_class,
       "retry_count" => 0,
       "queue"       => "default",
@@ -151,7 +152,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
   context "when using the Sidekiq delayed extension" do
     let(:item) do
       {
-        "jid" => "efb140489485999d32b5504c",
+        "jid" => jid,
         "class" => "Sidekiq::Extensions::DelayedClass",
         "queue" => "default",
         "args" => [
@@ -191,7 +192,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
   context "when using the Sidekiq ActiveRecord instance delayed extension" do
     let(:item) do
       {
-        "jid" => "efb140489485999d32b5504c",
+        "jid" => jid,
         "class" => "Sidekiq::Extensions::DelayedModel",
         "queue" => "default",
         "args" => [
@@ -243,7 +244,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
 
       transaction_hash = transaction.to_h
       expect(transaction_hash).to include(
-        "id" => kind_of(String),
+        "id" => jid,
         "action" => "TestClass#perform",
         "error" => {
           "name" => "ExampleException",
@@ -277,7 +278,7 @@ describe Appsignal::Hooks::SidekiqPlugin, :with_yaml_parse_error => false do
 
       transaction_hash = transaction.to_h
       expect(transaction_hash).to include(
-        "id" => kind_of(String),
+        "id" => jid,
         "action" => "TestClass#perform",
         "error" => nil,
         "metadata" => {
@@ -361,6 +362,7 @@ if DependencyHelper.active_job_present?
     end
     let(:expected_tags) do
       {}.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)
         end

data/spec/lib/appsignal/hooks_spec.rb

@@ -78,6 +78,63 @@ describe Appsignal::Hooks do
     expect(Appsignal::Hooks.hooks[:mock_error_hook].installed?).to be_falsy
     Appsignal::Hooks.hooks.delete(:mock_error_hook)
   end
+
+  describe "missing constants" do
+    let(:err_stream) { std_stream }
+    let(:stderr) { err_stream.read }
+    let(:log_stream) { std_stream }
+    let(:log) { log_contents(log_stream) }
+    before do
+      Appsignal.logger = test_logger(log_stream)
+    end
+
+    def call_constant(&block)
+      capture_std_streams(std_stream, err_stream, &block)
+    end
+
+    describe "SidekiqProbe" do
+      it "logs a deprecation message and returns the new constant" do
+        constant = call_constant { Appsignal::Hooks::SidekiqProbe }
+
+        expect(constant).to eql(Appsignal::Probes::SidekiqProbe)
+        expect(constant.name).to eql("Appsignal::Probes::SidekiqProbe")
+
+        deprecation_message =
+          "The constant Appsignal::Hooks::SidekiqProbe has been deprecated. " \
+          "Please update the constant name to Appsignal::Probes::SidekiqProbe " \
+          "in the following file to remove this message.\n#{__FILE__}:"
+        expect(stderr).to include "appsignal WARNING: #{deprecation_message}"
+        expect(log).to contains_log :warn, deprecation_message
+      end
+    end
+
+    describe "PumaProbe" do
+      it "logs a deprecation message and returns the new constant" do
+        constant = call_constant { Appsignal::Hooks::PumaProbe }
+
+        expect(constant).to eql(Appsignal::Probes::PumaProbe)
+        expect(constant.name).to eql("Appsignal::Probes::PumaProbe")
+
+        deprecation_message =
+          "The constant Appsignal::Hooks::PumaProbe has been deprecated. " \
+          "Please update the constant name to Appsignal::Probes::PumaProbe " \
+          "in the following file to remove this message.\n#{__FILE__}:"
+        expect(stderr).to include "appsignal WARNING: #{deprecation_message}"
+        expect(log).to contains_log :warn, deprecation_message
+      end
+    end
+
+    describe "other constant" do
+      it "raises a NameError like Ruby normally does" do
+        expect do
+          call_constant { Appsignal::Hooks::Unknown }
+        end.to raise_error(NameError)
+
+        expect(stderr).to be_empty
+        expect(log).to be_empty
+      end
+    end
+  end
 end
 
 describe Appsignal::Hooks::Helpers do

data/spec/lib/appsignal/marker_spec.rb

@@ -4,7 +4,7 @@ describe Appsignal::Marker do
     described_class.new(
       {
         :revision => "503ce0923ed177a3ce000005",
-        :repository => "master",
+        :repository => "main",
         :user => "batman",
         :rails_env => "production"
       },

data/spec/spec_helper.rb

@@ -65,6 +65,10 @@ RSpec.configure do |config|
 
   config.example_status_persistence_file_path = "spec/examples.txt"
   config.fail_if_no_examples = true
+  config.filter_run_excluding(
+    :extension_installation_failure => true,
+    :jruby => !DependencyHelper.running_jruby?
+  )
   config.mock_with :rspec do |mocks|
     mocks.syntax = :expect
   end
@@ -111,6 +115,7 @@ RSpec.configure do |config|
     # in the diagnose task, so add it manually to the list of to-be cleaned up
     # keys.
     env_keys << "_APPSIGNAL_DIAGNOSE"
+    env_keys << "_TEST_APPSIGNAL_EXTENSION_FAILURE"
     env_keys.each do |key|
       # First set the ENV var to an empty string and then delete the key from
       # the env. We set the env var to an empty string first as JRuby doesn't

data/spec/support/helpers/config_helpers.rb

@@ -5,12 +5,13 @@ module ConfigHelpers
     )
   end
 
-  def project_fixture_config(env = "production", initial_config = {}, logger = Appsignal.logger)
+  def project_fixture_config(env = "production", initial_config = {}, logger = Appsignal.logger, config_file = nil)
     Appsignal::Config.new(
       project_fixture_path,
       env,
       initial_config,
-      logger
+      logger,
+      config_file
     )
   end
 

data/spec/support/helpers/dependency_helper.rb

@@ -37,6 +37,10 @@ module DependencyHelper
     dependency_present? "actioncable"
   end
 
+  def action_mailer_present?
+    dependency_present? "actionmailer"
+  end
+
   def active_job_present?
     dependency_present? "activejob"
   end

data/spec/support/helpers/transaction_helpers.rb

@@ -46,7 +46,7 @@ module TransactionHelpers
 
   # Set current transaction manually.
   # Cleared by {clear_current_transaction!}
-  def set_current_transaction(transaction) # rubocop:disable Style/AccessorMethodName
+  def set_current_transaction(transaction) # rubocop:disable Naming/AccessorMethodName
     Thread.current[:appsignal_transaction] = transaction
   end
 

data/spec/support/testing.rb

@@ -38,25 +38,9 @@ module Appsignal
     end
   end
 
-  class Transaction
-    class << self
-      alias original_new new
-
-      # Override the {Appsignal::Transaction.new} method so we can track which
-      # transactions are created on the {Appsignal::Testing.transactions} list.
-      #
-      # @see TransactionHelpers#last_transaction
-      def new(*args)
-        transaction = original_new(*args)
-        Appsignal::Testing.transactions << transaction
-        transaction
-      end
-    end
-  end
-
   class Extension
     class Transaction
-      alias original_finish finish
+      alias original_finish finish if method_defined? :finish
 
       # Override default {Extension::Transaction#finish} behavior to always
       # return true, which tells the transaction to add its sample data (unless
@@ -72,7 +56,7 @@ module Appsignal
         return_value
       end
 
-      alias original_complete complete
+      alias original_complete complete if method_defined? :complete
 
       # Override default {Extension::Transaction#complete} behavior to
       # store the transaction JSON before the transaction is completed
@@ -94,7 +78,7 @@ module Appsignal
         @completed || false
       end
 
-      alias original_to_json to_json
+      alias original_to_json to_json if method_defined? :to_json
 
       # Override default {Extension::Transaction#to_json} behavior to
       # return the stored the transaction JSON when the transaction was
@@ -111,3 +95,19 @@ module Appsignal
     end
   end
 end
+
+module AppsignalTest
+  module Transaction
+    # Override the {Appsignal::Transaction.new} method so we can track which
+    # transactions are created on the {Appsignal::Testing.transactions} list.
+    #
+    # @see TransactionHelpers#last_transaction
+    def new(*_args)
+      transaction = super
+      Appsignal::Testing.transactions << transaction
+      transaction
+    end
+  end
+end
+
+Appsignal::Transaction.extend(AppsignalTest::Transaction)