sentry-sidekiq 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3171c41f5f846d3f8c4f1ccb50636dead582c00abe5600cb552ba56e4c2b2e
-  data.tar.gz: 781f0ae3e22206cfd162ded78ac0199013890de73fadba2ccc360a023c5d9321
+  metadata.gz: ff51b83dcd4d0cd691df4746a86024011cac343c507f991f8a0754f4508ad7b1
+  data.tar.gz: 428d690bef6e4443bb6083755815d84e418045a6b4fb02c18bff98090e41a9da
 SHA512:
-  metadata.gz: 1b857c91e200172af2d28d69df3b8069a0e70f1146f20828483595ea423621ccc4e12b06d050727c32aaab07a90c2638a38a46f88301320385e2ae1d30c040c1
-  data.tar.gz: 8a028b2c535d7b8a0e3740be347aeb443bfd05fa7b2db0594858c3d97019837b4612b7ad364c4098f89fe78599ca73daa60389fd9f7eb2011b26129db5e5b891
+  metadata.gz: 3f8b200f64055deaa7b7e0dff153880c3fe85c4370c546fb62de0959ae997ed6359a1bedb32f03ef7e434f1aa86185c077378b5d02b371629b7c2a6b1bbe3e8a
+  data.tar.gz: 10111d2baf8df65d4771e5d33542685bb803e37eda44cbc94f4ae375783b2614b9da1dc969509ae5a452b3612f3c4cb72ee4857a6c4d6513606ee7931c2f8474

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/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 getsentry
+Copyright (c) 2020 Sentry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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/error_handler.rb

@@ -13,7 +13,7 @@ module Sentry
 
         retry_option = context.dig(:job, "retry")
 
-        if Sentry.configuration.sidekiq.report_after_job_retries && retry_option.is_a?(Integer)
+        if Sentry.configuration.sidekiq.report_after_job_retries && retry_option.is_a?(Integer) && retry_option.positive?
           retry_count = context.dig(:job, "retry_count")
           if retry_count.nil? || retry_count < retry_option - 1
             return

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