appsignal 3.13.1-java → 4.0.0.beta.1-java

data/spec/lib/appsignal/extension_install_failure_spec.rb

@@ -6,7 +6,11 @@ describe Appsignal::Extension, :extension_installation_failure do
       expect(stderr).to include("ERROR: AppSignal failed to load extension")
       error_message =
         if DependencyHelper.running_jruby?
-          "cannot open shared object file"
+          if DependencyHelper.macos?
+            "Could not open library"
+          else
+            "cannot open shared object file"
+          end
         else
           "LoadError: cannot load such file"
         end

data/spec/lib/appsignal/extension_spec.rb

@@ -49,7 +49,7 @@ describe Appsignal::Extension do
 
     context "with a valid config" do
       before do
-        project_fixture_config.write_to_environment
+        build_config.write_to_environment
       end
 
       it "should have a start and stop method" do
@@ -100,6 +100,10 @@ describe Appsignal::Extension do
           subject.finish(0)
         end
 
+        it "should have a duplicate method" do
+          subject.duplicate("request_id")
+        end
+
         it "should have a complete method" do
           subject.complete
         end

data/spec/lib/appsignal/hooks/active_support_notifications/instrument_shared_examples.rb

@@ -88,12 +88,12 @@ shared_examples "activesupport instrument override" do
 
   context "when a transaction is completed in an instrumented block" do
     it "does not complete the ActiveSupport::Notifications.instrument event" do
-      expect(transaction).to receive(:complete)
       as.instrument("sql.active_record", :sql => "SQL") do
         Appsignal::Transaction.complete_current!
       end
 
       expect(transaction).to_not include_events
+      expect(transaction).to be_completed
     end
   end
 end

data/spec/lib/appsignal/hooks/active_support_notifications/start_finish_shared_examples.rb

@@ -36,13 +36,12 @@ shared_examples "activesupport start finish override" do
 
   context "when a transaction is completed in an instrumented block" do
     it "does not complete the ActiveSupport::Notifications.instrument event" do
-      expect(transaction).to receive(:complete)
-
       instrumenter.start("sql.active_record", {})
       Appsignal::Transaction.complete_current!
       instrumenter.finish("sql.active_record", {})
 
       expect(transaction).to_not include_events
+      expect(transaction).to be_completed
     end
   end
 end

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

@@ -10,6 +10,7 @@ describe Appsignal::Hooks::ActiveSupportNotificationsHook do
       set_current_transaction(transaction)
       as.notifier = notifier
     end
+    around { |example| keep_transactions { example.run } }
 
     describe "#dependencies_present?" do
       subject { described_class.new.dependencies_present? }

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

@@ -34,7 +34,6 @@ if DependencyHelper.active_job_present?
     let(:time) { Time.parse("2001-01-01 10:00:00UTC") }
     let(:namespace) { Appsignal::Transaction::BACKGROUND_JOB }
     let(:queue) { "default" }
