appsignal 2.11.0.alpha.1 → 2.11.0.beta.4

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

@@ -0,0 +1,204 @@
+require "appsignal/probes/sidekiq"
+
+describe Appsignal::Probes::SidekiqProbe do
+  describe "#call" do
+    let(:probe) { described_class.new }
+    let(:redis_hostname) { "localhost" }
+    let(:expected_default_tags) { { :hostname => "localhost" } }
+    before do
+      Appsignal.config = project_fixture_config
+      module SidekiqMock
+        def self.redis_info
+          {
+            "connected_clients" => 2,
+            "used_memory" => 1024,
+            "used_memory_rss" => 512
+          }
+        end
+
+        def self.redis
+          yield Client.new
+        end
+
+        class Client
+          def connection
+            { :host => "localhost" }
+          end
+        end
+
+        class Stats
+          class << self
+            attr_reader :calls
+
+            def count_call
+              @calls ||= -1
+              @calls += 1
+            end
+          end
+
+          def workers_size
+            # First method called, so count it towards a call
+            self.class.count_call
+            24
+          end
+
+          def processes_size
+            25
+          end
+
+          # Return two different values for two separate calls.
+          # This allows us to test the delta of the value send as a gauge.
+          def processed
+            [10, 15][self.class.calls]
+          end
+
+          # Return two different values for two separate calls.
+          # This allows us to test the delta of the value send as a gauge.
+          def failed
+            [10, 13][self.class.calls]
+          end
+
+          def retry_size
+            12
+          end
+
+          # Return two different values for two separate calls.
+          # This allows us to test the delta of the value send as a gauge.
+          def dead_size
+            [10, 12][self.class.calls]
+          end
+
+          def scheduled_size
+            14
+          end
+
+          def enqueued
+            15
+          end
+        end
+
+        class Queue
+          Queue = Struct.new(:name, :size, :latency)
+
+          def self.all
+            [
+              Queue.new("default", 10, 12),
+              Queue.new("critical", 1, 2)
+            ]
+          end
+        end
+      end
+      stub_const("Sidekiq", SidekiqMock)
+    end
+    after { Object.send(:remove_const, :SidekiqMock) }
+
+    describe ".dependencies_present?" do
+      before do
+        stub_const("Redis::VERSION", version)
+      end
+
+      context "when Redis version is < 3.3.5" do
+        let(:version) { "3.3.4" }
+
+        it "does not start probe" do
+          expect(described_class.dependencies_present?).to be_falsy
+        end
+      end
+
+      context "when Redis version is >= 3.3.5" do
+        let(:version) { "3.3.5" }
+
+        it "does not start probe" do
+          expect(described_class.dependencies_present?).to be_truthy
+        end
+      end
+    end
+
+    it "loads Sidekiq::API" do
+      # 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::Stats)).to be_truthy
+    end
+
+    it "logs config on initialize" do
+      log = capture_logs { probe }
+      expect(log).to contains_log(:debug, "Initializing Sidekiq probe\n")
+    end
+
+    it "logs used hostname on call once" do
+      log = capture_logs { probe.call }
+      expect(log).to contains_log(
+        :debug,
+        %(Sidekiq probe: Using Redis server hostname "localhost" as hostname)
+      )
+      log = capture_logs { probe.call }
+      # Match more logs with incompelete message
+      expect(log).to_not contains_log(:debug, %(Sidekiq probe: ))
+    end
+
+    it "collects custom metrics" do
+      expect_gauge("worker_count", 24).twice
+      expect_gauge("process_count", 25).twice
+      expect_gauge("connection_count", 2).twice
+      expect_gauge("memory_usage", 1024).twice
+      expect_gauge("memory_usage_rss", 512).twice
+      expect_gauge("job_count", 5, :status => :processed) # Gauge delta
+      expect_gauge("job_count", 3, :status => :failed) # Gauge delta
+      expect_gauge("job_count", 12, :status => :retry_queue).twice
+      expect_gauge("job_count", 2, :status => :died) # Gauge delta
+      expect_gauge("job_count", 14, :status => :scheduled).twice
+      expect_gauge("job_count", 15, :status => :enqueued).twice
+      expect_gauge("queue_length", 10, :queue => "default").twice
+      expect_gauge("queue_latency", 12_000, :queue => "default").twice
+      expect_gauge("queue_length", 1, :queue => "critical").twice
+      expect_gauge("queue_latency", 2_000, :queue => "critical").twice
+      # Call probe twice so we can calculate the delta for some gauge values
+      probe.call
+      probe.call
+    end
+
+    context "when `redis_info` is not defined" do
+      before do
+        allow(Sidekiq).to receive(:respond_to?).with(:redis_info).and_return(false)
+      end
+
+      it "does not collect redis metrics" do
+        expect_gauge("connection_count", 2).never
+        expect_gauge("memory_usage", 1024).never
+        expect_gauge("memory_usage_rss", 512).never
+        probe.call
+      end
+    end
+
+    context "when hostname is configured for probe" do
+      let(:redis_hostname) { "my_redis_server" }
+      let(:probe) { described_class.new(:hostname => redis_hostname) }
+
+      it "uses the redis hostname for the hostname tag" do
+        allow(Appsignal).to receive(:set_gauge).and_call_original
+        log = capture_logs { probe }
+        expect(log).to contains_log(
+          :debug,
+          %(Initializing Sidekiq probe with config: {:hostname=>"#{redis_hostname}"})
+        )
+        log = capture_logs { probe.call }
+        expect(log).to contains_log(
+          :debug,
+          "Sidekiq probe: Using hostname config option #{redis_hostname.inspect} as hostname"
+        )
+        expect(Appsignal).to have_received(:set_gauge)
+          .with(anything, anything, :hostname => redis_hostname).at_least(:once)
+      end
+    end
+
+    def expect_gauge(key, value, tags = {})
+      expect(Appsignal).to receive(:set_gauge)
+        .with("sidekiq_#{key}", value, expected_default_tags.merge(tags))
+        .and_call_original
+    end
+  end
+end

data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb

@@ -4,9 +4,12 @@ describe Appsignal::Rack::JSExceptionCatcher do
   let(:config_options) { { :enable_frontend_error_catching => true } }
   let(:config)         { project_fixture_config("production", config_options) }
   let(:deprecation_message) do
-    "The Appsignal::Rack::JSExceptionCatcher is deprecated. " \
-      "Please use the official AppSignal JavaScript integration instead. " \
-      "https://docs.appsignal.com/front-end/"
+    "The Appsignal::Rack::JSExceptionCatcher is " \
+      "deprecated and will be removed in a future version. Please use " \
+      "the official AppSignal JavaScript integration by disabling " \
+      "`enable_frontend_error_catching` in your configuration and " \
+      "installing AppSignal for JavaScript instead. " \
+      "(https://docs.appsignal.com/front-end/)"
   end
   before { Appsignal.config = config }
 
@@ -32,7 +35,9 @@ describe Appsignal::Rack::JSExceptionCatcher do
 
   describe "#call" do
     let(:catcher) do
-      silence { Appsignal::Rack::JSExceptionCatcher.new(app, options) }
+      silence :allowed => ["enable_frontend_error_catching"] do
+        Appsignal::Rack::JSExceptionCatcher.new(app, options)
+      end
     end
     after { catcher.call(env) }
 

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/lib/puma/appsignal_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe "Puma plugin" do
     expect(launcher.events.on_booted).to_not be_nil
 
     launcher.events.on_booted.call
-    expect(Appsignal::Minutely.probes[:puma]).to eql(Appsignal::Hooks::PumaProbe)
+    expect(Appsignal::Minutely.probes[:puma]).to eql(Appsignal::Probes::PumaProbe)
 
     # Minutely probes started and called
     wait_for("enough probe calls") { probe.calls >= 2 }

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/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 Style/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.11.0.alpha.1
+  version: 2.11.0.beta.4
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-13 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,8 @@ files:
 - lib/appsignal/logger.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.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
@@ -289,6 +294,7 @@ files:
 - 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
@@ -299,6 +305,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
@@ -320,6 +327,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
@@ -344,6 +353,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
@@ -431,6 +441,7 @@ test_files:
 - 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
@@ -441,6 +452,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
@@ -462,6 +474,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
@@ -486,6 +500,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