sentry-rails 4.4.0 → 4.6.0.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fba76642a6793e6026aca10630ca659fae4832d31aed0710d31805da14676c3
-  data.tar.gz: 15a570cc7acefceeb6e601d52cd2b55763761cb9e855d21282ba75b5a05a578b
+  metadata.gz: b02dcbac481eb6e645780e3ff882455937d1d2815f3e9bd63670591a7492c350
+  data.tar.gz: c4be21017ce59812b637409e0066ff2059341d63995f1ae5a5c69ea38653c667
 SHA512:
-  metadata.gz: a57118b831bf7830caea725b3fdd008d4015026db29bb82dbbdccf98476a0686a795868b4d4831e7ee09cd8cbffa0adeadeb2ab646a37f37ee3c74da90f34874
-  data.tar.gz: 0e0e165ce9d0ee629bd8df754e08615fc1ce73b68928b483ba2abe5304bfe71ee92037c617f63b594b41286f722c62bbc79f44ff116a0546ef833e749fdba81b
+  metadata.gz: 8f407319c4aa281023c0ffc87d84ea0c947a0d603178092a9a81d9d4ea11df7d5819f0d1c1a1b5daca4e4d00a79ffad137ee2f67917ef7f2edeede525e353d93
+  data.tar.gz: abf841e66f24360dbdf5e364bdac989403ed6c06373dab404c17a8c3da24098773f6740f92ea722ca8990f27e5f26af36ff958e3f5421dd8bec6d7cf3cfef059

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+Individual gem's changelog has been deprecated. Please check the [project changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md).
+
 ## 4.4.0
 
 ### Features

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
@@ -26,6 +32,11 @@ module Sentry
       activate_tracing
     end
 
+    runner do
+      next unless Sentry.initialized?
+      Sentry.configuration.background_worker_threads = 0
+    end
+
     def configure_project_root
       Sentry.configuration.project_root = ::Rails.root.to_s
     end

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.4.0"
+    VERSION = "4.6.0-beta.0"
   end
 end

data/sentry-rails.gemspec

@@ -16,12 +16,12 @@ 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/sentry-rails/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 5.0"
-  spec.add_dependency "sentry-ruby-core", "~> 4.4.0.pre.beta"
+  spec.add_dependency "sentry-ruby-core", "~> 4.6.0-beta.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.6.0.pre.beta.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0.pre.beta
+        version: 4.6.0.pre.beta.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0.pre.beta
+        version: 4.6.0.pre.beta.0
 description: A gem that provides Rails integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -46,7 +46,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
-- ".craft.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -70,6 +69,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
@@ -86,7 +86,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/sentry-rails/CHANGELOG.md
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,11 +98,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.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A gem that provides Rails integration for the Sentry error logger

data/.craft.yml

@@ -1,20 +0,0 @@
-minVersion: '0.13.2'
-github:
-    owner: getsentry
-    repo: sentry-ruby
-changelogPolicy: simple
-preReleaseCommand: ruby ../.scripts/bump-version.rb
-releaseBranchPrefix: release-sentry-rails
-statusProvider:
-  name: github
-artifactProvider:
-  name: github
-targets:
-    - name: gem
-    - name: registry
-      type: sdk
-      config:
-          canonical: 'gem:sentry-rails'
-    - name: github
-      tagPrefix: sentry-rails-v
-      changelog: sentry-rails/CHANGELOG.md