sentry-sidekiq 4.7.2 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf23944483ee1cd2326aa006a9e571a55bcc4ae6236933b522f43b60d5133ee
-  data.tar.gz: bf74d3c1c26831a66cf0c6a19dd74c52e03579ba5c3140c0cd89bdeb9259f9e8
+  metadata.gz: ead1e13e14c95b619cf9edf29e806d918a5ba13decfbd20f8c0ead049ebb2ece
+  data.tar.gz: ae9e66ef64845049655181cb73eb8d4bd8ce333454b8ebce829dc56bdf3c2dbd
 SHA512:
-  metadata.gz: a405d079263c93631e7f1ba7b2929eaf553033e599364bbb798d0be735525e6a13f6b0f5c80e11fd7eb69ce723b0972d1ae93f36ff97b402287e8aeef1567a37
-  data.tar.gz: 73837bd36ca00e0acb667a9582e5a750b03ab377e00b4abfb769e56bee6da16469ac751e951f2e88e408e0bd5e94fa8115c956c080e4240f106b9be814b5d180
+  metadata.gz: d4af9ee4ee83a06a906a49e73dc72c551f697f4ba9d7231a3f0520439313fc821f755ebc17d122e7471f2adc253df5370823ac55911a9c846a861876affefb60
+  data.tar.gz: c3d3e959203d98c3ce28958bff10c338f913e9f2db29e4f705e1e7aae484c00d012f25cdbf638964dacbb5a010d309ef24101045bb2eedeaf0cad9004d39d9a2

data/Gemfile

@@ -5,7 +5,9 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "codecov", "0.2.12"
+gem 'simplecov'
+gem "simplecov-cobertura", "~> 1.4"
+gem "rexml"
 
 sidekiq_version = ENV["SIDEKIQ_VERSION"]
 sidekiq_version = "6.0" if sidekiq_version.nil?
@@ -17,6 +19,6 @@ 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 "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
 gem "pry"
 

data/Makefile

@@ -3,5 +3,5 @@ build:
 	gem build sentry-sidekiq.gemspec
 
 test:
-	bundle exec rspec
 	WITH_SENTRY_RAILS=1 bundle exec rspec spec/sentry/rails_spec.rb
+	bundle exec rspec

data/example/Gemfile

@@ -5,3 +5,4 @@ gem "sentry-sidekiq", path: "../"
 gem "sentry-ruby", path: "../../sentry-ruby"
 
 gem "pry"
+gem "debug", github: "ruby/debug"

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -14,14 +14,15 @@ module Sentry
           scope.set_user(user)
         end
         scope.set_tags(queue: queue, jid: job["jid"])
+        scope.set_tags(build_tags(job["tags"]))
         scope.set_contexts(sidekiq: job.merge("queue" => queue))
         scope.set_transaction_name(context_filter.transaction_name)
-        transaction = Sentry.start_transaction(name: scope.transaction_name, op: "sidekiq")
+        transaction = start_transaction(scope.transaction_name, job["sentry_trace"])
         scope.set_span(transaction) if transaction
 
         begin
           yield
-        rescue => e
+        rescue
           finish_transaction(transaction, 500)
           raise
         end
@@ -32,6 +33,16 @@ module Sentry
         scope.clear
       end
 
+      def build_tags(tags)
+        Array(tags).each_with_object({}) { |name, tags_hash| tags_hash[:"sidekiq.#{name}"] = true }
+      end
+
+      def start_transaction(transaction_name, sentry_trace)
+        options = { name: transaction_name, op: "sidekiq" }
+        transaction = Sentry::Transaction.from_sentry_trace(sentry_trace, **options) if sentry_trace
+        Sentry.start_transaction(transaction: transaction, **options)
+      end
+
       def finish_transaction(transaction, status)
         return unless transaction
 
@@ -45,7 +56,9 @@ module Sentry
         return yield unless Sentry.initialized?
 
         user = Sentry.get_current_scope.user
+        transaction = Sentry.get_current_scope.get_transaction
         job["sentry_user"] = user unless user.empty?
+        job["sentry_trace"] = transaction.to_sentry_trace if transaction
         yield
       end
     end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "4.7.2"
+    VERSION = "4.8.2"
   end
 end

data/sentry-sidekiq.gemspec

@@ -22,6 +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.7.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.8.2"
   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.7.2
+  version: 4.8.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-01-04 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.7.0
+        version: 4.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement