sentry-sidekiq 0.2.0 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d22287b7a4c79dcf5feefe8c5cb99fa9c2df29969b84dab1633084621ae1b60
-  data.tar.gz: 54c9713d04731667756ece9ec36390841beac16b69d9ed897263756407a21d56
+  metadata.gz: a5ba9a7bc48974dbb919d2859fc58f2db605e1cffcddaa3058a7e0d8ee924832
+  data.tar.gz: fd590a815c902b52205fc2121b3e093439f9681fe66900809c2440f95af1594f
 SHA512:
-  metadata.gz: 67e3ac109162c9e4244d81cb91068a2e59908d4666d12f6d2dec310390551cf1d6112e3bf2d3697681f70b38dcaf05acdb3277f83bfa6d0aff5a1263c985c658
-  data.tar.gz: f14f69f0b14651ad7d1e17f41b5c83e51b6cec888ab821b41c250d6721a208277b4804f602ba730265ca74d23527e5de566e3efa1a474a3a79670d51b2f602c4
+  metadata.gz: 02b0bbab55d0a6fd6d01cc51bc51999e7ba5b81e13da199ebef25ebdec96bf9ed7a417936d9e26263db17dea462d9fa6b4fbcacc5035a6d34e8f9f8dd00828b8
+  data.tar.gz: 8e8aa01a87c52d657b38a674a9e892ce8d474b89c164ea27c67ed4ce9baba9bcfeb450efb465347792a5acaf881834cd7711f56db8fcc93823c98ea0f4946823

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 4.1.3
+
+- Use sentry-ruby-core as the main SDK dependency [#1245](https://github.com/getsentry/sentry-ruby/pull/1245)
+
+## 4.1.2
+
+- Fix sidekiq middleware [#1175](https://github.com/getsentry/sentry-ruby/pull/1175)
+  - Fixes [#1173](https://github.com/getsentry/sentry-ruby/issues/1173)
+- Adopt Integrable module [#1177](https://github.com/getsentry/sentry-ruby/pull/1177)
+
+## 4.1.1
+
+- Use stricter dependency declaration [#1159](https://github.com/getsentry/sentry-ruby/pull/1159)
+
+## 4.1.0
+
+- Check SDK initialization before running integrations [#1151](https://github.com/getsentry/sentry-ruby/pull/1151)
+  - Fixes [#1145](https://github.com/getsentry/sentry-ruby/pull/1145)
+
+## 4.0.0
+
+- Only documents update for the official release and no API/feature changes.
+
 ## 0.2.0
 
 - Major API changes: [1123](https://github.com/getsentry/sentry-ruby/pull/1123)

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "codecov"
+gem "codecov", "0.2.12"
 
 gem "sidekiq"
 gem "activejob"

data/Makefile

@@ -0,0 +1,3 @@
+build:
+	bundle install
+	gem build sentry-sidekiq.gemspec

data/README.md

@@ -17,7 +17,7 @@
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=sentry-sidekiq&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=sentry-sidekiq&package-manager=bundler&version-scheme=semver)
 
 
-[Documentation](https://docs.sentry.io/clients/ruby/) | [Bug Tracker](https://github.com/getsentry/sentry-ruby/issues) | [Forum](https://forum.sentry.io/) | IRC: irc.freenode.net, #sentry
+[Documentation](https://docs.sentry.io/platforms/ruby/guides/sidekiq/) | [Bug Tracker](https://github.com/getsentry/sentry-ruby/issues) | [Forum](https://forum.sentry.io/) | IRC: irc.freenode.net, #sentry
 
 The official Ruby-language client and integration layer for the [Sentry](https://github.com/getsentry/sentry) error reporting API.
 
@@ -27,6 +27,7 @@ The official Ruby-language client and integration layer for the [Sentry](https:/
 ### Install
 
 ```ruby
+gem "sentry-ruby"
 gem "sentry-sidekiq"
 ```
 

data/lib/sentry-sidekiq.rb

@@ -1,24 +1,23 @@
 require "sidekiq"
 require "sentry-ruby"
+require "sentry/integrable"
 require "sentry/sidekiq/version"
 require "sentry/sidekiq/error_handler"
-require "sentry/sidekiq/cleanup_middleware"
+require "sentry/sidekiq/sentry_context_middleware"
 # require "sentry/sidekiq/configuration"
 
 module Sentry
   module Sidekiq
-    META = { "name" => "sentry.ruby.sidekiq", "version" => Sentry::Sidekiq::VERSION }.freeze
-  end
+    extend Sentry::Integrable
 
-  def self.sdk_meta
-    Sentry::Sidekiq::META
+    register_integration name: "sidekiq", version: Sentry::Sidekiq::VERSION
   end
 end
 
 Sidekiq.configure_server do |config|
   config.error_handlers << Sentry::Sidekiq::ErrorHandler.new
   config.server_middleware do |chain|
-    chain.add Sentry::Sidekiq::CleanupMiddleware
+    chain.add Sentry::Sidekiq::SentryContextMiddleware
   end
 end
 

data/lib/sentry/sidekiq/cleanup_middleware.rb

@@ -2,6 +2,8 @@ module Sentry
   module Sidekiq
     class CleanupMiddleware
       def call(_worker, job, queue)
+        return yield unless Sentry.initialized?
+
         Sentry.clone_hub_to_current_thread
         Sentry.with_scope do |scope|
           scope.set_extras(sidekiq: job.merge("queue" => queue))
@@ -10,7 +12,7 @@ module Sentry
           begin
             yield
           rescue => ex
-            Sentry.capture_exception(ex)
+            Sentry::Sidekiq.capture_exception(ex, hint: { background: false })
           end
         end
       end

data/lib/sentry/sidekiq/error_handler.rb

@@ -6,15 +6,16 @@ module Sentry
       SIDEKIQ_NAME = "Sidekiq".freeze
 
       def call(ex, context)
+        return unless Sentry.initialized?
         context = Sentry::Sidekiq::ContextFilter.new.filter_context(context)
+        scope = Sentry.get_current_scope
+        scope.set_transaction_name(transaction_from_context(context)) unless scope.transaction_name
 
-        Sentry.with_scope do |scope|
-          scope.set_transaction_name transaction_from_context(context)
-          Sentry.capture_exception(
-            ex,
-            extra: { sidekiq: context }
-          )
-        end
+        Sentry::Sidekiq.capture_exception(
+          ex,
+          extra: { sidekiq: context },
+          hint: { background: false }
+        )
       end
 
       private

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -0,0 +1,20 @@
+module Sentry
+  module Sidekiq
+    class SentryContextMiddleware
+      def call(_worker, job, queue)
+        return yield unless Sentry.initialized?
+
+        Sentry.clone_hub_to_current_thread
+        scope = Sentry.get_current_scope
+        scope.set_extras(sidekiq: job.merge("queue" => queue))
+        scope.set_transaction_name("Sidekiq/#{job["class"]}")
+
+        yield
+
+        # 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
+    end
+  end
+end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "0.2.0"
+    VERSION = "4.1.3"
   end
 end

data/sentry-sidekiq.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/sentry-sidekiq/CHANGELOG.md"
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby", ">= 0.3.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.1.2"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 4.1.3
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sentry-ruby
+  name: sentry-ruby-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 4.1.2
 description: A gem that provides Sidekiq integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -35,11 +35,11 @@ files:
 - ".craft.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/console
@@ -52,6 +52,7 @@ files:
 - lib/sentry/sidekiq/cleanup_middleware.rb
 - lib/sentry/sidekiq/context_filter.rb
 - lib/sentry/sidekiq/error_handler.rb
+- lib/sentry/sidekiq/sentry_context_middleware.rb
 - lib/sentry/sidekiq/version.rb
 - sentry-sidekiq.gemspec
 homepage: https://github.com/getsentry/sentry-ruby
@@ -60,7 +61,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/getsentry/sentry-ruby
   source_code_uri: https://github.com/getsentry/sentry-ruby
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/master/sentry-sidekiq/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.5
-before_install: gem install bundler -v 2.1.1