sentry-rails 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dacfb4f5f23d9d37bef25d05d7c7c6783e6c0e5578e706112ed5e69f9314a54
-  data.tar.gz: e78a4adf974cc0b9769e8b8bcf9dcf92a920548f5811ec7f4aeeb65d0ca73493
+  metadata.gz: 1e0dee67e1b51a9ca85ea36f5d740b94f1fc343c5fdc2b7dc04d3ae31a49559e
+  data.tar.gz: 332e269d839197cf59059a14c80ec59408b9d3d4fbac68b49fa3fb96f570f2ca
 SHA512:
-  metadata.gz: d79b9b8b316ac7af02a138b81bfa7a303c6f18e4a6edd5f75101b9d6e1ff93ec6ab5290ae163eca98b4dfba89631f9c0710b6405eb3c123bc3fbec94480ee297
-  data.tar.gz: 4fb8951a0bd157f59b0b969f8b3745873f93c1bb75d1d4824d959330e4c1565613b01c42b7ca92627e3a305c5dc085940b2ca7cc8ae735011dbe483e8e6f1237
+  metadata.gz: 4240894f140b915157eb8984c7c5c8d468212bb04162e35b7f1d162771bbe51e693dfacf3056c15f4d046a66f2f17c069d4fd948a1e0005731629f603cc56398
+  data.tar.gz: 670f13e2bd13862784fec3fc91fd6ed6c9c2291a9fa285b55bdaa113557919fdce60258d8c869dc679d152f033f63dad7c87456bca7ad09438d85418d0b2c21a

data/Gemfile

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
+gem "sentry-ruby", path: "../sentry-ruby"
 
 rails_version = ENV["RAILS_VERSION"]
 rails_version = "6.1.0" if rails_version.nil?
@@ -18,6 +19,8 @@ end
 gem "rails", "~> #{rails_version}"
 gem "sprockets-rails"
 
+gem "sidekiq"
+
 gem "rspec", "~> 3.0"
 gem "rspec-retry"
 gem "rspec-rails", "~> 4.0"
@@ -25,13 +28,8 @@ gem "codecov", "0.2.12"
 
 gem "rake", "~> 12.0"
 
-# TODO: Remove this if https://github.com/jruby/jruby/issues/6547 is addressed
-gem "i18n", "<= 1.8.7"
-
-gem "sidekiq"
-
-gem "sentry-ruby", path: "../sentry-ruby"
-
+gem "object_tracer"
+gem "debug", github: "ruby/debug" if RUBY_VERSION.to_f >= 2.6
 gem "pry"
 
 gem "benchmark-ips"

data/lib/sentry/rails/breadcrumb/active_support_logger.rb

@@ -1,9 +1,11 @@
+require "sentry/rails/instrument_payload_cleanup_helper"
+
 module Sentry
   module Rails
     module Breadcrumb
       module ActiveSupportLogger
         class << self
-          IGNORED_DATA_TYPES = [:request, :headers, :exception, :exception_object]
+          include InstrumentPayloadCleanupHelper
 
           def add(name, started, _finished, _unique_id, data)
             # skip Rails' internal events
@@ -23,12 +25,6 @@ module Sentry
             Sentry.add_breadcrumb(crumb)
           end
 
-          def cleanup_data(data)
-            IGNORED_DATA_TYPES.each do |key|
-              data.delete(key) if data.key?(key)
-            end
-          end
-
           def inject
             @subscriber = ::ActiveSupport::Notifications.subscribe(/.*/) do |name, started, finished, unique_id, data|
               # we only record events that has a started timestamp

data/lib/sentry/rails/instrument_payload_cleanup_helper.rb

@@ -0,0 +1,13 @@
+module Sentry
+  module Rails
+    module InstrumentPayloadCleanupHelper
+      IGNORED_DATA_TYPES = [:request, :response, :headers, :exception, :exception_object]
+
+      def cleanup_data(data)
+        IGNORED_DATA_TYPES.each do |key|
+          data.delete(key) if data.key?(key)
+        end
+      end
+    end
+  end
+end

data/lib/sentry/rails/railtie.rb

@@ -12,13 +12,19 @@ module Sentry
       app.config.middleware.use(Sentry::Rails::RescuedExceptionInterceptor)
     end
 
+    # because the extension works by registering the around_perform callcack, it should always be ran
+    # before the application is eager-loaded (before user's jobs register their own callbacks)
+    # See https://github.com/getsentry/sentry-ruby/issues/1249#issuecomment-853871871 for the detail explanation
+    initializer "sentry.extend_active_job", before: :eager_load! do |app|
+      extend_active_job if defined?(ActiveJob)
+    end
+
     config.after_initialize do |app|
       next unless Sentry.initialized?
 
       configure_project_root
       configure_trusted_proxies
       extend_controller_methods if defined?(ActionController)
-      extend_active_job if defined?(ActiveJob)
       patch_background_worker if defined?(ActiveRecord)
       override_streaming_reporter if defined?(ActionView)
       setup_backtrace_cleanup_callback

data/lib/sentry/rails/tracing/action_controller_subscriber.rb

@@ -1,9 +1,12 @@
 require "sentry/rails/tracing/abstract_subscriber"
+require "sentry/rails/instrument_payload_cleanup_helper"
 
 module Sentry
   module Rails
     module Tracing
       class ActionControllerSubscriber < AbstractSubscriber
+        extend InstrumentPayloadCleanupHelper
+
         EVENT_NAME = "process_action.action_controller".freeze
 
         def self.subscribe!
@@ -18,8 +21,7 @@ module Sentry
               duration: duration
             ) do |span|
               payload = payload.dup
-              payload.delete(:headers)
-              payload.delete(:request)
+              cleanup_data(payload)
               span.set_data(:payload, payload)
               span.set_http_status(payload[:status])
             end

data/lib/sentry/rails/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Rails
-    VERSION = "4.5.0"
+    VERSION = "4.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -70,6 +70,7 @@ files:
 - lib/sentry/rails/controller_methods.rb
 - lib/sentry/rails/controller_transaction.rb
 - lib/sentry/rails/engine.rb
+- lib/sentry/rails/instrument_payload_cleanup_helper.rb
 - lib/sentry/rails/overrides/streaming_reporter.rb
 - lib/sentry/rails/railtie.rb
 - lib/sentry/rails/rescued_exception_interceptor.rb