appsignal 3.4.0-java → 3.4.1-java

data/spec/lib/puma/appsignal_spec.rb

@@ -38,16 +38,14 @@ RSpec.describe "Puma plugin" do
       @socket.bind("127.0.0.1", 8125)
 
       loop do
-        begin
-          # Listen for messages and track them on the messages Array.
-          packet = @socket.recvfrom(1024)
-          track_message packet.first
-        rescue Errno::EBADF # rubocop:disable Lint/HandleExceptions
-          # Ignore error for JRuby 9.1.17.0 specifically, it doesn't appear to
-          # happen on 9.2.18.0. It doesn't break the tests themselves, ignoring
-          # this error. It's probably a timing issue where it tries to read
-          # from the socket after it's closed.
-        end
+        # Listen for messages and track them on the messages Array.
+        packet = @socket.recvfrom(1024)
+        track_message packet.first
+      rescue Errno::EBADF
+        # Ignore error for JRuby 9.1.17.0 specifically, it doesn't appear to
+        # happen on 9.2.18.0. It doesn't break the tests themselves, ignoring
+        # this error. It's probably a timing issue where it tries to read
+        # from the socket after it's closed.
       end
     end
 
@@ -161,7 +159,7 @@ RSpec.describe "Puma plugin" do
       metric, type, tags_string = message.split("|")
       metric_name, metric_value = metric.split(":")
       tags = {}
-      tags_string[1..-1].split(",").each do |tag|
+      tags_string[1..].split(",").each do |tag|
         key, value = tag.split(":")
         tags[key] = value
       end

data/spec/spec_helper.rb

@@ -70,6 +70,7 @@ RSpec.configure do |config|
 
   config.example_status_persistence_file_path = "spec/examples.txt"
   config.fail_if_no_examples = true
+  config.exclude_pattern = "spec/integration/diagnose/**/*_spec.rb"
   config.filter_run_excluding(
     :extension_installation_failure => true,
     :jruby => !DependencyHelper.running_jruby?
@@ -120,6 +121,17 @@ RSpec.configure do |config|
 
     # Stub system_tmp_dir to something in the project dir for specs
     allow(Appsignal::Config).to receive(:system_tmp_dir).and_return(spec_system_tmp_dir)
+
+    # Unsubscribe Rails error reporter if present to avoid it reporting errors
+    # multiple times through multiple subscriptions.
+    if defined?(Rails) && Rails.respond_to?(:error)
+      if Rails.error.respond_to?(:unsubscribe) # Future Rails version after 7.0.4.3
+        Rails.error.unsubscribe(Appsignal::Integrations::RailsErrorReporterSubscriber)
+      else
+        Rails.error.instance_variable_get(:@subscribers)
+          .delete(Appsignal::Integrations::RailsErrorReporterSubscriber)
+      end
+    end
   end
 
   # These tests are not run by default. They require a failed extension
@@ -139,7 +151,7 @@ RSpec.configure do |config|
     next if Appsignal.extension_loaded?
     next if example.metadata[:extension_installation_failure]
 
-    puts "\nWARNING: The AppSignal extension is not loaded, please run the "\
+    puts "\nWARNING: The AppSignal extension is not loaded, please run the " \
       "following task and rerun the test." \
       "\n\n    rake extension:install\n"
   end
@@ -164,6 +176,6 @@ RSpec.configure do |config|
         nil
       end
     Appsignal::Minutely.stop
-    thread && thread.join # Wait for old thread to exit
+    thread&.join # Wait for old thread to exit
   end
 end

data/spec/support/fixtures/projects/valid/config/appsignal.yml

@@ -21,7 +21,7 @@ development:
 test:
   <<: *defaults
   endpoint: "http://localhost:3000"
-  debug: true
+  log_level: debug
   active: true
 
 old_config:

data/spec/support/helpers/config_helpers.rb

@@ -5,7 +5,8 @@ module ConfigHelpers
     )
   end
 
