appsignal 2.11.0.alpha.2 → 2.11.0.beta.5

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/lib/appsignal/probes/sidekiq_spec.rb

@@ -7,7 +7,7 @@ describe Appsignal::Probes::SidekiqProbe do
     let(:expected_default_tags) { { :hostname => "localhost" } }
     before do
       Appsignal.config = project_fixture_config
-      module Sidekiq
+      module SidekiqMock
         def self.redis_info
           {
             "connected_clients" => 2,
@@ -88,15 +88,14 @@ describe Appsignal::Probes::SidekiqProbe do
           end
         end
       end
+      stub_const("Sidekiq", SidekiqMock)
     end
-    after { Object.send(:remove_const, "Sidekiq") }
+    after { Object.send(:remove_const, :SidekiqMock) }
 
     describe ".dependencies_present?" do
       before do
-        class Redis; end
-        Redis.const_set(:VERSION, version)
+        stub_const("Redis::VERSION", version)
       end
-      after { Object.send(:remove_const, "Redis") }
 
       context "when Redis version is < 3.3.5" do
         let(:version) { "3.3.4" }
@@ -116,9 +115,13 @@ describe Appsignal::Probes::SidekiqProbe do
     end
 
     it "loads Sidekiq::API" do
-      expect(defined?(Sidekiq::API)).to be_falsy
+      # Hide the Sidekiq constant if it was already loaded. It will be
+      # redefined by loading "sidekiq/api" in the probe.
+      hide_const "Sidekiq::Stats"
+
+      expect(defined?(Sidekiq::Stats)).to be_falsy
       probe
-      expect(defined?(Sidekiq::API)).to be_truthy
+      expect(defined?(Sidekiq::Stats)).to be_truthy
     end
 
     it "logs config on initialize" do

data/spec/lib/appsignal/transaction_spec.rb

@@ -473,22 +473,20 @@ describe Appsignal::Transaction do
       end
     end
 
-    describe "set_queue_start" do
-      it "should set the queue start in extension" do
-        expect(transaction.ext).to receive(:set_queue_start).with(
-          10.0
-        ).once
+    describe "#set_queue_start" do
+      it "sets the queue start in extension" do
+        expect(transaction.ext).to receive(:set_queue_start).with(10.0).once
 
         transaction.set_queue_start(10.0)
       end
 
-      it "should not set the queue start in extension when value is nil" do
+      it "does not set the queue start in extension when value is nil" do
         expect(transaction.ext).to_not receive(:set_queue_start)
 
         transaction.set_queue_start(nil)
       end
 
-      it "should not raise an error when the queue start is too big" do
+      it "does not raise an error when the queue start is too big" do
         expect(transaction.ext).to receive(:set_queue_start).and_raise(RangeError)
 
         expect(Appsignal.logger).to receive(:warn).with("Queue start value 10 is too big")

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
@@ -10,8 +14,11 @@ module DependencyHelper
   end
 
   def rails6_present?
-    rails_present? &&
-      Gem.loaded_specs["rails"].version >= Gem::Version.new("6.0.0")
+    rails_present? && rails_version >= Gem::Version.new("6.0.0")
+  end
+
+  def rails_version
+    Gem.loaded_specs["rails"].version
   end
 
   def sequel_present?

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 @@
 module Sidekiq
-  class API
+  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.11.0.alpha.2
+  version: 2.11.0.beta.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-27 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
@@ -206,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
@@ -217,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
@@ -241,6 +244,7 @@ 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
@@ -287,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
@@ -301,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
@@ -348,6 +355,7 @@ 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
@@ -382,7 +390,7 @@ 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
@@ -431,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
@@ -445,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
@@ -492,6 +503,7 @@ 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