sentry-sidekiq 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06ff7807f2ed20afd1ddbb25fdefca1d4fa031ed3e7f5a00b0e1070be3b33a46
-  data.tar.gz: 5653d9635ed8c25f8adf20e7913c12953b4ba8acaf515020cc5859804053abac
+  metadata.gz: 383b3c28fc5583dadfc497ae0c3b0dc052e7909f8e71e8d8eca728f68b060aea
+  data.tar.gz: b867a8389fbd6e44b06a7256c6dafdc68f04acf2fe4dc2e99c84f647c010e614
 SHA512:
-  metadata.gz: ff3cc9abe9105fbfd68b843cc6146d7612e31b96c71bcfcaba346ff0399d3c8e55de2b6e8532a3fb47a7fa41cd4605a83e1b1123678bee8cd3fe0477e20b36bf
-  data.tar.gz: 900d1648fff07895107620ae91e58ee006de41fc2735a16e8f56e5d5d579f68977c729f84614955f2334ab1a9bb973e65aee7c97fc11f08c36d44989d5033c72
+  metadata.gz: 71cd8d00dc973f0521b387ea75b2d2aa52da2078b5bbb7cd1b14533f0db944b1f387dd02a6ed0272ea7958c2fe18981c5350b24121e68e846851ae1c8b3e21d0
+  data.tar.gz: c1c3c647df576a8ed592d90a104dd171fe99c4b6cd775ee7364b9f9cbc84489b2614d20d085abf0c7ca1b5c3e71f3f2b50e0bdaf854321fa9b192fb153127b81

data/.rspec

@@ -1,3 +1,2 @@
 --format documentation
 --color
