sentry-rails 6.6.2 → 6.7.0

data/lib/sentry/rails/capture_exceptions.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require "sentry/rails/error_reporter_context"
+
 module Sentry
   module Rails
     class CaptureExceptions < Sentry::Rack::CaptureExceptions
+      include ErrorReporterContext
+
       RAILS_7_1 = Gem::Version.new(::Rails.version) >= Gem::Version.new("7.1.0.alpha")
       SPAN_ORIGIN = "auto.http.rails"
 
@@ -30,7 +34,7 @@ module Sentry
         return unless Sentry.initialized?
         return if show_exceptions?(exception, env) && !Sentry.configuration.rails.report_rescued_exceptions
 
-        Sentry::Rails.capture_exception(exception).tap do |event|
+        Sentry::Rails.capture_exception(exception, contexts: execution_context).tap do |event|
           env[ERROR_EVENT_ID_KEY] = event.event_id if event
         end
       end

data/lib/sentry/rails/configuration.rb

@@ -172,6 +172,11 @@ module Sentry
       # Set this option to true if you want Sentry to capture each retry failure
       attr_accessor :active_job_report_on_retry_error
 
+      # Whether we should inject trace propagation headers into the serialized job
+      # payload in order to have a connected trace between producer and consumer.
+      # Defaults to true. Set to false to opt out.
+      attr_accessor :active_job_propagate_traces
+
       # Configuration for structured logging feature
       # @return [StructuredLoggingConfiguration]
       attr_reader :structured_logging
@@ -193,6 +198,7 @@ module Sentry
         @db_query_source_threshold_ms = 100
         @active_support_logger_subscription_items = Sentry::Rails::ACTIVE_SUPPORT_LOGGER_SUBSCRIPTION_ITEMS_DEFAULT.dup
         @active_job_report_on_retry_error = false
+        @active_job_propagate_traces = true
         @structured_logging = StructuredLoggingConfiguration.new
       end
     end

data/lib/sentry/rails/error_reporter_context.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "sentry/rails/serializer"
+
+module Sentry
+  module Rails
+    module ErrorReporterContext
+      SUPPORTS_EXECUTION_CONTEXT = Gem::Version.new(::Rails.version) >= Gem::Version.new("7.0.0")
+
+      if SUPPORTS_EXECUTION_CONTEXT
+        def execution_context
+          return {} unless Sentry.configuration.send_default_pii
+
+          context = ::ActiveSupport::ExecutionContext.to_h
+          return {} if context.empty?
+
+          { "rails.error" => Sentry::Rails::Serializer.serialize(context) }
+        end
+      else
+        def execution_context
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/sentry/rails/railtie.rb

@@ -21,6 +21,13 @@ module Sentry
       ActiveSupport.on_load(:active_job) do
         require "sentry/rails/active_job"
         prepend Sentry::Rails::ActiveJobExtensions
+
+        unless Sentry::Rails::ActiveJobExtensions::SentryReporter.producer_callback_registered?
+          around_enqueue do |job, block|
+            Sentry::Rails::ActiveJobExtensions::SentryReporter.record_producer_span(job, &block)
+          end
+          Sentry::Rails::ActiveJobExtensions::SentryReporter.producer_callback_registered!
+        end
       end
     end
 

data/lib/sentry/rails/serializer.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Sentry
+  module Rails
+    module Serializer
+      def self.serialize(value)
+        case value
+        when Range
+          serialize_range(value)
+        when Hash
+          value.transform_values { |item| serialize(item) }
+        when Array, Enumerable
+          value.map { |item| serialize(item) }
+        when ->(item) { item.respond_to?(:to_global_id) }
+          serialize_global_id(value)
+        else
+          value
+        end
+      end
+
+      def self.serialize_global_id(value)
+        value.to_global_id.to_s
+      rescue StandardError
+        value
+      end
+
+      def self.serialize_range(range)
+        return range.to_s if range.begin.nil? || range.end.nil?
+        return range.to_s if range.begin.is_a?(::ActiveSupport::TimeWithZone)
+
+        range.map { |item| serialize(item) }
+      end
+    end
+  end
+end

data/lib/sentry/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module Rails
-    VERSION = "6.6.2"
+    VERSION = "6.7.0"
   end
 end

data/sentry-rails.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.platform = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.7'
   spec.extra_rdoc_files = ["README.md", "LICENSE.txt"]
