sentry-sidekiq 4.5.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258de37243b829dddd8fd4726744fdb673b68ca10b5c95aeda21be5c6501a4d8
-  data.tar.gz: 54c354085193eabff5422efed9440eb7503a41b9fdb3e98b9c89229bb12ae3ca
+  metadata.gz: 145643c4a22bad5b91480c1e721ccdc83f47b72fa9c6b73c0beea6eaaf544028
+  data.tar.gz: 9fb7f16bb1c025f482bf175d9ae58bd293a4961f4656dac2ded0e7454ff03b70
 SHA512:
-  metadata.gz: 5aaad1970d121845219dca6edbd183deaa00dbe4f8efbeef0e131fc6cecb898edc6b402eeb8b3dbfb5da224216bc4ab2f51a6953e676e546c10bc6a33d506517
-  data.tar.gz: b6155ad0e62f21a689b7d753594330ad3f218ac754ad2a37e4e399eade57fb4f4b02e66259baa7a24ef781a8f4e356946e9692bfeee128bb631c9a39d480b936
+  metadata.gz: ec1224f6096621b8c7ebe7b1070af8b2524ffc389177a85f96e01ffcc056a1f5ab8ca2813ebb33ef6e4d7dbfe8036acde4a58d09b7e4956d482540e34a520910
+  data.tar.gz: 46c4aaf1c8c5ee079c79aebb950923bb2d4b8f4933e53697941404180b5690f487580a4ce179c7e77f9fce96bf9f43e641396cc315f949d949318fda2833b4e6

data/Gemfile

@@ -3,8 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
 
-gem "i18n", "~> 1.8.9"
-
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem "codecov", "0.2.12"
@@ -15,4 +13,6 @@ gem "rails"
 gem "sentry-ruby", path: "../sentry-ruby"
 gem "sentry-rails", path: "../sentry-rails"
 
+gem "object_tracer"
+gem "debug", github: "ruby/debug" if RUBY_VERSION.to_f >= 2.6
 gem "pry"

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.0"
+    VERSION = "4.6.1"
   end
 end

data/sentry-sidekiq.gemspec

@@ -22,5 +22,5 @@ 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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby-core
@@ -16,14 +16,14 @@ 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
 description: A gem that provides Sidekiq integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -32,7 +32,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
-- ".craft.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md

data/.craft.yml

@@ -1,19 +0,0 @@
-minVersion: '0.13.2'
-github:
-    owner: getsentry
-    repo: sentry-ruby
-changelogPolicy: simple
-preReleaseCommand: ruby ../.scripts/bump-version.rb
-releaseBranchPrefix: release-sentry-sidekiq
-statusProvider:
-  name: github
-artifactProvider:
-  name: github
-targets:
-    - name: gem
-    - name: registry
-      type: sdk
-      config:
-          canonical: 'gem:sentry-sidekiq'
-    - name: github
-      tagPrefix: sentry-sidekiq-v