sentry-rails 4.3.0 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1aafc591c356c77484bf061be1d4f8968588270e083d6ee94ada2f80054282
-  data.tar.gz: 74e40b15bdc17962037fd2b78b6695de5a405335a186f373c644dcb61b75aab6
+  metadata.gz: 48f0349352e2f19b3be18c7ea0e5b7a600ad72d01ed1d2ce4052e55b7df471c3
+  data.tar.gz: 7f2c6d5f3e2f2ec40cd797e81856951beced5fde6897cc993dfa8c2046ba7800
 SHA512:
-  metadata.gz: 279ad65af3f35928746b8365bc494bf0384fde465414c1211cb565289bb7cbf1157c0649da6c835e4bbb79b928005eebba2805f387a52a57170bba876279b0fb
-  data.tar.gz: 6bf36d990e2c7f3ab51d8e5bb6bd2ec6873d924f2baa72796145502b2b4f04eea055c8c22a06a6bb8f0cbe92b2c92b15a7e29262f21252fce98be579f7e3fc38
+  metadata.gz: 0eef4c4a1a50168a669fdf786f78842ca45c6c0d04e1ec1b9f783ad86f0a70bf94a40b6207ab8334a6cfaec953bdbdbe7dc8f04c3301dbf62a02656ebb0e24b8
+  data.tar.gz: c5d28ee621ed6ad90a520a6e5c8fce8047a38907a493c706c5bb9f77304884b70e0564ddc90689214a0e919e6a8f6ea5d3ecbfea44de3c32bf934a74dd9459ec

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 4.3.4
+
+- Don't assign Rails.logger if it's not present [#1387](https://github.com/getsentry/sentry-ruby/pull/1387)
+  - Fixes [#1386](https://github.com/getsentry/sentry-ruby/issues/1386)
+
+## 4.3.3
+
+- Correctly set the SDK's logger in sentry-rails [#1363](https://github.com/getsentry/sentry-ruby/pull/1363)
+  - Fixes [#1361](https://github.com/getsentry/sentry-ruby/issues/1361)
+
+## 4.3.3-beta.0
+
+- Minimize sentry-rails' dependency requirement [#1352](https://github.com/getsentry/sentry-ruby/pull/1352)
+
+## 4.3.2
+
+- Avoid recording SendEventJob's transaction [#1351](https://github.com/getsentry/sentry-ruby/pull/1351)
+  - Fixes [#1348](https://github.com/getsentry/sentry-ruby/issues/1348)
+
+## 4.3.1
+
+- Only apply background worker patch if ActiveRecord is loaded [#1350](https://github.com/getsentry/sentry-ruby/pull/1350)
+  - Fixes [#1342](https://github.com/getsentry/sentry-ruby/issues/1342) and [#1346](https://github.com/getsentry/sentry-ruby/issues/1346)
+
 ## 4.3.0
 
 ### Features

data/Gemfile

@@ -17,11 +17,13 @@ end
 
 gem "rails", "~> #{rails_version}"
 gem "sprockets-rails"
+
+gem "rspec", "~> 3.0"
+gem "rspec-retry"
 gem "rspec-rails", "~> 4.0"
 gem "codecov", "0.2.12"
 
 gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
 
 # TODO: Remove this if https://github.com/jruby/jruby/issues/6547 is addressed
 gem "i18n", "<= 1.8.7"

data/app/jobs/sentry/send_event_job.rb

@@ -22,6 +22,11 @@ if defined?(ActiveJob)
       end
 
       def perform(event, hint = {})
+        # users don't need the tracing result of this job
+        if transaction = Sentry.get_current_scope.span
+          transaction.instance_variable_set(:@sampled, false)
+        end
+
         Sentry.send_event(event, hint)
       end
     end

data/lib/sentry/rails.rb

@@ -1,6 +1,6 @@
+require "rails"
 require "sentry-ruby"
 require "sentry/integrable"
-require "sentry/rails/background_worker"
 require "sentry/rails/configuration"
 require "sentry/rails/engine"
 require "sentry/rails/railtie"

data/lib/sentry/rails/background_worker.rb

@@ -1,7 +1,5 @@
 module Sentry
   class BackgroundWorker
-    alias_method :original_perform, :perform
-
     def perform(&block)
       @executor.post do
         # make sure the background worker returns AR connection if it accidentally acquire one during serialization

data/lib/sentry/rails/configuration.rb

@@ -5,6 +5,17 @@ module Sentry
     add_post_initialization_callback do
       @rails = Sentry::Rails::Configuration.new
       @excluded_exceptions = @excluded_exceptions.concat(Sentry::Rails::IGNORE_DEFAULT)
+
+      if ::Rails.logger
+        @logger = ::Rails.logger
+      else
+        @logger.warn(Sentry::LOGGER_PROGNAME) do
+          <<~MSG
+          sentry-rails can't detect Rails.logger. it may be caused by misplacement of the SDK initialization code
+          please make sure you place the Sentry.init block under the `config/initializers` folder, e.g. `config/initializers/sentry.rb`
+          MSG
+        end
+      end
     end
   end
 

data/lib/sentry/rails/railtie.rb

@@ -1,11 +1,6 @@
-require "rails"
 require "sentry/rails/capture_exceptions"
 require "sentry/rails/rescued_exception_interceptor"
 require "sentry/rails/backtrace_cleaner"
-require "sentry/rails/controller_methods"
-require "sentry/rails/controller_transaction"
-require "sentry/rails/overrides/streaming_reporter"
-require "sentry/rails/overrides/file_handler"
 
 module Sentry
   class Railtie < ::Rails::Railtie
@@ -21,12 +16,12 @@ module Sentry
       next unless Sentry.initialized?
 
       configure_project_root
-      configure_sentry_logger
       configure_trusted_proxies
-      extend_controller_methods
+      extend_controller_methods if defined?(ActionController)
       extend_active_job if defined?(ActiveJob)
-      override_streaming_reporter
-      override_file_handler if app.config.public_file_server.enabled
+      patch_background_worker if defined?(ActiveRecord)
+      override_streaming_reporter if defined?(ActionView)
+      override_file_handler if defined?(ActionDispatch) && app.config.public_file_server.enabled
       setup_backtrace_cleanup_callback
       inject_breadcrumbs_logger
       activate_tracing
@@ -36,10 +31,6 @@ module Sentry
       Sentry.configuration.project_root = ::Rails.root.to_s
     end
 
-    def configure_sentry_logger
-      Sentry.configuration.logger = ::Rails.logger
-    end
-
     def configure_trusted_proxies
       Sentry.configuration.trusted_proxies += Array(::Rails.application.config.action_dispatch.trusted_proxies)
     end
@@ -50,6 +41,10 @@ module Sentry
     end
 
     def extend_controller_methods
+      require "sentry/rails/controller_methods"
+      require "sentry/rails/controller_transaction"
+      require "sentry/rails/overrides/streaming_reporter"
+
       ActiveSupport.on_load :action_controller do
         include Sentry::Rails::ControllerMethods
         include Sentry::Rails::ControllerTransaction
@@ -57,6 +52,10 @@ module Sentry
       end
     end
 
+    def patch_background_worker
+      require "sentry/rails/background_worker"
+    end
+
     def inject_breadcrumbs_logger
       if Sentry.configuration.breadcrumbs_logger.include?(:active_support_logger)
         require 'sentry/rails/breadcrumb/active_support_logger'
@@ -73,12 +72,16 @@ module Sentry
     end
 
     def override_streaming_reporter
+      require "sentry/rails/overrides/streaming_reporter"
+
       ActiveSupport.on_load :action_view do
         ActionView::StreamingTemplateRenderer::Body.send(:prepend, Sentry::Rails::Overrides::StreamingReporter)
       end
     end
 
     def override_file_handler
+      require "sentry/rails/overrides/file_handler"
+
       ActiveSupport.on_load :action_controller do
         ActionDispatch::FileHandler.send(:prepend, Sentry::Rails::Overrides::FileHandler)
       end

data/lib/sentry/rails/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Rails
-    VERSION = "4.3.0"
+    VERSION = "4.3.4"
   end
 end

data/sentry-rails.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 "rails", ">= 5.0"
+  spec.add_dependency "railties", ">= 5.0"
   spec.add_dependency "sentry-ruby-core", "~> 4.3.0"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.4
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A gem that provides Rails integration for the Sentry error logger