appsignal 3.4.12 → 3.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23564a15fbad1ecb68987675c925a81b0e423ffa66a3481563999f97db10ef79
-  data.tar.gz: a42321ba0bc9809e2b4b26a3c7e3707e5c06941a30ed6187cba491cbc76b9cfd
+  metadata.gz: da9d753b6bb738432dde776aac3404c660df7362d6fff5612ceb4535ab8dd00f
+  data.tar.gz: 712225f476fd4e66c83bc2b59f605eca653228fa75551f34c8210206bb87aea9
 SHA512:
-  metadata.gz: ff4db633c340cf16fc0cfb3b154f4b754ef3416d3e56077203b7a298851457624dba934576c634b56bad599199fe427d1200dfa019f3bcfab67a9aa7349a0591
-  data.tar.gz: 811176ae1f6735a901e1b0b822b4956aa5a0ca86efd2fbc8cc969afde01510022d3d2adf4fe11de50609f324df4dab0c699dbf84ca120ab27556d18735e7748b
+  metadata.gz: 7fcd4d3b278f44dc3033393708923819dce551f5bacb1e890c674cb332351bf1d756c882d05315b47582750d7370de5e2c729088b565cf0b3807ce977bd03631
+  data.tar.gz: 8980095a2da7d7f044e68fa02600a73ad48c584e1a450e2dca4be2e7fc4cc2579a7bb5a627d9ee691e0bac1f7065f9d100f705437df99c0875bcb34182da8eaf

data/.semaphore/semaphore.yml

@@ -583,6 +583,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.0.5 for dry-monitor
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.5
+      - name: GEMSET
+        value: dry-monitor
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/dry-monitor.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.0.5 for grape
       env_vars:
       - *2
@@ -781,6 +799,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.0.5 for rails-7.1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.5
+      - name: GEMSET
+        value: rails-7.1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/rails-7.1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.0.5 for sequel
       env_vars:
       - *2
@@ -940,6 +976,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.1.3 for dry-monitor
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.3
+      - name: GEMSET
+        value: dry-monitor
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/dry-monitor.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.1.3 for grape
       env_vars:
       - *2
@@ -1120,6 +1174,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.1.3 for rails-7.1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.3
+      - name: GEMSET
+        value: rails-7.1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/rails-7.1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.1.3 for sequel
       env_vars:
       - *2
@@ -1279,6 +1351,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.2.1 for dry-monitor
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.2.1
+      - name: GEMSET
+        value: dry-monitor
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/dry-monitor.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.2.1 for grape
       env_vars:
       - *2
@@ -1459,6 +1549,24 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.2.1 for rails-7.1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.2.1
+      - name: GEMSET
+        value: rails-7.1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/rails-7.1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
     - name: Ruby 3.2.1 for sequel
       env_vars:
       - *2
@@ -1636,3 +1744,21 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
+    - name: Ruby jruby-9.4.1.0 for rails-7.1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: jruby-9.4.1.0
+      - name: GEMSET
+        value: rails-7.1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/rails-7.1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.4.13
+
+### Added
+
+- [29970d93](https://github.com/appsignal/appsignal-ruby/commit/29970d93a63aa174fbc4a41b29eff996ef0ede5e) patch - Events from `dry-monitor` are now supported. There's also native support for `rom-sql` instrumentation events if they're configured.
+- [27656744](https://github.com/appsignal/appsignal-ruby/commit/27656744d5d5657d120b4fcd97857c17421d8dfd) patch - Support Rails 7.1 ActiveSupport Notifications handler.
+
+### Changed
+
+- [6932bb3f](https://github.com/appsignal/appsignal-ruby/commit/6932bb3f7eae75beeb86e29ddc16dc16f9da4428) patch - Add configuration load modifiers to diagnose report. Track if the `APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR` environment variable was set.
+
 ## 3.4.12
 
 ### Added
@@ -11,9 +22,12 @@
 ### Changed
 
 - [a42da92b](https://github.com/appsignal/appsignal-ruby/commit/a42da92b1ff16c48eb40dc081d3b4fbd6480c7c0) patch - Log an error when sample data is of an invalid type. Accepted types are Array and Hash. If any other types are given, it will log an error to the `appsignal.log` file.
+
+### Fixed
+
 - [8e636323](https://github.com/appsignal/appsignal-ruby/commit/8e6363232dc7fabe5f1aeae5758802e4c8d6cbfa) patch - Bump agent to 6133900.
   
-  - Fix `disk_inodes_usage` metric name format to not be interpreted as a JSON object.
+  - Fix `disk_inode_usage` metric name format to not be interpreted as a JSON object.
 
 ## 3.4.11
 

data/README.md

@@ -231,6 +231,7 @@ configurations you need to run the spec suite with a specific Gemfile.
 ```
 BUNDLE_GEMFILE=gemfiles/capistrano2.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/capistrano3.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/dry-monitor.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/grape.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/hanami.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/http5.gemfile bundle exec rspec

data/build_matrix.yml

@@ -170,6 +170,7 @@ matrix:
       - "rails-6.0"
       - "rails-6.1"
       - "rails-7.0"
+      - "rails-7.1"
 
   ruby:
     - ruby: "2.7.8"
@@ -182,6 +183,12 @@ matrix:
     - gem: "no_dependencies"
     - gem: "capistrano2"
     - gem: "capistrano3"
+    - gem: "dry-monitor"
+      only:
+        ruby:
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "grape"
     - gem: "hanami"
       only:
@@ -229,6 +236,13 @@ matrix:
           - "3.1.3"
           - "3.2.1"
           - "jruby-9.4.1.0"
+    - gem: "rails-7.1"
+      only:
+        ruby:
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
+          - "jruby-9.4.1.0"
     - gem: "sequel"
     - gem: "sinatra"
     - gem: "webmachine1"

data/gemfiles/dry-monitor.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "dry-monitor", "~> 1.0.1"
+
+gemspec :path => '../'

data/gemfiles/rails-7.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+gem "rake", "> 12.2"
+gem "sidekiq"
+
+gemspec :path => "../"

data/lib/appsignal/cli/diagnose.rb

@@ -477,6 +477,10 @@ module Appsignal
               :file => config.file_config,
               :env => config.env_config,
               :override => config.override_config
+            },
+            :modifiers => {
+              "APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR" =>
+                ENV.fetch("APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR", "")
             }
           }
           print_config_options(config)
@@ -519,6 +523,11 @@ module Appsignal
             end
           end
 
+          puts
+          puts "Configuration modifiers"
+          puts "  APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR: " \
+            "#{data[:config][:modifiers]["APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR"].inspect}"
+
           puts "\nRead more about how the diagnose config output is rendered\n" \
             "https://docs.appsignal.com/ruby/command-line/diagnose.html"
         end

data/lib/appsignal/event_formatter/rom/sql_formatter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Appsignal
+  class EventFormatter
+    module Rom
+      class SqlFormatter
+        def format(payload)
+          ["query.#{payload[:name]}", payload[:query], SQL_BODY_FORMAT]
+        end
+      end
+    end
+  end
+end
+
+Appsignal::EventFormatter.register(
+  "sql.dry",
+  Appsignal::EventFormatter::Rom::SqlFormatter
+)

data/lib/appsignal/hooks/active_support_notifications.rb

@@ -22,21 +22,30 @@ module Appsignal
         end
 
         require "appsignal/integrations/active_support_notifications"
-        instrumenter = ::ActiveSupport::Notifications::Instrumenter
         parent_integration_module = Appsignal::Integrations::ActiveSupportNotificationsIntegration
-        if instrumenter.method_defined?(:start) && instrumenter.method_defined?(:finish)
-          install_module(parent_integration_module::StartFinishIntegration)
+
+        if defined?(::ActiveSupport::Notifications::Fanout::Handle)
+          install_module(
+            parent_integration_module::StartFinishHandlerIntegration,
+            ::ActiveSupport::Notifications::Fanout::Handle
+          )
         else
-          install_module(parent_integration_module::InstrumentIntegration)
-        end
+          instrumenter = ::ActiveSupport::Notifications::Instrumenter
 
-        return unless instrumenter.method_defined?(:finish_with_state)
+          if instrumenter.method_defined?(:start) && instrumenter.method_defined?(:finish)
+            install_module(parent_integration_module::StartFinishIntegration, instrumenter)
+          else
+            install_module(parent_integration_module::InstrumentIntegration, instrumenter)
+          end
 
-        install_module(parent_integration_module::FinishStateIntegration)
+          return unless instrumenter.method_defined?(:finish_with_state)
+
+          install_module(parent_integration_module::FinishStateIntegration, instrumenter)
+        end
       end
 
-      def install_module(mod)
-        ::ActiveSupport::Notifications::Instrumenter.send(:prepend, mod)
+      def install_module(mod, instrumenter)
+        instrumenter.send(:prepend, mod)
       end
     end
   end

data/lib/appsignal/hooks/dry_monitor.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Appsignal
+  class Hooks
+    # @api private
+    class DryMonitorHook < Appsignal::Hooks::Hook
+      register :dry_monitor
+
+      def dependencies_present?
+        defined?(::Dry::Monitor::Notifications)
+      end
+
+      def install
+        require "appsignal/integrations/dry_monitor"
+
+        ::Dry::Monitor::Notifications.prepend(Appsignal::Integrations::DryMonitorIntegration)
+      end
+    end
+  end
+end

data/lib/appsignal/hooks.rb

@@ -95,6 +95,7 @@ require "appsignal/hooks/active_support_notifications"
 require "appsignal/hooks/celluloid"
 require "appsignal/hooks/delayed_job"
 require "appsignal/hooks/gvl"
+require "appsignal/hooks/dry_monitor"
 require "appsignal/hooks/http"
 require "appsignal/hooks/mri"
 require "appsignal/hooks/net_http"

data/lib/appsignal/integrations/active_support_notifications.rb

@@ -54,6 +54,32 @@ module Appsignal
         end
       end
 
+      module StartFinishHandlerIntegration
+        def start
+          instrument_this = @name[0] != ActiveSupportNotificationsIntegration::BANG
+
+          Appsignal::Transaction.current.start_event if instrument_this
+          super
+        end
+
+        def finish_with_values(name, id, payload = {})
+          # Events that start with a bang are internal to Rails
+          instrument_this = name[0] != ActiveSupportNotificationsIntegration::BANG
+
+          if instrument_this
+            title, body, body_format = Appsignal::EventFormatter.format(name, payload)
+            Appsignal::Transaction.current.finish_event(
+              name.to_s,
+              title,
+              body,
+              body_format
+            )
+          end
+
+          super
+        end
+      end
+
       module FinishStateIntegration
         def finish_with_state(listeners_state, name, payload = {})
           # Events that start with a bang are internal to Rails

data/lib/appsignal/integrations/dry_monitor.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Appsignal
+  module Integrations
+    module DryMonitorIntegration
+      def instrument(event_id, payload = {}, &block)
+        Appsignal::Transaction.current.start_event
+
+        super
+      ensure
+        title, body, body_format = Appsignal::EventFormatter.format("#{event_id}.dry", payload)
+
+        Appsignal::Transaction.current.finish_event(
+          title || event_id.to_s,
+          title,
+          body,
+          body_format
+        )
+      end
+    end
+  end
+end

data/lib/appsignal/integrations/railtie.rb

@@ -36,9 +36,14 @@ module Appsignal
 
         Appsignal.start
 
-        if Appsignal.config[:enable_rails_error_reporter] && Rails.respond_to?(:error) # rubocop:disable Style/GuardClause
-          Rails.error.subscribe(Appsignal::Integrations::RailsErrorReporterSubscriber)
-        end
+        initialize_error_reporter
+      end
+
+      def self.initialize_error_reporter
+        return unless Appsignal.config[:enable_rails_error_reporter]
+        return unless Rails.respond_to?(:error)
+
+        Rails.error.subscribe(Appsignal::Integrations::RailsErrorReporterSubscriber)
       end
     end
 

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -781,6 +781,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
               "file" => {},
               "env" => {},
               "override" => { "send_session_data" => true }
+            },
+            "modifiers" => {
+              "APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR" => ""
             }
           )
         end
@@ -912,6 +915,28 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           end
         end
 
+        describe "modifiers" do
+          before do
+            ENV["APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR"] = "1"
+            run
+          end
+
+          it "outputs config modifiers" do
+            expect(output).to include(
+              "Configuration modifiers\n" \
+                "  APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR: \"1\""
+            )
+          end
+
+          it "transmits config modifiers in report" do
+            expect(received_report["config"]).to include(
+              "modifiers" => {
+                "APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR" => "1"
+              }
+            )
+          end
+        end
+
         it "transmits config in report" do
           run
           additional_initial_config = {}
@@ -935,6 +960,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
               "file" => hash_with_string_keys(config.file_config),
               "env" => {},
               "override" => { "send_session_data" => true }
+            },
+            "modifiers" => {
+              "APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR" => ""
             }
           )
         end
@@ -963,6 +991,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
               "file" => hash_with_string_keys(config.file_config),
               "env" => {},
               "override" => { "send_session_data" => true }
+            },
+            "modifiers" => {
+              "APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR" => ""
             }
           )
         end

data/spec/lib/appsignal/event_formatter/rom/sql_formatter_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+describe Appsignal::EventFormatter::Rom::SqlFormatter do
+  let(:klass) { described_class }
+  let(:formatter) { klass.new }
+
+  it "registers the sql event formatter" do
+    expect(Appsignal::EventFormatter.registered?("sql.dry", klass)).to be_truthy
+  end
+
+  describe "#format" do
+    let(:payload) do
+      {
+        :name => "postgres",
+        :query => "SELECT * FROM users"
+      }
+    end
+    subject { formatter.format(payload) }
+
+    it { is_expected.to eq ["query.postgres", "SELECT * FROM users", 1] }
+  end
+end

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

@@ -22,6 +22,12 @@ describe Appsignal::Hooks::ActiveSupportNotificationsHook do
 
     it_behaves_like "activesupport instrument override"
 
+    if defined?(::ActiveSupport::Notifications::Fanout::Handle)
+      require_relative "./active_support_notifications/start_finish_shared_examples"
+
+      it_behaves_like "activesupport start finish override"
+    end
+
     if ::ActiveSupport::Notifications::Instrumenter.method_defined?(:start)
       require_relative "./active_support_notifications/start_finish_shared_examples"
 

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

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+if DependencyHelper.dry_monitor_present?
+  require "dry-monitor"
+
+  describe Appsignal::Hooks::DryMonitorHook do
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      context "when Dry::Monitor::Notifications constant is found" do
+        before { stub_const "Dry::Monitor::Notifications", Class.new }
+
+        it { is_expected.to be_truthy }
+      end
+
+      context "when Dry::Monitor::Notifications constant is not found" do
+        before { hide_const "Dry::Monitor::Notifications" }
+
+        it { is_expected.to be_falsy }
+      end
+    end
+  end
+
+  describe "#install" do
+    it "installs the dry-monitor hook" do
+      start_agent
+
+      expect(Dry::Monitor::Notifications.included_modules).to include(
+        Appsignal::Integrations::DryMonitorIntegration
+      )
+    end
+  end
+
+  describe "Dry Monitor Integration" do
+    before :context do
+      start_agent
+    end
+
+    let!(:transaction) do
+      Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
+    end
+
+    let(:notifications) { Dry::Monitor::Notifications.new(:test) }
+
+    context "when is a dry-sql event" do
+      let(:event_id) { :sql }
+      let(:payload) do
+        {
+          :name => "postgres",
+          :query => "SELECT * FROM users"
+        }
+      end
+
+      it "creates an sql event" do
+        notifications.instrument(event_id, payload)
+        expect(transaction.to_h["events"]).to match([
+          {
+            "allocation_count" => kind_of(Integer),
+            "body" => "SELECT * FROM users",
+            "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+            "child_allocation_count" => kind_of(Integer),
+            "child_duration" => kind_of(Float),
+            "child_gc_duration" => kind_of(Float),
+            "count" => 1,
+            "duration" => kind_of(Float),
+            "gc_duration" => kind_of(Float),
+            "name" => "query.postgres",
+            "start" => kind_of(Float),
+            "title" => "query.postgres"
+          }
+        ])
+      end
+    end
+
+    context "when is an unregistered formatter event" do
+      let(:event_id) { :foo }
+      let(:payload) do
+        {
+          :name => "foo"
+        }
+      end
+
+      it "creates a generic event" do
+        notifications.instrument(event_id, payload)
+        expect(transaction.to_h["events"]).to match([
+          {
+            "allocation_count" => kind_of(Integer),
+            "body" => "",
+            "body_format" => Appsignal::EventFormatter::DEFAULT,
+            "child_allocation_count" => kind_of(Integer),
+            "child_duration" => kind_of(Float),
+            "child_gc_duration" => kind_of(Float),
+            "count" => 1,
+            "duration" => kind_of(Float),
+            "gc_duration" => kind_of(Float),
+            "name" => "foo",
+            "start" => kind_of(Float),
+            "title" => ""
+          }
+        ])
+      end
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ if DependencyHelper.rails_present?
   require "action_mailer"
 
   describe Appsignal::Integrations::Railtie do
+    include RailsHelper
+
+    after { clear_rails_error_reporter! }
+
     context "after initializing the app" do
       it "should call initialize_appsignal" do
         expect(Appsignal::Integrations::Railtie).to receive(:initialize_appsignal)
@@ -125,17 +129,16 @@ if DependencyHelper.rails_present?
 
       if Rails.respond_to?(:error)
         describe "Rails error reporter" do
-          before do
-            Appsignal::Integrations::Railtie.initialize_appsignal(app)
-            start_agent
-          end
+          before { start_agent }
           around { |example| keep_transactions { example.run } }
 
           context "when error is not handled (reraises the error)" do
             it "does nothing" do
-              expect do
-                Rails.error.record { raise ExampleStandardError }
-              end.to raise_error(ExampleStandardError)
+              with_rails_error_reporter do
+                expect do
+                  Rails.error.record { raise ExampleStandardError }
+                end.to raise_error(ExampleStandardError)
+              end
 
               expect(created_transactions).to be_empty
             end
@@ -151,26 +154,28 @@ if DependencyHelper.rails_present?
                   :duplicated_tag => "duplicated value"
                 )
 
-                with_current_transaction current_transaction do
-                  Rails.error.handle { raise ExampleStandardError }
-
-                  transaction = last_transaction
-                  transaction_hash = transaction.to_h
-                  expect(transaction_hash).to include(
-                    "action" => "CustomAction",
-                    "namespace" => "custom",
-                    "error" => {
-                      "name" => "ExampleStandardError",
-                      "message" => "ExampleStandardError",
-                      "backtrace" => kind_of(String)
-                    },
-                    "sample_data" => hash_including(
-                      "tags" => {
-                        "duplicated_tag" => "duplicated value",
-                        "severity" => "warning"
-                      }
+                with_rails_error_reporter do
+                  with_current_transaction current_transaction do
+                    Rails.error.handle { raise ExampleStandardError }
+
+                    transaction = last_transaction
+                    transaction_hash = transaction.to_h
+                    expect(transaction_hash).to include(
+                      "action" => "CustomAction",
+                      "namespace" => "custom",
+                      "error" => {
+                        "name" => "ExampleStandardError",
+                        "message" => "ExampleStandardError",
+                        "backtrace" => kind_of(String)
+                      },
+                      "sample_data" => hash_including(
+                        "tags" => hash_including(
+                          "duplicated_tag" => "duplicated value",
+                          "severity" => "warning"
+                        )
+                      )
                     )
-                  )
+                  end
                 end
               end
 
@@ -178,48 +183,52 @@ if DependencyHelper.rails_present?
                 current_transaction = http_request_transaction
                 current_transaction.set_tags(:tag1 => "duplicated value")
 
-                with_current_transaction current_transaction do
-                  given_context = { :tag1 => "value1", :tag2 => "value2" }
-                  Rails.error.handle(:context => given_context) { raise ExampleStandardError }
-
-                  transaction = last_transaction
-                  transaction_hash = transaction.to_h
-                  expect(transaction_hash).to include(
-                    "sample_data" => hash_including(
-                      "tags" => {
-                        "tag1" => "value1",
-                        "tag2" => "value2",
-                        "severity" => "warning"
-                      }
+                with_rails_error_reporter do
+                  with_current_transaction current_transaction do
+                    given_context = { :tag1 => "value1", :tag2 => "value2" }
+                    Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+
+                    transaction = last_transaction
+                    transaction_hash = transaction.to_h
+                    expect(transaction_hash).to include(
+                      "sample_data" => hash_including(
+                        "tags" => hash_including(
+                          "tag1" => "value1",
+                          "tag2" => "value2",
+                          "severity" => "warning"
+                        )
+                      )
                     )
-                  )
+                  end
                 end
               end
 
               it "sends tags stored in :appsignal -> :custom_data as custom data" do
                 current_transaction = http_request_transaction
 
-                with_current_transaction current_transaction do
-                  given_context = {
-                    :appsignal => {
-                      :custom_data => {
-                        :array => [1, 2],
-                        :hash => { :one => 1, :two => 2 }
+                with_rails_error_reporter do
+                  with_current_transaction current_transaction do
+                    given_context = {
+                      :appsignal => {
+                        :custom_data => {
+                          :array => [1, 2],
+                          :hash => { :one => 1, :two => 2 }
+                        }
                       }
                     }
-                  }
-                  Rails.error.handle(:context => given_context) { raise ExampleStandardError }
-
-                  transaction = last_transaction
-                  transaction_hash = transaction.to_h
-                  expect(transaction_hash).to include(
-                    "sample_data" => hash_including(
-                      "custom_data" => {
-                        "array" => [1, 2],
-                        "hash" => { "one" => 1, "two" => 2 }
-                      }
+                    Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+
+                    transaction = last_transaction
+                    transaction_hash = transaction.to_h
+                    expect(transaction_hash).to include(
+                      "sample_data" => hash_including(
+                        "custom_data" => {
+                          "array" => [1, 2],
+                          "hash" => { "one" => 1, "two" => 2 }
+                        }
+                      )
                     )
-                  )
+                  end
                 end
               end
 
@@ -228,18 +237,20 @@ if DependencyHelper.rails_present?
                 current_transaction.set_namespace "custom"
                 current_transaction.set_action "CustomAction"
 
-                with_current_transaction current_transaction do
-                  given_context = {
-                    :appsignal => { :namespace => "context", :action => "ContextAction" }
-                  }
-                  Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+                with_rails_error_reporter do
+                  with_current_transaction current_transaction do
+                    given_context = {
+                      :appsignal => { :namespace => "context", :action => "ContextAction" }
+                    }
+                    Rails.error.handle(:context => given_context) { raise ExampleStandardError }
 
-                  transaction = last_transaction
-                  transaction_hash = transaction.to_h
-                  expect(transaction_hash).to include(
-                    "namespace" => "context",
-                    "action" => "ContextAction"
-                  )
+                    transaction = last_transaction
+                    transaction_hash = transaction.to_h
+                    expect(transaction_hash).to include(
+                      "namespace" => "context",
+                      "action" => "ContextAction"
+                    )
+                  end
                 end
               end
             end
@@ -267,7 +278,9 @@ if DependencyHelper.rails_present?
               it "fetches the action from the controller in the context" do
                 # The controller key is set by Rails when raised in a controller
                 given_context = { :controller => ExampleRailsControllerMock.new }
-                Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+                with_rails_error_reporter do
+                  Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+                end
 
                 transaction = last_transaction
                 transaction_hash = transaction.to_h
@@ -278,7 +291,9 @@ if DependencyHelper.rails_present?
 
               it "sets no action if no execution context is present" do
                 # The controller key is set by Rails when raised in a controller
-                Rails.error.handle { raise ExampleStandardError }
+                with_rails_error_reporter do
+                  Rails.error.handle { raise ExampleStandardError }
+                end
 
                 transaction = last_transaction
                 transaction_hash = transaction.to_h
@@ -296,17 +311,19 @@ if DependencyHelper.rails_present?
                 :tag1 => "value1",
                 :tag2 => "value2"
               }
-              Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+              with_rails_error_reporter do
+                Rails.error.handle(:context => given_context) { raise ExampleStandardError }
+              end
 
               transaction = last_transaction
               transaction_hash = transaction.to_h
               expect(transaction_hash).to include(
                 "sample_data" => hash_including(
-                  "tags" => {
+                  "tags" => hash_including(
                     "tag1" => "value1",
                     "tag2" => "value2",
                     "severity" => "warning"
-                  }
+                  )
                 )
               )
             end

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

@@ -266,13 +266,16 @@ describe Appsignal::Integrations::SidekiqMiddleware, :with_yaml_parse_error => f
 
   if DependencyHelper.rails7_present?
     context "with Rails error reporter" do
+      include RailsHelper
+
       it "reports the worker name as the action, copies the namespace and tags" do
-        Appsignal::Integrations::Railtie.initialize_appsignal(MyApp::Application.new)
         Appsignal.config = project_fixture_config("production")
-        perform_job do
-          Appsignal.tag_job("test_tag" => "value")
-          Rails.error.handle do
-            raise error, "uh oh"
+        with_rails_error_reporter do
+          perform_job do
+            Appsignal.tag_job("test_tag" => "value")
+            Rails.error.handle do
+              raise ExampleStandardError, "uh oh"
+            end
           end
         end
 
@@ -363,7 +366,9 @@ if DependencyHelper.active_job_present?
   require "sidekiq/testing"
 
   describe "Sidekiq ActiveJob integration" do
+    include RailsHelper
     include ActiveJobHelpers
+
     let(:namespace) { Appsignal::Transaction::BACKGROUND_JOB }
     let(:time) { Time.parse("2001-01-01 10:00:00UTC") }
     let(:log) { StringIO.new }
@@ -416,7 +421,7 @@ if DependencyHelper.active_job_present?
         ["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"]
       end
     end
-    before do
+    around do |example|
       start_agent
       Appsignal.logger = test_logger(log)
       ActiveJob::Base.queue_adapter = :sidekiq
@@ -441,11 +446,11 @@ if DependencyHelper.active_job_present?
       Sidekiq::Testing.server_middleware do |chain|
         chain.add Appsignal::Integrations::SidekiqMiddleware
       end
-    end
-    around do |example|
-      keep_transactions do
-        Sidekiq::Testing.fake! do
-          example.run
+      with_rails_error_reporter do
+        keep_transactions do
+          Sidekiq::Testing.fake! do
+            example.run
+          end
         end
       end
     end

data/spec/support/helpers/dependency_helper.rb

@@ -115,6 +115,10 @@ module DependencyHelper
     dependency_present? "hanami"
   end
 
+  def dry_monitor_present?
+    dependency_present? "dry-monitor"
+  end
+
   def hanami2_present?
     hanami_present? && Gem.loaded_specs["hanami"].version >= Gem::Version.new("2.0")
   end

data/spec/support/helpers/rails_helper.rb

@@ -0,0 +1,28 @@
+module RailsHelper
+  def with_railtie(app)
+    clear_rails_error_reporter! if Rails.respond_to? :error
+    Appsignal::Integrations::Railtie.initialize_appsignal(app)
+    yield
+  ensure
+    clear_rails_error_reporter!
+  end
+
+  def with_rails_error_reporter
+    if Rails.respond_to? :error
+      clear_rails_error_reporter!
+      Appsignal::Integrations::Railtie.initialize_error_reporter
+    end
+    yield
+  ensure
+    clear_rails_error_reporter!
+  end
+
+  def clear_rails_error_reporter!
+    return unless Rails.respond_to? :error
+
+    Rails
+      .error
+      .instance_variable_get(:@subscribers)
+      .reject! { |s| s == Appsignal::Integrations::RailsErrorReporterSubscriber }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.4.12
+  version: 3.4.13
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -160,6 +160,7 @@ files:
 - ext/extconf.rb
 - gemfiles/capistrano2.gemfile
 - gemfiles/capistrano3.gemfile
+- gemfiles/dry-monitor.gemfile
 - gemfiles/grape.gemfile
 - gemfiles/hanami.gemfile
 - gemfiles/http5.gemfile
@@ -172,6 +173,7 @@ files:
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
 - gemfiles/rails-7.0.gemfile
+- gemfiles/rails-7.1.gemfile
 - gemfiles/resque-2.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
@@ -197,6 +199,7 @@ files:
 - lib/appsignal/event_formatter/elastic_search/search_formatter.rb
 - lib/appsignal/event_formatter/faraday/request_formatter.rb
 - lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb
+- lib/appsignal/event_formatter/rom/sql_formatter.rb
 - lib/appsignal/event_formatter/sequel/sql_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/extension/jruby.rb
@@ -211,6 +214,7 @@ files:
 - lib/appsignal/hooks/celluloid.rb
 - lib/appsignal/hooks/data_mapper.rb
 - lib/appsignal/hooks/delayed_job.rb
+- lib/appsignal/hooks/dry_monitor.rb
 - lib/appsignal/hooks/excon.rb
 - lib/appsignal/hooks/gvl.rb
 - lib/appsignal/hooks/http.rb
@@ -234,6 +238,7 @@ files:
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/data_mapper.rb
 - lib/appsignal/integrations/delayed_job_plugin.rb
+- lib/appsignal/integrations/dry_monitor.rb
 - lib/appsignal/integrations/excon.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/hanami.rb
@@ -302,6 +307,7 @@ files:
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
+- spec/lib/appsignal/event_formatter/rom/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb
@@ -318,6 +324,7 @@ files:
 - spec/lib/appsignal/hooks/celluloid_spec.rb
 - spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
+- spec/lib/appsignal/hooks/dry_monitor_spec.rb
 - spec/lib/appsignal/hooks/excon_spec.rb
 - spec/lib/appsignal/hooks/gvl_spec.rb
 - spec/lib/appsignal/hooks/http_spec.rb
@@ -392,6 +399,7 @@ files:
 - spec/support/helpers/example_exception.rb
 - spec/support/helpers/example_standard_error.rb
 - spec/support/helpers/log_helpers.rb
+- spec/support/helpers/rails_helper.rb
 - spec/support/helpers/std_streams_helper.rb
 - spec/support/helpers/system_helpers.rb
 - spec/support/helpers/time_helpers.rb