sentry-sidekiq 4.3.0 → 4.4.0.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a2fdb9ebaf4e197fba06d2cae41179a91de332d5a6e4e65d27fa9173aa7a62
-  data.tar.gz: f13820fdaa0c2bc33e03a9301de7dd3f183ea199746842e626bbf9de4d948718
+  metadata.gz: 348d53b89424320f50c7c210ef6aecfd855c44dbd2b1a484c21ae26a129b70fb
+  data.tar.gz: b74912cbe7930b8abbc3e97c317b1b6da3414e6f6360b9256e10dd3daec1aecb
 SHA512:
-  metadata.gz: 502d5c38a8652c16e099022d19eaaa6bd312e742996bd6039a34c30953b1b498938b9927a15d42a07f11478595566dd39f96b09bf06fc39c68bfa8271caade28
-  data.tar.gz: f72b90e8bb33e1edb00a805e1628057012756da73697c6148331e5668b16772b6000d45f35057ade6b4fcd9f759c10f619278da8f06c9463eee7ebe30911a0ee
+  metadata.gz: 16bbc9522af7aed6b6f1f78764a62923b4153623930a012efd5432708ab42e00e1bb0b3bd6a835ebcca00dcf428fca7c0f69b9dffc64c0d01a6f28640622f3a2
+  data.tar.gz: 6799170ef2967c6ed7a2d1c4ada6d438f9d7858cea8e96fe0ebf01ce5307a8970c0a213c83a909da229a01817be25c0ccade5876b07b9a8560d87f29df7ed038

data/.craft.yml

@@ -11,9 +11,10 @@ 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
+      changelog: sentry-sidekiq/CHANGELOG.md

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 4.4.0-beta.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

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/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/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,7 +11,7 @@ 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

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "4.3.0"
+    VERSION = "4.4.0-beta.0"
   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.3.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.4.0.pre.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0.pre.beta.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-04-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.3.0
+        version: 4.4.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.0.pre.beta
 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.0.3.1
 signing_key: 
 specification_version: 4
 summary: A gem that provides Sidekiq integration for the Sentry error logger