appsignal 3.1.4 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21e4e80dd54b8a0f6619a40b7c046e6bc132634ce26666b281fdd4298c72c3f
-  data.tar.gz: 53743646f5cf821ab45559817cf65c2bf9ed483184725fca2413b3606fad6e1e
+  metadata.gz: 7a3a10bbc00539eeb5809a449c341151d7fdd87bdeb81c85e9a7778ef4b49857
+  data.tar.gz: a5e646a6124dd3a9173d3a30ec19463076a50b96e8b4320ef54c909fdc2aad22
 SHA512:
-  metadata.gz: 36a34d74cf16e5f274e3485471833f516e34227546017d14f24d70fc75ca824b68261a7048924391135a3c0d815d7ef605b60ac19396bdeb9b9b46f1d4911daa
-  data.tar.gz: b03a309a6c8649397e6f5d9b62a65324e4b4e39a3a1eee77b6cb60280758838212e2de7ca3eb28c8f10b3b59cb5b02ca7d88347cc9f3995be0308bf5249cae70
+  metadata.gz: f0038a47accbfd1d2f69bb7c9b1db650bb974d416674285afddf2570e9ea19bd9958dfeb3b24d8f950f058af0a9d63ba212920e632ea5dbb5a2ece55b237e1fe
+  data.tar.gz: 3761cf3f55137ac16e63a740d917e0f83a75d8d72ad93cbd52aa1de09a61bd3631dc8e6f537ada82d36c7e8a0395b1e05f5d76084508dd00169a2ef67c77a83d

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.1.6
+
+### Fixed
+
+- [a03b7246](https://github.com/appsignal/appsignal-ruby/commit/a03b72461f5f3b047ca81368cf2bdbeadf078e08) patch - Support Sidekiq 7 in the Sidekiq minutely probe. It will now report metrics to Sidekiq magic dashboard for Sidekiq version 7 and newer.
+
+## 3.1.5
+
+### Changed
+
+- [4035c3c2](https://github.com/appsignal/appsignal-ruby/commit/4035c3c2d5c0b002119054014daddd193bd820f0) patch - Bump agent to version 813a59b
+  
+  - Fix http proxy config option parsing for port 80.
+  - Fix the return value for appsignal_import_opentelemetry_span extension
+    function in `appsignal.h`.
+
+### Fixed
+
+- [feb60fb8](https://github.com/appsignal/appsignal-ruby/commit/feb60fb877a2b264e587fe3d5d546e40d86c9c38) patch - Fix NoMethodError for AppSignal Puma plugin for Puma 6. Puma 5 is also still supported.
+
 ## 3.1.4
 
 ### Added

data/ext/agent.yml

@@ -3,99 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: '06391fb'
+version: 813a59b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
+      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
+      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
+      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
+      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: 0f2430e637eb77ce2093f021777087e87cb1e7be7c86a53771172696791c4879
+      checksum: c73b6e9de849a40290a0d90eaad43ea41a9a0293ba4b8bf99f69965c45c85514
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 0e4f9305aeaaa2d7847e83be04227b865723a0591574108d78040b5921a677a7
+      checksum: 90226eefe2e2f66833ca3e31c69ce70763ed57916bd0b5c1809bd99d61ff3429
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
+      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
+      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
+      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
+      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 394796c0ddeb4881c9f2e6ce82f840e66bcb69e027324f6c04f6671067445fbb
+      checksum: 8355b017093db606014023cc617d84d6375d503d7ffa54f62c7b3dc56fb64ead
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 9ca4762c464482b0a5a89898a839388597dd57a17a21527a67f3e3db0e540a03
+      checksum: 7c239a7ffe18cb173120bd67fb96563f4a81f0744bbbb47082f077a38ccbe5f1
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 673271c8c5fd55053d8a719bcd307f787db4ca4633baf8cf961c442bf1805614
+      checksum: e9d98ed23b872dbf1e67a081473918cf88c4af775b1caadbfd93deda2635d9f8
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 609d59376d6633652015e838eb649229fe2523d443a5471232b869f48eb99640
+      checksum: 5538172a95dfca1a4cf8e111ba61eab5e9c16314fa902259711cb9e8e0d2f85e
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   aarch64-linux-musl:
     static:
-      checksum: e90ca19bf61596be022ba04897e8902b3401add58f351a40a3d3a7af241d0bbb
+      checksum: 0fb3eacfb8c8bc01c4acc8916327626720de376bcdd95104be71bb11a4ff9215
       filename: appsignal-aarch64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: afb66c65fb82b672887bc6b6e82d82f09d9855a5497a7abb06b438dadea97aca
+      checksum: b87bcedaa2aa886acf3a93ce6e32762a843f3bee1ca7a8f9e0d17ca32f7a7d39
       filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
+      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
+      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
+      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
+      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/gemfiles/padrino.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'padrino', "~> 0.15"
-gem 'rack'
+gem 'rack', "~> 2"
+gem 'sinatra', "~> 2"
 
 gemspec :path => '../'

data/gemfiles/que.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'que'
+gem 'que', "~> 1.0"
 
 gemspec :path => '../'

data/lib/appsignal/probes/sidekiq.rb

@@ -3,17 +3,59 @@ module Appsignal
     class SidekiqProbe
       include Helpers
 
+      class Sidekiq7Adapter
+        def self.redis_info
+          redis_info = nil
+          ::Sidekiq.redis { |c| redis_info = c.info }
+          redis_info
+        end
+
+        def self.hostname
+          host = nil
+          ::Sidekiq.redis do |c|
+            host = c.config.host
+          end
+          host
+        end
+      end
+
+      class Sidekiq6Adapter
+        def self.redis_info
+          return unless ::Sidekiq.respond_to?(:redis_info)
+
+          ::Sidekiq.redis_info
+        end
+
+        def self.hostname
+          host = nil
+          ::Sidekiq.redis do |c|
+            host = c.connection[:host] if c.respond_to? :connection
+          end
+          host
+        end
+      end
+
       # @api private
       attr_reader :config
 
+      def self.sidekiq7_and_greater?
+        Gem::Version.new(::Sidekiq::VERSION) >= Gem::Version.new("7.0.0")
+      end
+
       # @api private
       def self.dependencies_present?
+        return true if sidekiq7_and_greater?
+        return unless defined?(::Redis::VERSION) # Sidekiq <= 6
+
         Gem::Version.new(::Redis::VERSION) >= Gem::Version.new("3.3.5")
       end
 
       def initialize(config = {})
         @config = config
         @cache = {}
+        is_sidekiq7 = self.class.sidekiq7_and_greater?
+        @adapter = is_sidekiq7 ? Sidekiq7Adapter : Sidekiq6Adapter
+
         config_string = " with config: #{config}" unless config.empty?
         Appsignal.logger.debug("Initializing Sidekiq probe#{config_string}")
         require "sidekiq/api"
@@ -28,11 +70,11 @@ module Appsignal
 
       private
 
-      attr_reader :cache
+      attr_reader :adapter, :cache
 
       def track_redis_info
-        return unless ::Sidekiq.respond_to?(:redis_info)
-        redis_info = ::Sidekiq.redis_info
+        redis_info = adapter.redis_info
+        return unless redis_info
 
         gauge "connection_count", redis_info.fetch("connected_clients")
         gauge "memory_usage", redis_info.fetch("used_memory")
@@ -81,8 +123,7 @@ module Appsignal
           return @hostname
         end
 
-        host = nil
-        ::Sidekiq.redis { |c| host = c.connection[:host] }
+        host = adapter.hostname
         Appsignal.logger.debug "Sidekiq probe: Using Redis server hostname " \
           "#{host.inspect} as hostname"
         @hostname = host

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.1.4".freeze
+  VERSION = "3.1.6".freeze
 end

data/lib/puma/plugin/appsignal.rb

@@ -11,9 +11,9 @@ require "json"
 Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
   def start(launcher)
     @launcher = launcher
-    @launcher.events.debug "AppSignal: Puma plugin start."
+    log_debug "AppSignal: Puma plugin start."
     in_background do
-      @launcher.events.debug "AppSignal: Start Puma stats collection loop."
+      log_debug "AppSignal: Start Puma stats collection loop."
       plugin = AppsignalPumaPlugin.new
 
       loop do
@@ -24,12 +24,12 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
           # metrics.
           sleep sleep_time
 
-          @launcher.events.debug "AppSignal: Collecting Puma stats."
+          log_debug "AppSignal: Collecting Puma stats."
           stats = fetch_puma_stats
           if stats
             plugin.call(stats)
           else
-            @launcher.events.log "AppSignal: No Puma stats to report."
+            log_debug "AppSignal: No Puma stats to report."
           end
         rescue StandardError => error
           log_error "Error while processing metrics.", error
@@ -44,8 +44,20 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
     60 # seconds
   end
 
+  def logger
+    if @launcher.respond_to? :log_writer
+      @launcher.log_writer
+    else
+      @launcher.events
+    end
+  end
+
+  def log_debug(message)
+    logger.debug message
+  end
+
   def log_error(message, error)
-    @launcher.events.log "AppSignal: #{message}\n" \
+    logger.error "AppSignal: #{message}\n" \
       "#{error.class}: #{error.message}\n#{error.backtrace.join("\n")}"
   end
 

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

@@ -683,43 +683,36 @@ describe Appsignal::Transaction do
     end
 
     describe "#sample_data" do
-      it "should sample data" do
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "environment",
-          Appsignal::Utils::Data.generate(
-            "CONTENT_LENGTH" => "0",
-            "REQUEST_METHOD" => "GET",
-            "SERVER_NAME" => "example.org",
-            "SERVER_PORT" => "80",
-            "PATH_INFO" => "/blog"
-          )
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "session_data",
-          Appsignal::Utils::Data.generate({})
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "params",
-          Appsignal::Utils::Data.generate(
-            "controller" => "blog_posts",
-            "action" => "show",
-            "id" => "1"
-          )
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "metadata",
-          Appsignal::Utils::Data.generate("key" => "value")
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "tags",
-          Appsignal::Utils::Data.generate({})
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "breadcrumbs",
-          Appsignal::Utils::Data.generate([])
-        ).once
+      let(:env) { { "rack.session" => { "session" => "value" } } }
 
+      it "sets sample data" do
+        transaction.set_tags "tag" => "value"
+        transaction.add_breadcrumb "category", "action", "message", "key" => "value"
         transaction.sample_data
+
+        sample_data = transaction.to_h["sample_data"]
+        expect(sample_data["environment"]).to include(
+          "CONTENT_LENGTH" => "0",
+          "REQUEST_METHOD" => "GET",
+          "SERVER_NAME" => "example.org",
+          "SERVER_PORT" => "80",
+          "PATH_INFO" => "/blog"
+        )
+        expect(sample_data["session_data"]).to eq("session" => "value")
+        expect(sample_data["params"]).to eq(
+          "controller" => "blog_posts",
+          "action" => "show",
+          "id" => "1"
+        )
+        expect(sample_data["metadata"]).to eq("key" => "value")
+        expect(sample_data["tags"]).to eq("tag" => "value")
+        expect(sample_data["breadcrumbs"]).to contain_exactly(
+          "action" => "action",
+          "category" => "category",
+          "message" => "message",
+          "metadata" => { "key" => "value" },
+          "time" => kind_of(Integer)
+        )
       end
     end
 

data/spec/lib/appsignal_spec.rb

@@ -77,7 +77,7 @@ describe Appsignal do
         end
 
         it "should not install the allocation event hook" do
-          expect(Appsignal::Minutely).not_to receive(:install_allocation_event_hook)
+          expect(Appsignal::Extension).not_to receive(:install_allocation_event_hook)
           Appsignal.start
           expect_not_environment_metadata("ruby_allocation_tracking_enabled")
         end

data/spec/lib/puma/appsignal_spec.rb

@@ -2,14 +2,14 @@ RSpec.describe "Puma plugin" do
   include WaitForHelper
 
   class MockPumaLauncher
-    def events
-      return @events if defined?(@events)
+    def log_writer
+      return @log_writer if defined?(@log_writer)
 
-      @events = MockPumaEvents.new
+      @log_writer = MockPumaLogWriter.new
     end
   end
 
-  class MockPumaEvents
+  class MockPumaLogWriter
     attr_reader :logs
 
     def initialize
@@ -153,7 +153,7 @@ RSpec.describe "Puma plugin" do
   end
 
   def logs
-    launcher.events.logs
+    launcher.log_writer.logs
   end
 
   def messages
@@ -281,7 +281,7 @@ RSpec.describe "Puma plugin" do
     it "does not fetch metrics" do
       run_plugin(appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
-        expect(logs).to include([:log, "AppSignal: No Puma stats to report."])
+        expect(logs).to include([:debug, "AppSignal: No Puma stats to report."])
         expect(messages).to be_empty
       end
     end
@@ -296,4 +296,43 @@ RSpec.describe "Puma plugin" do
       end
     end
   end
+
+  context "with Puma < 6 Events class" do
+    class MockPumaEvents
+      attr_reader :logs
+
+      def initialize
+        @logs = []
+      end
+
+      def log(message)
+        @logs << [:log, message]
+      end
+
+      def debug(message)
+        @logs << [:debug, message]
+      end
+
+      def error(message)
+        @logs << [:error, message]
+      end
+    end
+
+    let(:launcher) do
+      Class.new do
+        def events
+          return @events if defined?(@events)
+
+          @events = MockPumaEvents.new
+        end
+      end.new
+    end
+    let(:stats_data) { { :max_threads => 5 } }
+
+    it "logs messages to the events class" do
+      run_plugin(appsignal_plugin) do
+        expect(launcher.events.logs).to_not be_empty
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.6
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -427,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com