---require spec_helper

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 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
+
+- Tag queue name and jid on sidekiq events [#1258](https://github.com/getsentry/sentry-ruby/pull/1258)
+<img width="1234" alt="sidekiq event tagged with queue name and jid" src="https://user-images.githubusercontent.com/5079556/106389900-d0381700-6420-11eb-90b9-a95b0881b696.png">
+
+### Refactorings
+
+- Add sidekiq adapter to sentry-rails' ignored adapters list [#1257](https://github.com/getsentry/sentry-ruby/pull/1257)
+
+## 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)

data/Gemfile

@@ -3,13 +3,17 @@ 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 "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "codecov"
+gem "codecov", "0.2.12"
 
 gem "sidekiq"
-gem "activejob"
+gem "rails"
 
 gem "sentry-ruby", path: "../sentry-ruby"
+gem "sentry-rails", path: "../sentry-rails"
 
 gem "pry"

data/Makefile

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

data/lib/sentry-sidekiq.rb

@@ -1,24 +1,32 @@
 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/configuration"
+require "sentry/sidekiq/sentry_context_middleware"
 
 module Sentry
   module Sidekiq
-    META = { "name" => "sentry.ruby.sidekiq", "version" => Sentry::Sidekiq::VERSION }.freeze
-  end
+    extend Sentry::Integrable
+
+    register_integration name: "sidekiq", version: Sentry::Sidekiq::VERSION
+
+    if defined?(::Rails::Railtie)
+      class Railtie < ::Rails::Railtie
+        config.after_initialize do
+          next unless Sentry.initialized?
 
-  def self.sdk_meta
-    Sentry::Sidekiq::META
+          Sentry.configuration.rails.skippable_job_adapters << "ActiveJob::QueueAdapters::SidekiqAdapter"
+        end
+      end
+    end
   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/context_filter.rb

@@ -2,8 +2,12 @@ module Sentry
   module Sidekiq
     class ContextFilter
       ACTIVEJOB_RESERVED_PREFIX_REGEX = /^_aj_/.freeze
+      SIDEKIQ_NAME = "Sidekiq".freeze
 
-      def initialize
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
         @has_global_id = defined?(GlobalID)
       end
 
@@ -13,23 +17,41 @@ module Sentry
       # The problem is, if this job in turn gets queued back into ActiveJob with
       # 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 filter_context(context)
-        case context
+      def filtered
+        filter_context(context)
+      end
+
+      def transaction_name
+        class_name = (context["wrapped"] || context["class"] ||
+                      (context[:job] && (context[:job]["wrapped"] || context[:job]["class"]))
+                    )
+
+        if class_name
+          "#{SIDEKIQ_NAME}/#{class_name}"
+        elsif context[:event]
+          "#{SIDEKIQ_NAME}/#{context[:event]}"
+        else
+          SIDEKIQ_NAME
+        end
+      end
+
+      private
+
+      def filter_context(hash)
+        case hash
         when Array
-          context.map { |arg| filter_context(arg) }
+          hash.map { |arg| filter_context(arg) }
         when Hash
-          Hash[context.map { |key, value| filter_context_hash(key, value) }]
+          Hash[hash.map { |key, value| filter_context_hash(key, value) }]
         else
-          if has_global_id? && context.is_a?(GlobalID)
-            context.to_s
+          if has_global_id? && hash.is_a?(GlobalID)
+            hash.to_s
           else
-            context
+            hash
           end
         end
       end
 
-      private
-
       def filter_context_hash(key, value)
         key = key.to_s.sub(ACTIVEJOB_RESERVED_PREFIX_REGEX, "") if key.match(ACTIVEJOB_RESERVED_PREFIX_REGEX)
         [key, filter_context(value)]

data/lib/sentry/sidekiq/error_handler.rb

@@ -3,37 +3,19 @@ require 'sentry/sidekiq/context_filter'
 module Sentry
   module Sidekiq
     class ErrorHandler
-      SIDEKIQ_NAME = "Sidekiq".freeze
-
       def call(ex, context)
         return unless Sentry.initialized?
-        context = Sentry::Sidekiq::ContextFilter.new.filter_context(context)
 
-        Sentry.with_scope do |scope|
-          scope.set_transaction_name transaction_from_context(context)
-          Sentry.capture_exception(
-            ex,
-            extra: { sidekiq: context },
-            hint: { background: false }
-          )
-        end
-      end
+        context_filter = Sentry::Sidekiq::ContextFilter.new(context)
 
-      private
+        scope = Sentry.get_current_scope
+        scope.set_transaction_name(context_filter.transaction_name) unless scope.transaction_name
 
-      # this will change in the future:
-      # https://github.com/mperham/sidekiq/pull/3161
-      def transaction_from_context(context)
-        classname = (context["wrapped"] || context["class"] ||
-                      (context[:job] && (context[:job]["wrapped"] || context[:job]["class"]))
-                    )
-        if classname
-          "#{SIDEKIQ_NAME}/#{classname}"
-        elsif context[:event]
-          "#{SIDEKIQ_NAME}/#{context[:event]}"
-        else
-          SIDEKIQ_NAME
-        end
+        Sentry::Sidekiq.capture_exception(
+          ex,
+          extra: { sidekiq: context_filter.filtered },
+          hint: { background: false }
+        )
       end
     end
   end

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -0,0 +1,25 @@
+require 'sentry/sidekiq/context_filter'
+
+module Sentry
+  module Sidekiq
+    class SentryContextMiddleware
+      def call(_worker, job, queue)
+        return yield unless Sentry.initialized?
+
+        context_filter = Sentry::Sidekiq::ContextFilter.new(job)
+
+        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_transaction_name(context_filter.transaction_name)
+
+        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 = "4.1.0"
+    VERSION = "4.2.1"
   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", ">= 4.1.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.2.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-02-18 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: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 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
@@ -49,9 +49,9 @@ files:
 - example/config/sidekiq.yml
 - example/error_worker.rb
 - lib/sentry-sidekiq.rb
-- 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 +60,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

data/lib/sentry/sidekiq/cleanup_middleware.rb

@@ -1,21 +0,0 @@
-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))
-          scope.set_transaction_name("Sidekiq/#{job["class"]}")
-
-          begin
-            yield
-          rescue => ex
-            Sentry.capture_exception(ex, hint: { background: false })
-          end
-        end
-      end
-    end
-  end
-end