-  spec.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples|\.rubocop\.yml)'`.split("\n")
+  spec.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples|test-matrix\.json|\.rubocop\.yml)'`.split("\n")
 
   github_root_uri = 'https://github.com/getsentry/sentry-ruby'
   spec.homepage = "#{github_root_uri}/tree/#{spec.version}/#{spec.name}"
@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 5.2.0"
-  spec.add_dependency "sentry-ruby", "~> 6.6.2"
+  spec.add_dependency "sentry-ruby", "~> 6.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 6.6.2
+  version: 6.7.0
 platform: ruby
 authors:
 - Sentry Team
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.6.2
+        version: 6.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.6.2
+        version: 6.7.0
 description: A gem that provides Rails integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -57,6 +57,41 @@ files:
 - bin/console
 - bin/setup
 - bin/test
+- bin/test_old
+- gemfiles/ruby-2.7_rails-5.2.0.gemfile.lock
+- gemfiles/ruby-2.7_rails-6.0.0.gemfile.lock
+- gemfiles/ruby-2.7_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-2.7_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-2.7_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-3.0_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-3.0_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-3.0_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-3.1_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-3.1_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-3.1_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-3.1_rails-7.2.0.gemfile.lock
+- gemfiles/ruby-3.2_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-3.2_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-3.2_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-3.2_rails-7.2.0.gemfile.lock
+- gemfiles/ruby-3.2_rails-8.0.0.gemfile.lock
+- gemfiles/ruby-3.3_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-3.3_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-3.3_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-3.3_rails-7.2.0.gemfile.lock
+- gemfiles/ruby-3.3_rails-8.0.0.gemfile.lock
+- gemfiles/ruby-3.4_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-3.4_rails-7.2.0.gemfile.lock
+- gemfiles/ruby-3.4_rails-8.0.0.gemfile.lock
+- gemfiles/ruby-3.4_rails-8.1.3.gemfile.lock
+- gemfiles/ruby-4.0_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-4.0_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-4.0_rails-7.1.0.gemfile.lock
+- gemfiles/ruby-4.0_rails-8.0.0.gemfile.lock
+- gemfiles/ruby-4.0_rails-8.1.3.gemfile.lock
+- gemfiles/ruby-jruby-9.4.14.0_rails-6.1.0.gemfile.lock
+- gemfiles/ruby-jruby-9.4.14.0_rails-7.0.0.gemfile.lock
+- gemfiles/ruby-jruby-9.4.14.0_rails-7.1.0.gemfile.lock
 - lib/generators/sentry_generator.rb
 - lib/sentry-rails.rb
 - lib/sentry/rails.rb
@@ -70,6 +105,7 @@ files:
 - lib/sentry/rails/controller_methods.rb
 - lib/sentry/rails/controller_transaction.rb
 - lib/sentry/rails/engine.rb
+- lib/sentry/rails/error_reporter_context.rb
 - lib/sentry/rails/error_subscriber.rb
 - lib/sentry/rails/log_subscriber.rb
 - lib/sentry/rails/log_subscribers/action_controller_subscriber.rb
@@ -80,6 +116,7 @@ files:
 - lib/sentry/rails/overrides/streaming_reporter.rb
 - lib/sentry/rails/railtie.rb
 - lib/sentry/rails/rescued_exception_interceptor.rb
+- lib/sentry/rails/serializer.rb
 - lib/sentry/rails/structured_logging.rb
 - lib/sentry/rails/tracing.rb
 - lib/sentry/rails/tracing/abstract_subscriber.rb
@@ -89,15 +126,15 @@ files:
 - lib/sentry/rails/tracing/active_support_subscriber.rb
 - lib/sentry/rails/version.rb
 - sentry-rails.gemspec
-homepage: https://github.com/getsentry/sentry-ruby/tree/6.6.2/sentry-rails
+homepage: https://github.com/getsentry/sentry-ruby/tree/6.7.0/sentry-rails
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.6.2/sentry-rails
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.6.2/sentry-rails
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.6.2/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.7.0/sentry-rails
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.7.0/sentry-rails
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.7.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-rails/6.6.2
+  documentation_uri: http://www.rubydoc.info/gems/sentry-rails/6.7.0
 rdoc_options: []
 require_paths:
 - lib