appsignal 2.10.6 → 2.11.0

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/action_mailer_helpers.rb

@@ -0,0 +1,25 @@
+module ActionMailerHelpers
+  def perform_action_mailer(mailer, method, args = nil)
+    if DependencyHelper.rails_version >= Gem::Version.new("5.2.0")
+      case args
+      when Array
+        mailer.send(method, *args).deliver_later
+      when Hash
+        mailer.with(args).send(method).deliver_later
+      when NilClass
+        mailer.send(method).deliver_later
+      else
+        raise "Unknown scenario for arguments: #{args}"
+      end
+    else
+      # Rails 5.1 and lower
+      mailer_object =
+        if args
+          mailer.send(method, *args)
+        else
+          mailer.send(method)
+        end
+      mailer_object.deliver_later
+    end
+  end
+end

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

@@ -1,6 +1,10 @@
 module DependencyHelper
   module_function
 
+  def ruby_version
+    Gem::Version.new(RUBY_VERSION)
+  end
+
   def running_jruby?
     defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   end
@@ -9,6 +13,14 @@ module DependencyHelper
     dependency_present? "rails"
   end
 
+  def rails6_present?
+    rails_present? && rails_version >= Gem::Version.new("6.0.0")
+  end
+
+  def rails_version
+    Gem.loaded_specs["rails"].version
+  end
+
   def sequel_present?
     dependency_present? "sequel"
   end

data/spec/support/helpers/env_helpers.rb

@@ -27,7 +27,7 @@ module EnvHelpers
       :priority => 1,
       :attempts => 0,
       :queue => "default",
-      :queue_start => fixed_time - 10.0
+      :queue_start => fixed_time
     }.merge(args)
   end
 end

data/spec/support/helpers/environment_metdata_helper.rb

@@ -0,0 +1,16 @@
+module EnvironmentMetadataHelper
+  def capture_environment_metadata_report_calls
+    allow(Appsignal::Extension).to receive(:set_environment_metadata)
+      .and_call_original
+  end
+
+  def expect_environment_metadata(key, value)
+    expect(Appsignal::Extension).to have_received(:set_environment_metadata)
+      .with(key, value)
+  end
+
+  def expect_not_environment_metadata(key)
+    expect(Appsignal::Extension).to_not have_received(:set_environment_metadata)
+      .with(key, anything)
+  end
+end

data/spec/support/helpers/transaction_helpers.rb

@@ -44,6 +44,12 @@ module TransactionHelpers
     created_transactions.last
   end
 
+  # Set current transaction manually.
+  # Cleared by {clear_current_transaction!}
+  def set_current_transaction(transaction) # rubocop:disable Naming/AccessorMethodName
+    Thread.current[:appsignal_transaction] = transaction
+  end
+
   # Use when {Appsignal::Transaction.clear_current_transaction!} is stubbed to
   # clear the current transaction on the current thread.
   def clear_current_transaction!

data/spec/support/stubs/sidekiq/api.rb

@@ -1,4 +1,4 @@
-class Sidekiq
-  class API
+module Sidekiq
+  class Stats
   end
 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)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.10.6
+  version: 2.11.0
 platform: ruby
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -172,7 +172,8 @@ files:
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
-- gemfiles/resque.gemfile
+- gemfiles/resque-1.gemfile
+- gemfiles/resque-2.gemfile
 - gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
@@ -190,6 +191,7 @@ files:
 - lib/appsignal/cli/notify_of_deploy.rb
 - lib/appsignal/config.rb
 - lib/appsignal/demo.rb
+- lib/appsignal/environment.rb
 - lib/appsignal/event_formatter.rb
 - lib/appsignal/event_formatter/action_view/render_formatter.rb
 - lib/appsignal/event_formatter/active_record/instantiation_formatter.rb
@@ -205,6 +207,7 @@ files:
 - lib/appsignal/helpers/metrics.rb
 - lib/appsignal/hooks.rb
 - lib/appsignal/hooks/action_cable.rb
+- lib/appsignal/hooks/active_job.rb
 - lib/appsignal/hooks/active_support_notifications.rb
 - lib/appsignal/hooks/celluloid.rb
 - lib/appsignal/hooks/data_mapper.rb
@@ -216,6 +219,7 @@ files:
 - lib/appsignal/hooks/que.rb
 - lib/appsignal/hooks/rake.rb
 - lib/appsignal/hooks/redis.rb
+- lib/appsignal/hooks/resque.rb
 - lib/appsignal/hooks/sequel.rb
 - lib/appsignal/hooks/shoryuken.rb
 - lib/appsignal/hooks/sidekiq.rb
@@ -227,7 +231,6 @@ files:
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
-- lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/que.rb
@@ -241,6 +244,9 @@ files:
 - lib/appsignal/logger.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
+- lib/appsignal/probes.rb
+- lib/appsignal/probes/puma.rb
+- lib/appsignal/probes/sidekiq.rb
 - lib/appsignal/rack/generic_instrumentation.rb
 - lib/appsignal/rack/js_exception_catcher.rb
 - lib/appsignal/rack/rails_instrumentation.rb
@@ -275,6 +281,7 @@ files:
 - 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
@@ -284,10 +291,12 @@ files:
 - spec/lib/appsignal/event_formatter/moped/query_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_profiler_spec.rb
 - spec/lib/appsignal/hooks/action_cable_spec.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
@@ -298,6 +307,7 @@ files:
 - 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
@@ -319,6 +329,8 @@ files:
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
+- spec/lib/appsignal/probes/puma_spec.rb
+- spec/lib/appsignal/probes/sidekiq_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
 - spec/lib/appsignal/rack/js_exception_catcher_spec.rb
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
@@ -343,12 +355,14 @@ files:
 - spec/support/fixtures/projects/valid/config/environments/test.rb
 - spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
+- spec/support/helpers/action_mailer_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
@@ -376,11 +390,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/appsignal/appsignal-ruby/issues
-  changelog_uri: https://github.com/appsignal/appsignal-ruby/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/appsignal/appsignal-ruby/blob/main/CHANGELOG.md
   documentation_uri: https://docs.appsignal.com/ruby/
   homepage_uri: https://docs.appsignal.com/ruby/
   source_code_uri: https://github.com/appsignal/appsignal-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -396,8 +410,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
@@ -415,6 +429,7 @@ test_files:
 - 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
@@ -424,10 +439,12 @@ test_files:
 - spec/lib/appsignal/event_formatter/moped/query_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_profiler_spec.rb
 - spec/lib/appsignal/hooks/action_cable_spec.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
@@ -438,6 +455,7 @@ test_files:
 - 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
@@ -459,6 +477,8 @@ test_files:
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
+- spec/lib/appsignal/probes/puma_spec.rb
+- spec/lib/appsignal/probes/sidekiq_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
 - spec/lib/appsignal/rack/js_exception_catcher_spec.rb
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
@@ -483,12 +503,14 @@ test_files:
 - spec/support/fixtures/projects/valid/config/environments/test.rb
 - spec/support/fixtures/projects/valid/log/.gitkeep
 - spec/support/fixtures/uploaded_file.txt
+- spec/support/helpers/action_mailer_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

data/lib/appsignal/integrations/net_http.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  module Integrations
-    module NetHttpIntegration
-      def request(request, body = nil, &block)
-        Appsignal.instrument(
-          "request.net_http",
-          "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-        ) do
-          super
-        end
-      end
-    end
-  end
-end