sentry-sidekiq 4.7.1 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e879f07a1d8fd71a766314d25e51c819c188c619ad6df259104f38e92414e1fb
-  data.tar.gz: 2e0b06a8a89414c6d1b8183427ee4c107b8cb6cb068b9582b773667752d3d20b
+  metadata.gz: 949887e093455257abbf40b7ff7d8adbb3b28a149bc99a9668be4998089fca0c
+  data.tar.gz: c98f7768b82b010bfe34dc78b2920503e2599c1183efea781773d2be44dfa9af
 SHA512:
-  metadata.gz: 223c44c83ca6c0bd9153512ef7f275517d5bc6e863cba9bfa5e51154be0517c19d2563f1b34f089b188506c1ce94d0899ec0e19dee1191642c80dc0823a072e4
-  data.tar.gz: 338ce1a0fba4c419161b9c8a44907e76df51a40a49c466e61420d6846a485fcb1001520fdea59c5965930d63bfebfd8902eb3d4774fa960c1dc413b95795a5ca
+  metadata.gz: fcfcf7c10ff0ca683834944b711bcf4a57492209b32aca63505db44be6fabcd9ed3e9c1671b8fc3c993a385671c5d88d732b7498140b022d45b9e0466e487780
+  data.tar.gz: 3c6594dba69cfb982254f40442ff6817a57e35c5359e7c330c6717a7855995d463b82f11ab191346575f6054e6b65fce69f12d2a1bcbb5ae3962f448aa939c09

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