-  def project_fixture_config(env = "production", initial_config = {}, logger = Appsignal.logger, config_file = nil)
+  def project_fixture_config(env = "production", initial_config = {}, logger = Appsignal.logger, # rubocop:disable Metrics/ParameterLists
+    config_file = nil)
     Appsignal::Config.new(
       project_fixture_path,
       env,

data/spec/support/helpers/dependency_helper.rb

@@ -5,14 +5,6 @@ module DependencyHelper
     Gem::Version.new(RUBY_VERSION)
   end
 
-  def running_ruby_2_0?
-    ruby_version.segments.take(2) == [2, 0]
-  end
-
-  def ruby_3_0_or_newer?
-    ruby_version >= Gem::Version.new("3.0.0")
-  end
-
   def ruby_3_1_or_newer?
     ruby_version >= Gem::Version.new("3.1.0")
   end
@@ -124,7 +116,7 @@ module DependencyHelper
   end
 
   def hanami2_present?
-    ruby_3_0_or_newer? && hanami_present? && Gem.loaded_specs["hanami"].version >= Gem::Version.new("2.0")
+    hanami_present? && Gem.loaded_specs["hanami"].version >= Gem::Version.new("2.0")
   end
 
   def dependency_present?(dependency_file)

data/spec/support/helpers/std_streams_helper.rb

@@ -76,9 +76,7 @@ module StdStreamsHelper
     capture_std_streams(stream, stream, &block)
   ensure
     output = filter_allowed_errors(stream.read, options.fetch(:allowed, []))
-    if output =~ /(ERR|Error|error)/
-      raise "Error found in silenced output:\n#{output}"
-    end
+    raise "Error found in silenced output:\n#{output}" if output =~ /(ERR|Error|error)/
   end
 
   def filter_allowed_errors(output, allowed_errors)

data/spec/support/helpers/wait_for_helper.rb

@@ -31,10 +31,9 @@ module WaitForHelper
     end
 
     return unless i >= max_wait
+
     error_message =
-      if error
-        "\nError: #{error.class}: #{error.message}\n#{error.backtrace.join("\n")}"
-      end
+      ("\nError: #{error.class}: #{error.message}\n#{error.backtrace.join("\n")}" if error)
     raise "Waited 5 seconds for #{name} condition, but was not met.#{error_message}"
   end
 end

data/spec/support/mocks/appsignal_mock.rb

@@ -12,7 +12,7 @@ class AppsignalMock
     end
   end
 
-  def set_gauge(*args) # rubocop:disable Naming/AccessorMethodName
+  def set_gauge(*args)
     @gauges << args
   end
 end

data/spec/support/mocks/fake_gvl_tools.rb

@@ -1,32 +1,24 @@
 module FakeGVLTools
   def self.reset
-    self::GlobalTimer.enabled = false
     self::GlobalTimer.monotonic_time = 0
-    self::WaitingThreads.enabled = false
     self::WaitingThreads.count = 0
   end
 
   module GlobalTimer
-    @enabled = false
     @monotonic_time = 0
 
     class << self
-      attr_writer :enabled
       attr_accessor :monotonic_time
-
-      def enabled?
-        @enabled
-      end
     end
   end
 
   module WaitingThreads
-    @enabled = false
     @count = 0
+    @enabled = false
 
     class << self
-      attr_writer :enabled
       attr_accessor :count
+      attr_writer :enabled
 
       def enabled?
         @enabled

data/spec/support/testing.rb

@@ -1,6 +1,7 @@
 module Appsignal
   class << self
     attr_writer :testing
+
     remove_method :testing?
 
     # @api private
@@ -29,13 +30,13 @@ module Appsignal
         transactions.clear
       end
 
-      attr_writer :keep_transactions
+      attr_writer :keep_transactions, :sample_transactions
+
       # @see TransactionHelpers#keep_transactions
       def keep_transactions?
         defined?(@keep_transactions) ? @keep_transactions : nil
       end
 
-      attr_writer :sample_transactions
       # @see TransactionHelpers#keep_transactions
       def sample_transactions?
         sample = defined?(@sample_transactions) ? @sample_transactions : nil
@@ -106,7 +107,7 @@ module Appsignal
       # completed.
       #
       # @see TransactionHelpers#keep_transactions
-      def to_json
+      def to_json # rubocop:disable Lint/ToJSON
         if defined? @transaction_json
           @transaction_json
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -72,16 +72,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.50.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
 - benchmark.rake
 - bin/appsignal
 - build_matrix.yml
+- ext/._appsignal-agent
 - ext/Rakefile
 - ext/agent.rb
 - ext/appsignal_extension.c
@@ -452,135 +453,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.11
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
-test_files:
-- spec/.rubocop.yml
-- spec/lib/appsignal/auth_check_spec.rb
-- spec/lib/appsignal/capistrano2_spec.rb
-- spec/lib/appsignal/capistrano3_spec.rb
-- spec/lib/appsignal/cli/demo_spec.rb
-- spec/lib/appsignal/cli/diagnose/paths_spec.rb
-- spec/lib/appsignal/cli/diagnose/utils_spec.rb
-- spec/lib/appsignal/cli/diagnose_spec.rb
-- spec/lib/appsignal/cli/helpers_spec.rb
-- spec/lib/appsignal/cli/install_spec.rb
-- spec/lib/appsignal/cli_spec.rb
-- spec/lib/appsignal/config_spec.rb
-- spec/lib/appsignal/demo_spec.rb
-- spec/lib/appsignal/environment_spec.rb
-- spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb
-- spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb
-- spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb
-- 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/sequel/sql_formatter_spec.rb
-- spec/lib/appsignal/event_formatter_spec.rb
-- spec/lib/appsignal/extension/jruby_spec.rb
-- spec/lib/appsignal/extension_install_failure_spec.rb
-- spec/lib/appsignal/extension_spec.rb
-- spec/lib/appsignal/garbage_collection_spec.rb
-- spec/lib/appsignal/hooks/action_cable_spec.rb
-- spec/lib/appsignal/hooks/action_mailer_spec.rb
-- spec/lib/appsignal/hooks/active_support_notifications/finish_with_state_shared_examples.rb
-- spec/lib/appsignal/hooks/active_support_notifications/instrument_shared_examples.rb
-- spec/lib/appsignal/hooks/active_support_notifications/start_finish_shared_examples.rb
-- spec/lib/appsignal/hooks/active_support_notifications_spec.rb
-- spec/lib/appsignal/hooks/activejob_spec.rb
-- 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/excon_spec.rb
-- spec/lib/appsignal/hooks/gvl_spec.rb
-- spec/lib/appsignal/hooks/http_spec.rb
-- spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
-- spec/lib/appsignal/hooks/mri_spec.rb
-- spec/lib/appsignal/hooks/net_http_spec.rb
-- spec/lib/appsignal/hooks/passenger_spec.rb
-- spec/lib/appsignal/hooks/puma_spec.rb
-- spec/lib/appsignal/hooks/que_spec.rb
-- spec/lib/appsignal/hooks/rake_spec.rb
-- spec/lib/appsignal/hooks/redis_spec.rb
-- spec/lib/appsignal/hooks/resque_spec.rb
-- spec/lib/appsignal/hooks/sequel_spec.rb
-- spec/lib/appsignal/hooks/shoryuken_spec.rb
-- spec/lib/appsignal/hooks/sidekiq_spec.rb
-- spec/lib/appsignal/hooks/unicorn_spec.rb
-- spec/lib/appsignal/hooks/webmachine_spec.rb
-- spec/lib/appsignal/hooks_spec.rb
-- spec/lib/appsignal/integrations/data_mapper_spec.rb
-- spec/lib/appsignal/integrations/grape_spec.rb
-- spec/lib/appsignal/integrations/hanami_spec.rb
-- spec/lib/appsignal/integrations/http_spec.rb
-- spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb
-- spec/lib/appsignal/integrations/object_spec.rb
-- spec/lib/appsignal/integrations/padrino_spec.rb
-- spec/lib/appsignal/integrations/que_spec.rb
-- spec/lib/appsignal/integrations/railtie_spec.rb
-- spec/lib/appsignal/integrations/sidekiq_spec.rb
-- spec/lib/appsignal/integrations/sinatra_spec.rb
-- spec/lib/appsignal/integrations/webmachine_spec.rb
-- spec/lib/appsignal/logger_spec.rb
-- spec/lib/appsignal/marker_spec.rb
-- spec/lib/appsignal/minutely_spec.rb
-- spec/lib/appsignal/probes/gvl_spec.rb
-- spec/lib/appsignal/probes/mri_spec.rb
-- spec/lib/appsignal/probes/sidekiq_spec.rb
-- spec/lib/appsignal/rack/generic_instrumentation_spec.rb
-- spec/lib/appsignal/rack/rails_instrumentation_spec.rb
-- spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
-- spec/lib/appsignal/rack/streaming_listener_spec.rb
-- spec/lib/appsignal/span_spec.rb
-- spec/lib/appsignal/system_spec.rb
-- spec/lib/appsignal/transaction_spec.rb
-- spec/lib/appsignal/transmitter_spec.rb
-- spec/lib/appsignal/utils/data_spec.rb
-- spec/lib/appsignal/utils/hash_sanitizer_spec.rb
-- spec/lib/appsignal/utils/integration_logger_spec.rb
-- spec/lib/appsignal/utils/json_spec.rb
-- spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
-- spec/lib/appsignal_spec.rb
-- spec/lib/puma/appsignal_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures/generated_config.yml
-- spec/support/fixtures/projects/broken/config/appsignal.yml
-- spec/support/fixtures/projects/valid/config/application.rb
-- spec/support/fixtures/projects/valid/config/appsignal.yml
-- spec/support/fixtures/projects/valid/config/environments/development.rb
-- spec/support/fixtures/projects/valid/config/environments/production.rb
-- spec/support/fixtures/projects/valid/config/environments/test.rb
-- spec/support/fixtures/projects/valid/log/.gitkeep
-- spec/support/fixtures/uploaded_file.txt
-- spec/support/hanami/hanami_app.rb
-- spec/support/helpers/action_mailer_helpers.rb
-- spec/support/helpers/activejob_helpers.rb
-- spec/support/helpers/api_request_helper.rb
-- spec/support/helpers/cli_helpers.rb
-- spec/support/helpers/config_helpers.rb
-- spec/support/helpers/dependency_helper.rb
-- spec/support/helpers/directory_helper.rb
-- spec/support/helpers/env_helpers.rb
-- spec/support/helpers/environment_metdata_helper.rb
-- spec/support/helpers/example_exception.rb
-- spec/support/helpers/example_standard_error.rb
-- spec/support/helpers/log_helpers.rb
-- spec/support/helpers/std_streams_helper.rb
-- spec/support/helpers/system_helpers.rb
-- spec/support/helpers/time_helpers.rb
-- spec/support/helpers/transaction_helpers.rb
-- spec/support/helpers/wait_for_helper.rb
-- spec/support/matchers/be_completed.rb
-- spec/support/matchers/contains_log.rb
-- spec/support/matchers/have_colorized_text.rb
-- spec/support/mocks/appsignal_mock.rb
-- spec/support/mocks/fake_gc_profiler.rb
-- spec/support/mocks/fake_gvl_tools.rb
-- spec/support/mocks/mock_probe.rb
-- spec/support/rails/my_app.rb
-- spec/support/shared_examples/instrument.rb
-- spec/support/stubs/delayed_job.rb
-- spec/support/stubs/sidekiq/api.rb
-- spec/support/testing.rb
+test_files: []