-    let(:log) { StringIO.new }
     let(:parameterized_given_args) do
       {
         :foo => "Foo",
@@ -72,11 +71,11 @@ if DependencyHelper.active_job_present?
         ["perform_start.active_job", "perform.active_job"]
       end
     end
+    let(:options) { {} }
     before do
       ActiveJob::Base.queue_adapter = :inline
 
-      start_agent
-      Appsignal.internal_logger = test_logger(log)
+      start_agent(:options => options)
       class ActiveJobTestJob < ActiveJob::Base
         def perform(*_args)
         end
@@ -209,10 +208,9 @@ if DependencyHelper.active_job_present?
       end
 
       context "with activejob_report_errors set to none" do
-        it "does not report the error" do
-          start_agent("production")
-          Appsignal.config[:activejob_report_errors] = "none"
+        let(:options) { { :activejob_report_errors => "none" } }
 
+        it "does not report the error" do
           allow(Appsignal).to receive(:increment_counter)
           tags = { :queue => queue }
           expect(Appsignal).to receive(:increment_counter)
@@ -228,10 +226,7 @@ if DependencyHelper.active_job_present?
 
       if DependencyHelper.rails_version >= Gem::Version.new("7.1.0")
         context "with activejob_report_errors set to discard" do
-          before do
-            start_agent("production")
-            Appsignal.config[:activejob_report_errors] = "discard"
-          end
+          let(:options) { { :activejob_report_errors => "discard" } }
 
           it "does not report error on first failure" do
             with_test_adapter do
@@ -351,9 +346,9 @@ if DependencyHelper.active_job_present?
     end
 
     context "with params" do
+      let(:options) { { :filter_parameters => ["foo"] } }
+
       it "filters the configured params" do
-        start_agent("production")
-        Appsignal.config[:filter_parameters] = ["foo"]
         queue_job(ActiveJobTestJob, method_given_args)
 
         transaction = last_transaction

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

@@ -0,0 +1,72 @@
+describe Appsignal::Hooks::AtExit do
+  describe ".install" do
+    before { start_agent(:options => options) }
+
+    context "with :enable_at_exit_reporter == true" do
+      let(:options) { { :enable_at_exit_reporter => true } }
+
+      it "installs the at_exit hook" do
+        expect(Appsignal::Hooks::AtExit::AtExitCallback).to receive(:call)
+
+        expect(Kernel).to receive(:at_exit).with(no_args) do |*_args, &block|
+          block.call
+        end
+
+        described_class.new.install
+      end
+    end
+
+    context "with :enable_at_exit_reporter == false" do
+      let(:options) { { :enable_at_exit_reporter => false } }
+
+      it "doesn't install the at_exit hook" do
+        expect(Kernel).to_not receive(:at_exit)
+      end
+    end
+  end
+end
+
+describe Appsignal::Hooks::AtExit::AtExitCallback do
+  around { |example| keep_transactions { example.run } }
+  before { start_agent(:options => { :enable_at_exit_reporter => true }) }
+
+  def with_error(error_class, error_message)
+    raise error_class, error_message
+  rescue error_class => error
+    yield error
+  end
+
+  def call_callback
+    Appsignal::Hooks::AtExit::AtExitCallback.call
+  end
+
+  it "reports an error if there's an unhandled error" do
+    expect do
+      with_error(ExampleException, "error message") do
+        call_callback
+      end
+    end.to change { created_transactions.count }.by(1)
+
+    transaction = last_transaction
+    expect(transaction).to have_namespace("unhandled")
+    expect(transaction).to have_error("ExampleException", "error message")
+  end
+
+  it "calls Appsignal.stop" do
+    expect(Appsignal).to receive(:stop).with("at_exit")
+    with_error(ExampleException, "error message") do
+      call_callback
+    end
+  end
+
+  it "doesn't report the error if is also the last error reported" do
+    with_error(ExampleException, "error message") do |error|
+      Appsignal.report_error(error)
+      expect(created_transactions.count).to eq(1)
+
+      expect do
+        call_callback
+      end.to_not change { created_transactions.count }.from(1)
+    end
+  end
+end

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

@@ -7,8 +7,9 @@ describe Appsignal::Hooks::GvlHook do
       end
     end
   else
+    let(:options) { {} }
     before do
-      start_agent
+      start_agent(:options => options)
     end
 
     def expect_gvltools_require
@@ -100,8 +101,9 @@ describe Appsignal::Hooks::GvlHook do
 
       describe "#install" do
         context "with enable_gvl_global_timer" do
+          let(:options) { { :enable_gvl_global_timer => true } }
+
           it "enables the GVL global timer" do
-            Appsignal.config[:enable_gvl_global_timer] = true
             expect(::GVLTools::GlobalTimer).to receive(:enable)
 
             described_class.new.install
@@ -109,8 +111,9 @@ describe Appsignal::Hooks::GvlHook do
         end
 
         context "without enable_gvl_global_timer" do
+          let(:options) { { :enable_gvl_global_timer => false } }
+
           it "does not enable the GVL global timer" do
-            Appsignal.config[:enable_gvl_global_timer] = false
             expect(::GVLTools::GlobalTimer).not_to receive(:enable)
 
             described_class.new.install
@@ -118,8 +121,9 @@ describe Appsignal::Hooks::GvlHook do
         end
 
         context "with enable_gvl_waiting_threads" do
+          let(:options) { { :enable_gvl_waiting_threads => true } }
+
           it "enables the GVL waiting threads" do
-            Appsignal.config[:enable_gvl_global_timer] = true
             expect(::GVLTools::WaitingThreads).to receive(:enable)
 
             described_class.new.install
@@ -127,8 +131,9 @@ describe Appsignal::Hooks::GvlHook do
         end
 
         context "without enable_gvl_waiting_threads" do
+          let(:options) { { :enable_gvl_waiting_threads => false } }
+
           it "does not enable the GVL waiting threads" do
-            Appsignal.config[:enable_gvl_waiting_threads] = false
             expect(::GVLTools::WaitingThreads).not_to receive(:enable)
 
             described_class.new.install

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 describe Appsignal::Hooks::HttpHook do
-  before { start_agent }
+  let(:options) { {} }
+  before { start_agent(:options => options) }
 
   if DependencyHelper.http_present?
     context "with instrument_http_rb set to true" do
@@ -18,8 +19,7 @@ describe Appsignal::Hooks::HttpHook do
     end
 
     context "with instrument_http_rb set to false" do
-      before { Appsignal.config.config_hash[:instrument_http_rb] = false }
-      after { Appsignal.config.config_hash[:instrument_http_rb] = true }
+      let(:options) { { :instrument_http_rb => false } }
 
       describe "#dependencies_present?" do
         subject { described_class.new.dependencies_present? }

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

@@ -1,5 +1,6 @@
 describe Appsignal::Hooks::NetHttpHook do
-  before { start_agent }
+  let(:options) { {} }
+  before { start_agent(:options => options) }
 
   describe "#dependencies_present?" do
     subject { described_class.new.dependencies_present? }
@@ -9,8 +10,7 @@ describe Appsignal::Hooks::NetHttpHook do
     end
 
     context "with Net::HTTP instrumentation disabled" do
-      before { Appsignal.config.config_hash[:instrument_net_http] = false }
-      after { Appsignal.config.config_hash[:instrument_net_http] = true }
+      let(:options) { { :instrument_net_http => false } }
 
       it { is_expected.to be_falsy }
     end

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

@@ -4,8 +4,9 @@ describe Appsignal::Hooks::RakeHook do
   let(:helper) { Appsignal::Integrations::RakeIntegrationHelper }
   let(:task) { Rake::Task.new("task:name", Rake::Application.new) }
   let(:arguments) { Rake::TaskArguments.new(["foo"], ["bar"]) }
+  let(:options) { {} }
   before do
-    start_agent
+    start_agent(:options => options)
     allow(Kernel).to receive(:at_exit)
   end
   around { |example| keep_transactions { example.run } }
@@ -30,9 +31,7 @@ describe Appsignal::Hooks::RakeHook do
       end
 
       context "with :enable_rake_performance_instrumentation == false" do
-        before do
-          Appsignal.config[:enable_rake_performance_instrumentation] = false
-        end
+        let(:options) { { :enable_rake_performance_instrumentation => false } }
 
         it "creates no transaction" do
           expect { perform }.to_not(change { created_transactions.count })
@@ -49,16 +48,14 @@ describe Appsignal::Hooks::RakeHook do
       end
 
       context "with :enable_rake_performance_instrumentation == true" do
-        before do
-          Appsignal.config[:enable_rake_performance_instrumentation] = true
-        end
+        let(:options) { { :enable_rake_performance_instrumentation => true } }
 
         it "creates a transaction" do
           expect { perform }.to(change { created_transactions.count }.by(1))
 
           transaction = last_transaction
           expect(transaction).to have_id
-          expect(transaction).to have_namespace(Appsignal::Transaction::BACKGROUND_JOB)
+          expect(transaction).to have_namespace("rake")
           expect(transaction).to have_action("task:name")
           expect(transaction).to_not have_error
           expect(transaction).to include_params("foo" => "bar")
@@ -91,7 +88,7 @@ describe Appsignal::Hooks::RakeHook do
 
         transaction = last_transaction
         expect(transaction).to have_id
-        expect(transaction).to have_namespace(Appsignal::Transaction::BACKGROUND_JOB)
+        expect(transaction).to have_namespace("rake")
         expect(transaction).to have_action("task:name")
         expect(transaction).to have_error("ExampleException", "error message")
         expect(transaction).to include_params("foo" => "bar")

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

@@ -1,6 +1,7 @@
 describe Appsignal::Hooks::RedisClientHook do
+  let(:options) { {} }
   before do
-    start_agent
+    start_agent(:options => options)
   end
 
   if DependencyHelper.redis_client_present?
@@ -30,9 +31,7 @@ describe Appsignal::Hooks::RedisClientHook do
 
         context "with rest-client gem" do
           describe "integration" do
-            before do
-              Appsignal.config.config_hash[:instrument_redis] = true
-            end
+            let(:options) { { :instrument_redis => true } }
 
             context "install" do
               before do
@@ -115,9 +114,7 @@ describe Appsignal::Hooks::RedisClientHook do
         if DependencyHelper.hiredis_client_present?
           context "with hiredis driver" do
             describe "integration" do
-              before do
-                Appsignal.config.config_hash[:instrument_redis] = true
-              end
+              let(:options) { { :instrument_redis => true } }
 
               context "install" do
                 before do
@@ -200,9 +197,7 @@ describe Appsignal::Hooks::RedisClientHook do
       end
 
       context "with instrumentation disabled" do
-        before do
-          Appsignal.config.config_hash[:instrument_redis] = false
-        end
+        let(:options) { { :instrument_redis => false } }
 
         describe "#dependencies_present?" do
           subject { described_class.new.dependencies_present? }

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

@@ -1,5 +1,6 @@
 describe Appsignal::Hooks::RedisHook do
-  before { start_agent }
+  let(:options) { {} }
+  before { start_agent(:options => options) }
 
   if DependencyHelper.redis_present?
     context "with redis" do
@@ -22,9 +23,7 @@ describe Appsignal::Hooks::RedisHook do
           end
 
           describe "integration" do
-            before do
-              Appsignal.config.config_hash[:instrument_redis] = true
-            end
+            let(:options) { { :instrument_redis => true } }
 
             context "install" do
               before do
@@ -103,9 +102,7 @@ describe Appsignal::Hooks::RedisHook do
         end
 
         context "with instrumentation disabled" do
-          before do
-            Appsignal.config.config_hash[:instrument_redis] = false
-          end
+          let(:options) { { :instrument_redis => false } }
 
           describe "#dependencies_present?" do
             subject { described_class.new.dependencies_present? }

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

@@ -25,8 +25,9 @@ describe Appsignal::Hooks::ResqueHook do
 
       let(:queue) { "default" }
       let(:namespace) { Appsignal::Transaction::BACKGROUND_JOB }
+      let(:options) { {} }
       before do
-        start_agent
+        start_agent(:options => options)
 
         class ResqueTestJob
           def self.perform(*_args)
@@ -82,10 +83,7 @@ describe Appsignal::Hooks::ResqueHook do
       end
 
       context "with arguments" do
-        before do
-          start_agent("production")
-          Appsignal.config[:filter_parameters] = ["foo"]
-        end
+        let(:options) { { :filter_parameters => ["foo"] } }
 
         it "filters out configured arguments" do
           perform_rescue_job(

data/spec/lib/appsignal/hooks_spec.rb

@@ -82,47 +82,6 @@ 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.internal_logger = test_logger(log_stream)
-    end
-
-    def call_constant(&block)
-      capture_std_streams(std_stream, err_stream, &block)
-    end
-
-    describe "SidekiqPlugin" do
-      it "logs a deprecation message and returns the new constant" do
-        constant = call_constant { Appsignal::Hooks::SidekiqPlugin }
-
-        expect(constant).to eql(Appsignal::Integrations::SidekiqMiddleware)
-        expect(constant.name).to eql("Appsignal::Integrations::SidekiqMiddleware")
-
-        deprecation_message =
-          "The constant Appsignal::Hooks::SidekiqPlugin has been deprecated. " \
-            "Please update the constant name to Appsignal::Integrations::SidekiqMiddleware " \
-            "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/integrations/data_mapper_spec.rb

@@ -7,11 +7,11 @@ describe Appsignal::Hooks::DataMapperLogListener do
   end
 
   describe "#log" do
-    let(:transaction) { double }
+    let(:transaction) { http_request_transaction }
     let(:message) do
       double(
         :query    => "SELECT * from users",
-        :duration => 100
+        :duration => 100_000_000 # nanoseconds
       )
     end
     let(:connection_class) do
@@ -24,20 +24,29 @@ describe Appsignal::Hooks::DataMapperLogListener do
         end
       end
     end
+    before do
+      start_agent
+      set_current_transaction(transaction)
+    end
+    around { |example| keep_transactions { example.run } }
+
+    def log_message
+      connection_class.new.log(message)
+    end
 
-    before { allow(Appsignal::Transaction).to receive(:current) { transaction } }
+    it "records the log entry in an event" do
+      log_message
 
-    it "should record the log entry in an event" do
-      expect(transaction).to receive(:record_event).with(
-        "query.data_mapper",
-        "DataMapper Query",
-        "SELECT * from users",
-        100,
-        Appsignal::EventFormatter::SQL_BODY_FORMAT
+      expect(transaction).to include_event(
+        "name" => "query.data_mapper",
+        "title" => "DataMapper Query",
+        "body" => "SELECT * from users",
+        "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+        "duration" => 100.0
       )
     end
 
-    context "when scheme is not sql-like" do
+    context "when the scheme is not sql-like" do
       let(:connection_class) do
         module DataObjects
           module MongoDB
@@ -49,17 +58,17 @@ describe Appsignal::Hooks::DataMapperLogListener do
         end
       end
 
-      it "should record the log entry in an event without body" do
-        expect(transaction).to receive(:record_event).with(
-          "query.data_mapper",
-          "DataMapper Query",
-          "",
-          100,
-          Appsignal::EventFormatter::DEFAULT
+      it "records the log entry in an event without body" do
+        log_message
+
+        expect(transaction).to include_event(
+          "name" => "query.data_mapper",
+          "title" => "DataMapper Query",
+          "body" => "",
+          "body_format" => Appsignal::EventFormatter::DEFAULT,
+          "duration" => 100.0
         )
       end
     end
-
-    after { connection_class.new.log(message) }
   end
 end

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

@@ -15,7 +15,8 @@ describe "Appsignal::Integrations::DelayedJobHook" do
     require "appsignal/integrations/delayed_job_plugin"
   end
   after(:context) { Object.send(:remove_const, :Delayed) }
-  before { start_agent }
+  let(:options) { {} }
+  before { start_agent(:options => options) }
 
   # We haven't found a way to test the hooks, we'll have to do that manually
 
@@ -82,10 +83,7 @@ describe "Appsignal::Integrations::DelayedJobHook" do
         end
 
         context "with parameter filtering" do
-          before do
-            start_agent("production")
-            Appsignal.config[:filter_parameters] = ["foo"]
-          end
+          let(:options) { { :filter_parameters => ["foo"] } }
 
           it "filters selected arguments" do
             perform
@@ -271,10 +269,7 @@ describe "Appsignal::Integrations::DelayedJobHook" do
             end
 
             context "with parameter filtering" do
-              before do
-                start_agent("production")
-                Appsignal.config[:filter_parameters] = ["foo"]
-              end
+              let(:options) { { :filter_parameters => ["foo"] } }
 
               it "filters selected arguments" do
                 perform