sentry-sidekiq 4.2.0 → 4.5.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e64171c6948ecde7494476fe2eeba1337b4c1c18d14a91400e832056e708580
-  data.tar.gz: e9987c3bbcd421ff6ec99e87aeaaec2e3fdfd8caa0ef5225aac07307f7f8734f
+  metadata.gz: eb6ad9f9e241ec6313a836b810e17ec5aec5c87dc32768a5fc69b436c9c5b50f
+  data.tar.gz: de8f1dc9d096cd5859c93cc16bb749ee202baf240d90ab624559eb3d09fd3366
 SHA512:
-  metadata.gz: 0fc42090e8c82189caf48365f0a160f2cd7cacf38b2b340502c643880ff1b83671f51e89de96f8de4f2a5545ae7aace914653c7000be8eaf00c646da64dc8532
-  data.tar.gz: fdf44b2862507f127e9326fb76470cb122c085353b4009fec3a0e6dc844d3fc4a8edd31956ca6e4b6d249eea6f3bb23e591756c83de75fc64bbc4ecc51f06a39
+  metadata.gz: b4973c196fecccb3ffd1107080d2d5a2dd0061ab1729afb32c8cdaa25e0bda8eee45ade3aebee5d29837ca13c27d5e3685fa37505f6129b709c983379c47ad52
+  data.tar.gz: 5e98a18c9b7b11579fdff82a70de052dd55e25bf8ac9f0d18405abb407bf98ce2b06b8a54045ebe6d7c470e86bb8e4a2392d7df11dffc8d068d31ccbfed007ac

data/.craft.yml

@@ -11,9 +11,9 @@ artifactProvider:
   name: github
 targets:
     - name: gem
-    - name: github
-      tagPrefix: sentry-sidekiq-v
     - name: registry
       type: sdk
       config:
           canonical: 'gem:sentry-sidekiq'
+    - name: github
+      tagPrefix: sentry-sidekiq-v

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 4.4.0
+
+### Features
+
+- Make Sidekiq job context more readable [#1410](https://github.com/getsentry/sentry-ruby/pull/1410) 
+
+**Before**
+
+<img width="60%" alt="Sidekiq payload in extra" src="https://user-images.githubusercontent.com/5079556/115679342-0ed8d000-a385-11eb-8e1c-372cb1af572e.png">
+
+**After**
+
+<img width="60%" alt="Sidekiq payload in context" src="https://user-images.githubusercontent.com/5079556/115679353-126c5700-a385-11eb-867c-a9a25d1a7099.png">
+
+## 4.3.0
+
+### Features
+
+- Support performance monitoring on Sidekiq workers [#1311](https://github.com/getsentry/sentry-ruby/pull/1311)
+
+## 4.2.1
+
+- Use ::Rails::Railtie for checking Rails definition [#1284](https://github.com/getsentry/sentry-ruby/pull/1284)
+  - Fixes [#1276](https://github.com/getsentry/sentry-ruby/issues/1276)
+
 ## 4.2.0
 
 ### Features

data/Gemfile

@@ -3,8 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
 
-# TODO: Remove this if https://github.com/jruby/jruby/issues/6547 is addressed
-gem "i18n", "<= 1.8.7"
+gem "i18n", "~> 1.8.9"
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"

data/Makefile

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

data/example/error_worker.rb

@@ -10,6 +10,8 @@ end
 class ErrorWorker
   include Sidekiq::Worker
 
+  sidekiq_options retry: 0
+
   def perform
     1 / 0
   end

data/lib/sentry-sidekiq.rb

@@ -11,7 +11,7 @@ module Sentry
 
     register_integration name: "sidekiq", version: Sentry::Sidekiq::VERSION
 
-    if defined?(::Rails)
+    if defined?(::Rails::Railtie)
       class Railtie < ::Rails::Railtie
         config.after_initialize do
           next unless Sentry.initialized?

data/lib/sentry/sidekiq/context_filter.rb

@@ -18,7 +18,15 @@ module Sentry
       # these magic reserved keys, ActiveJob will throw up and error. We want to
       # capture these and mutate the keys so we can sanely report it.
       def filtered
-        filter_context(context)
+        filtered_context = filter_context(context)
+
+        if job_entry = filtered_context.delete(:job)
+          job_entry.each do |k, v|
+            filtered_context[k] = v
+          end
+        end
+
+        filtered_context
       end
 
       def transaction_name

data/lib/sentry/sidekiq/error_handler.rb

@@ -13,7 +13,7 @@ module Sentry
 
         Sentry::Sidekiq.capture_exception(
           ex,
-          extra: { sidekiq: context_filter.filtered },
+          contexts: { sidekiq: context_filter.filtered },
           hint: { background: false }
         )
       end

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -11,15 +11,30 @@ module Sentry
         Sentry.clone_hub_to_current_thread
         scope = Sentry.get_current_scope
         scope.set_tags(queue: queue, jid: job["jid"])
-        scope.set_extras(sidekiq: job.merge("queue" => queue))
+        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")
+        scope.set_span(transaction) if transaction
 
-        yield
+        begin
+          yield
+        rescue => e
+          finish_transaction(transaction, 500)
+          raise
+        end
 
+        finish_transaction(transaction, 200)
         # don't need to use ensure here
         # if the job failed, we need to keep the scope for error handler. and the scope will be cleared there
         scope.clear
       end
+
+      def finish_transaction(transaction, status)
+        return unless transaction
+
+        transaction.set_http_status(status)
+        transaction.finish
+      end
     end
   end
 end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "4.2.0"
+    VERSION = "4.5.0-beta.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.2.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.5.0-beta.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.5.0.pre.beta.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-05-27 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.2.0
+        version: 4.5.0.pre.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.5.0.pre.beta.1
 description: A gem that provides Sidekiq integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -72,11 +72,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A gem that provides Sidekiq integration for the Sentry error logger