sentry-sidekiq 4.7.3 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ced2289bc2cc163f72721b7c7f36641e5284385dd996957a2101e56dce70c5f
-  data.tar.gz: ac1c947bd189f9ca85120adbab8cbb4b945fd979b24df937e92c42c61642ea71
+  metadata.gz: 43d75b2c6fd2c97b930568e38d5245b51b800cd5882260efdd912a924506ac60
+  data.tar.gz: 48219eae6a251ad30c1f3feb945b5032205967dbeb224389097dd4e00e2ea5ed
 SHA512:
-  metadata.gz: 118f5555127aa222588791c9b0e4856abaf5679a37768de42dc4bb08b21db37f01e6e6ceb2cfbf67a797b3036debd789234c943a8347144177df952b0e07ee96
-  data.tar.gz: 3a8025305833b9e2bd216344fe2a57a0765702ea4d27111429c5edc75df1404a842a32518b5d286e59ed897f7c576c87206557e54930646018c1a76598870429
+  metadata.gz: 8962bfdf04a1dc793acaf342fb1d8224e568a7e4c61832fe657c086135a12722608f06ed955fc0e4a1fb045b0af23cd1aa8f0a753f772895c6be974b5aa052b2
+  data.tar.gz: c829d3da7ad3d1420a30904822588d98046f467f1cffde520160818960c52c0a6ba8b73863fd12347ce8f92ca7d0d91bf600f027041c7af4986efd56075bef02

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/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.3"
+    VERSION = "4.8.3"
   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.3"
   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.3
+  version: 4.8.3
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2022-01-05 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.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.3
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement