appsignal 3.1.5-java → 3.2.0-java

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

@@ -7,114 +7,177 @@ describe Appsignal::Probes::SidekiqProbe do
     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
-          }
+
+      class SidekiqStats
+        class << self
+          attr_reader :calls
+
+          def count_call
+            @calls ||= -1
+            @calls += 1
+          end
         end
 
-        def self.redis
-          yield Client.new
+        def workers_size
+          # First method called, so count it towards a call
+          self.class.count_call
+          24
         end
 
-        class Client
-          def connection
-            { :host => "localhost" }
-          end
+        def processes_size
+          25
         end
 
-        class Stats
-          class << self
-            attr_reader :calls
+        # 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
 
-            def count_call
-              @calls ||= -1
-              @calls += 1
-            end
-          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 workers_size
-            # First method called, so count it towards a call
-            self.class.count_call
-            24
-          end
+        def retry_size
+          12
+        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 dead_size
+          [10, 12][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 processed
-            [10, 15][self.class.calls]
-          end
+        def scheduled_size
+          14
+        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 enqueued
+          15
+        end
+      end
 
-          def retry_size
-            12
-          end
+      class SidekiqQueue
+        Queue = Struct.new(:name, :size, :latency)
+
+        def self.all
+          [
+            Queue.new("default", 10, 12),
+            Queue.new("critical", 1, 2)
+          ]
+        end
+      end
+
+      module Sidekiq7Mock
+        VERSION = "7.0.0".freeze
+
+        def self.redis
+          yield Client.new
+        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]
+        class Client
+          def config
+            Config.new
           end
 
-          def scheduled_size
-            14
+          def info
+            {
+              "connected_clients" => 2,
+              "used_memory" => 1024,
+              "used_memory_rss" => 512
+            }
           end
+        end
 
-          def enqueued
-            15
+        class Config
+          def host
+            "localhost"
           end
         end
 
-        class Queue
-          Queue = Struct.new(:name, :size, :latency)
+        Stats = ::SidekiqStats
+        Queue = ::SidekiqQueue
+      end
+
+      module Sidekiq6Mock
+        VERSION = "6.9.9".freeze
+
+        def self.redis_info
+          {
+            "connected_clients" => 2,
+            "used_memory" => 1024,
+            "used_memory_rss" => 512
+          }
+        end
+
+        def self.redis
+          yield Client.new
+        end
 
-          def self.all
-            [
-              Queue.new("default", 10, 12),
-              Queue.new("critical", 1, 2)
-            ]
+        class Client
+          def connection
+            { :host => "localhost" }
           end
         end
+
+        Stats = ::SidekiqStats
+        Queue = ::SidekiqQueue
       end
-      stub_const("Sidekiq", SidekiqMock)
     end
-    after { Object.send(:remove_const, :SidekiqMock) }
+    after do
+      Object.send(:remove_const, :SidekiqStats)
+      Object.send(:remove_const, :SidekiqQueue)
+      Object.send(:remove_const, :Sidekiq6Mock)
+      Object.send(:remove_const, :Sidekiq7Mock)
+    end
+
+    def with_sidekiq7!
+      stub_const("Sidekiq", Sidekiq7Mock)
+    end
+    # Version not relevant, but requires any version for tests
+    alias_method :with_sidekiq!, :with_sidekiq7!
+
+    def with_sidekiq6!
+      stub_const("Sidekiq", Sidekiq6Mock)
+    end
 
     describe ".dependencies_present?" do
-      before do
-        stub_const("Redis::VERSION", version)
+      context "when Sidekiq 7" do
+        before { with_sidekiq7! }
+
+        it "starts the probe" do
+          expect(described_class.dependencies_present?).to be_truthy
+        end
       end
 
-      context "when Redis version is < 3.3.5" do
-        let(:version) { "3.3.4" }
+      context "when Sidekiq 6" do
+        before do
+          with_sidekiq6!
+          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
+          it "does not start probe" do
+            expect(described_class.dependencies_present?).to be_falsy
+          end
         end
-      end
 
-      context "when Redis version is >= 3.3.5" do
-        let(:version) { "3.3.5" }
+        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
+          it "starts the probe" do
+            expect(described_class.dependencies_present?).to be_truthy
+          end
         end
       end
     end
 
     it "loads Sidekiq::API" do
+      with_sidekiq!
       # Hide the Sidekiq constant if it was already loaded. It will be
       # redefined by loading "sidekiq/api" in the probe.
       hide_const "Sidekiq::Stats"
@@ -125,53 +188,94 @@ describe Appsignal::Probes::SidekiqProbe do
     end
 
     it "logs config on initialize" do
+      with_sidekiq!
       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
+    context "with Sidekiq 7" do
+      before { with_sidekiq7! }
 
-    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
+      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
     end
 
-    context "when `redis_info` is not defined" do
-      before do
-        allow(Sidekiq).to receive(:respond_to?).with(:redis_info).and_return(false)
+    context "with Sidekiq 6" do
+      before { with_sidekiq6! }
+
+      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 "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
+      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 Sidekiq `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
     end
 
     context "when hostname is configured for probe" do
@@ -179,6 +283,8 @@ describe Appsignal::Probes::SidekiqProbe do
       let(:probe) { described_class.new(:hostname => redis_hostname) }
 
       it "uses the redis hostname for the hostname tag" do
+        with_sidekiq!
+
         allow(Appsignal).to receive(:set_gauge).and_call_original
         log = capture_logs { probe }
         expect(log).to contains_log(

data/spec/lib/appsignal/utils/integration_logger_spec.rb

@@ -0,0 +1,25 @@
+describe Appsignal::Utils::IntegrationLogger do
+  let(:log) { std_stream }
+  let(:logger) do
+    Appsignal::Utils::IntegrationLogger.new(log).tap do |l|
+      l.formatter = logger_formatter
+    end
+  end
+
+  describe "#seen_keys" do
+    it "returns a Set" do
+      expect(logger.seen_keys).to be_a(Set)
+    end
+  end
+
+  describe "#warn_once_then_debug" do
+    it "only warns once, then uses debug" do
+      message = "This is a log line"
+      3.times { logger.warn_once_then_debug(:key, message) }
+
+      logs = log_contents(log)
+      expect(logs.scan(/#{Regexp.escape(log_line(:WARN, message))}/).count).to eql(1)
+      expect(logs.scan(/#{Regexp.escape(log_line(:DEBUG, message))}/).count).to eql(2)
+    end
+  end
+end

data/spec/lib/appsignal_spec.rb

@@ -1127,7 +1127,7 @@ describe Appsignal do
             Appsignal.start_logger
             Appsignal.logger.error("Log to file")
           end
-          expect(Appsignal.logger).to be_a(Appsignal::Logger)
+          expect(Appsignal.logger).to be_a(Appsignal::Utils::IntegrationLogger)
         end
 
         it "logs to file" do
@@ -1150,7 +1150,7 @@ describe Appsignal do
             initialize_config
             Appsignal.start_logger
             Appsignal.logger.error("Log to not writable log file")
-            expect(Appsignal.logger).to be_a(Appsignal::Logger)
+            expect(Appsignal.logger).to be_a(Appsignal::Utils::IntegrationLogger)
           end
         end
 
@@ -1181,7 +1181,7 @@ describe Appsignal do
           Appsignal.start_logger
           Appsignal.logger.error("Log to not writable log path")
         end
-        expect(Appsignal.logger).to be_a(Appsignal::Logger)
+        expect(Appsignal.logger).to be_a(Appsignal::Utils::IntegrationLogger)
       end
       after do
         FileUtils.chmod 0o755, Appsignal::Config.system_tmp_dir
@@ -1210,7 +1210,7 @@ describe Appsignal do
           Appsignal.start_logger
           Appsignal.logger.error("Log to stdout")
         end
-        expect(Appsignal.logger).to be_a(Appsignal::Logger)
+        expect(Appsignal.logger).to be_a(Appsignal::Utils::IntegrationLogger)
       end
       around { |example| recognize_as_heroku { example.run } }
 

data/spec/support/helpers/dependency_helper.rb

@@ -103,6 +103,10 @@ module DependencyHelper
       Gem.loaded_specs["capistrano"].version >= Gem::Version.new("3.0")
   end
 
+  def http_present?
+    dependency_present? "http"
+  end
+
   def que_present?
     dependency_present? "que"
   end

data/spec/support/helpers/log_helpers.rb

@@ -12,7 +12,7 @@ module LogHelpers
   end
 
   def test_logger(log)
-    Appsignal::Logger.new(log).tap do |logger|
+    Appsignal::Utils::IntegrationLogger.new(log).tap do |logger|
       logger.formatter = logger_formatter
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -175,6 +175,7 @@ files:
 - gemfiles/capistrano2.gemfile
 - gemfiles/capistrano3.gemfile
 - gemfiles/grape.gemfile
+- gemfiles/http5.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
 - gemfiles/psych-3.gemfile
@@ -230,6 +231,7 @@ files:
 - lib/appsignal/hooks/data_mapper.rb
 - lib/appsignal/hooks/delayed_job.rb
 - lib/appsignal/hooks/excon.rb
+- lib/appsignal/hooks/http.rb
 - lib/appsignal/hooks/mongo_ruby_driver.rb
 - lib/appsignal/hooks/mri.rb
 - lib/appsignal/hooks/net_http.rb
@@ -252,6 +254,7 @@ files:
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/excon.rb
 - lib/appsignal/integrations/grape.rb
+- lib/appsignal/integrations/http.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
 - lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
@@ -284,6 +287,7 @@ files:
 - lib/appsignal/utils/data.rb
 - lib/appsignal/utils/deprecation_message.rb
 - lib/appsignal/utils/hash_sanitizer.rb
+- lib/appsignal/utils/integration_logger.rb
 - lib/appsignal/utils/json.rb
 - lib/appsignal/utils/query_params_sanitizer.rb
 - lib/appsignal/utils/rails_helper.rb
@@ -331,6 +335,7 @@ files:
 - 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/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
@@ -348,6 +353,7 @@ files:
 - 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/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
@@ -371,6 +377,7 @@ files:
 - 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
@@ -441,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -483,6 +490,7 @@ test_files:
 - 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/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
@@ -500,6 +508,7 @@ test_files:
 - 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/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
@@ -523,6 +532,7 @@ test_files:
 - 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