sentry-sidekiq 4.5.2 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d833126f5b35c94334521ae17b72b0e852fcd0e0f94a30abd4522afc4506ed84
-  data.tar.gz: 16b687c8e27153593fb32147d915618fa34cf5392bba848ad988ccf7a77ec262
+  metadata.gz: eccd0c1d7cffe7eecd455ab2dcb303e555e609358d9949c27c328533e0df3ece
+  data.tar.gz: 6d9d38f849f8350b343ba1e52afb69b144a2d8524467b926a3af325e11e7312d
 SHA512:
-  metadata.gz: e33d879d4f9e2790fdf606577274da75e0cd16f176f8c6f9dbf54a11ad93db6ef0a594d05729b594a285ef6f729f01618c82a2af406b6243d93e8c3fdbb0e3ea
-  data.tar.gz: d623df35075019ec37dc4c497c007974c6385450cc34bb5a68a512464720741335a974989fba6b3f160feb3a349800ccc6b5dbfa22531e752b16164bf70496dd
+  metadata.gz: a01bddf2c4072d21f136545d0d35b1b61c12c345208839ed71df7916782a95c77f96c98da72930149e58a2b688a5630e5923c52e9ba3fcd756f09abbab620096
+  data.tar.gz: be0d4ed971237392b5f8a2d81df3d4aa5b1a207e775d5a91fa30d1b6360144f4526c9f047487d637415780eee216d568faddbdaa0b4dd505e1d5d387f02af5dc

data/lib/sentry-sidekiq.rb

@@ -26,7 +26,12 @@ end
 Sidekiq.configure_server do |config|
   config.error_handlers << Sentry::Sidekiq::ErrorHandler.new
   config.server_middleware do |chain|
-    chain.add Sentry::Sidekiq::SentryContextMiddleware
+    chain.add Sentry::Sidekiq::SentryContextServerMiddleware
   end
 end
 
+Sidekiq.configure_client do |config|
+  config.client_middleware do |chain|
+    chain.add Sentry::Sidekiq::SentryContextClientMiddleware
+  end
+end

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -2,7 +2,7 @@ require 'sentry/sidekiq/context_filter'
 
 module Sentry
   module Sidekiq
-    class SentryContextMiddleware
+    class SentryContextServerMiddleware
       def call(_worker, job, queue)
         return yield unless Sentry.initialized?
 
@@ -10,6 +10,9 @@ module Sentry
 
         Sentry.clone_hub_to_current_thread
         scope = Sentry.get_current_scope
+        if (user = job["sentry_user"])
+          scope.set_user(user)
+        end
         scope.set_tags(queue: queue, jid: job["jid"])
         scope.set_contexts(sidekiq: job.merge("queue" => queue))
         scope.set_transaction_name(context_filter.transaction_name)
@@ -36,5 +39,15 @@ module Sentry
         transaction.finish
       end
     end
+
+    class SentryContextClientMiddleware
+      def call(_worker_class, job, _queue, _redis_pool)
+        return yield unless Sentry.initialized?
+
+        user = Sentry.get_current_scope.user
+        job["sentry_user"] = user unless user.empty?
+        yield
+      end
+    end
   end
 end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "4.5.2"
+    VERSION = "4.6.2"
   end
 end

data/sentry-sidekiq.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby-core", "~> 4.5.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.6.0"
+  spec.add_dependency "sidekiq", ">= 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.6.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby-core
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.6.0
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A gem that provides Sidekiq integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []