appsignal 4.5.2-java → 4.5.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06b4723348286e7d34cd22d6dd63acf5fa6c3c009fcedb02a063762445865f66
-  data.tar.gz: cd669a754156ec1a8a2854efaa1e927397eae75d58f9df5e6c277e856711df91
+  metadata.gz: 3abe515c0089e470e9ecd226bd627eb55e36c47862a76be222b962c164f592a6
+  data.tar.gz: 432adbc22993a93cd5291ca9b1a3ce1ebf88b4853d2a046c845d3734c36da41e
 SHA512:
-  metadata.gz: 483ea8070af1318b3a9d1a8c8344186ad776111dc35b67e9df73a558f9577828cbad1886f53c4aca36d565cd9d945f359024d97f7340a9f71fd9d39db25022d9
-  data.tar.gz: 6edd7715a85f5ae40c7ff6679ad432c16811ad45dd3541f83392c194391178174db0987a9ffd47797e1138f4df4176b03021f20e9091d6bc84df44c36acefc78
+  metadata.gz: 342b37ee08c93991e37330c931b272d8516dd40ea680fe9cad5376a651ecfffa029d09bfd61f4e544dec3719cab897c1d4c0495bfd6648c54d7d70eba12eca09
+  data.tar.gz: f5fce054168bc831c6f387b103fffbc98cae683492d2effeb52c8cb1696c69fe47870c178e425c34cd4cb441a4e5f5ce4519ff36bffb3a07d49ed8fac0c4c7a1

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # AppSignal for Ruby gem Changelog
 
+## 4.5.3
+
+_Published on 2025-03-06._
+
+### Changed
+
+- Specify stricter Rack version requirement. The Ruby gem relies on the `Rack::Events` constant which was introduced in Rack 2. Update our version requirement to require Rack 2 or newer. (patch [19bdb0b3](https://github.com/appsignal/appsignal-ruby/commit/19bdb0b3914e93e9f7c7ffa3a1bad80d9f3d1520))
+
+### Fixed
+
+- Fix the queue time reporting for Sidekiq 8 jobs. It would report high negative values for the queue time with Sidekiq 8. (patch [6fcc40e3](https://github.com/appsignal/appsignal-ruby/commit/6fcc40e31e8656cb84daa8bb5a0bea7a137ab089))
+
 ## 4.5.2
 
 _Published on 2025-02-24._

data/appsignal.gemspec

@@ -57,7 +57,8 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   }
 
   gem.add_dependency "logger"
-  gem.add_dependency "rack"
+  # Needs 2.0+ because we rely on Rack::Events
+  gem.add_dependency "rack", ">= 2.0.0"
 
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rake", ">= 12"

data/build_matrix.yml

@@ -208,3 +208,11 @@ matrix:
     - gem: "webmachine2"
     - gem: "redis-4"
     - gem: "redis-5"
+    - gem: "sidekiq-7"
+      only:
+        ruby:
+          - "3.4.1"
+    - gem: "sidekiq-8"
+      only:
+        ruby:
+          - "3.4.1"

data/lib/appsignal/integrations/sidekiq.rb

@@ -58,6 +58,12 @@ module Appsignal
         error_message failed_at jid retried_at retry wrapped
       ].freeze
 
+      def self.sidekiq8?
+        return false unless ::Sidekiq.respond_to?(:gem_version)
+
+        @sidekiq8 ||= ::Sidekiq.gem_version >= Gem::Version.new("8.0.0")
+      end
+
       def call(_worker, item, _queue, &block)
         job_status = nil
         transaction = Appsignal::Transaction.create(Appsignal::Transaction::BACKGROUND_JOB)
@@ -74,7 +80,14 @@ module Appsignal
       ensure
         if transaction
           transaction.add_params_if_nil { parse_arguments(item) }
-          queue_start = (item["enqueued_at"].to_f * 1000.0).to_i # Convert seconds to milliseconds
+          enqueued_at = item["enqueued_at"]
+          queue_start =
+            if self.class.sidekiq8?
+              enqueued_at.to_i # Sidekiq 8 stores it as epoc milliseconds
+            else
+              # Convert seconds to milliseconds for Sidekiq 7 and older
+              (enqueued_at.to_f * 1000.0).to_i
+            end
           transaction.set_queue_start(queue_start)
           transaction.add_tags(:request_id => item["jid"])
           Appsignal::Transaction.complete_current! unless exception
@@ -143,8 +156,6 @@ module Appsignal
           safe_load(args[0], args) do |_, _, arg|
             arg
           end
-        when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
-          nil # Set in the ActiveJob integration
         else
           # Sidekiq Enterprise argument encryption.
           # More information: https://github.com/mperham/sidekiq/wiki/Ent-Encryption

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "4.5.2"
+  VERSION = "4.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement