sentry-rails 6.0.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1d7d083cce7bf8f0e04a82c63fd1284f836e2ae3aa30a9237eba989e72ae93
-  data.tar.gz: 681cc6a28160e9f8138cdfc2a9c9c8ab81e2a90e43559306d30061e92fe63c91
+  metadata.gz: a75df6b4765c66d4c8844187b1cf607e75c8089441e846ecdf6b7bb4fa9e48e4
+  data.tar.gz: df1a64e0c65f65600664b2f3259a227debd7d346a0dd5f8ce6497ddbea7b9644
 SHA512:
-  metadata.gz: db6546de2db3507a022eff373b10bed7380568fd40055c50b3e80cfe907ecc2479799e7fbfc5f598baa7ebbf92e410823fe71951cd8ae664c15714bb8e49c607
-  data.tar.gz: c71fe0109e60f59e36c91d0e3cbc95c8f34cb5b7b767261e68f40c04716b7d296939ad507ff7166bb618f63fac78b0865313ba2f6b685ba46b659c7175a38575
+  metadata.gz: 46e20af7bc76d8d1b66337c1e25a5fec1eabcae2817960a88d11a76ddea251076f1d39970fefee0b54fb2d80c9f6fec8b1a4b88d299f4a61bdfcf9a0a4cdb1ef
+  data.tar.gz: d7637f46e1fb2df9c2d6b5f07bb0c4d075f17ee013979b535d9643354abce15be08eca759851439763e79b747b062ba331a20acd557291ceea54655bdcbec287

data/.rspec

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

data/Gemfile

@@ -30,16 +30,18 @@ rails_version = Gem::Version.new(rails_version)
 
 gem "rails", "~> #{rails_version}"
 
-if rails_version >= Gem::Version.new("8.0.0")
-  gem "rspec-rails"
+if rails_version >= Gem::Version.new("8.1.0")
+  gem "rspec-rails", "~> 8.0.0"
+  gem "sqlite3", "~> 2.1.1", platform: :ruby
+elsif rails_version >= Gem::Version.new("8.0.0")
+  gem "rspec-rails", "~> 8.0.0"
   gem "sqlite3", "~> 2.1.1", platform: :ruby
 elsif rails_version >= Gem::Version.new("7.1.0")
   gem "psych", "~> 4.0.0"
-  gem "rspec-rails"
+  gem "rspec-rails", "~> 7.0"
   gem "sqlite3", "~> 1.7.3", platform: :ruby
 elsif rails_version >= Gem::Version.new("6.1.0")
-  gem "rspec-rails", "~> 4.0"
-
+  gem "rspec-rails", "~> 6.0"
   gem "sqlite3", "~> 1.7.3", platform: :ruby
 else
   gem "psych", "~> 3.0.0"

data/bin/test

@@ -24,7 +24,7 @@ require 'optparse'
 require 'fileutils'
 
 class RailsVersionTester
-  SUPPORTED_VERSIONS = %w[5.0 5.1 5.2 6.0 6.1 7.0 7.1 7.2 8.0].freeze
+  SUPPORTED_VERSIONS = %w[5.2 6.0 6.1 7.0 7.1 7.2 8.0 8.1].freeze
 
   def initialize
     @options = {}

data/lib/sentry/rails/capture_exceptions.rb

@@ -27,6 +27,7 @@ module Sentry
 
       def capture_exception(exception, env)
         # the exception will be swallowed by ShowExceptions middleware
+        return unless Sentry.initialized?
         return if show_exceptions?(exception, env) && !Sentry.configuration.rails.report_rescued_exceptions
 
         Sentry::Rails.capture_exception(exception).tap do |event|

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

@@ -27,6 +27,8 @@ module Sentry
         #
         # @param event [ActiveSupport::Notifications::Event] The controller action event
         def process_action(event)
+          return unless Sentry.initialized?
+
           payload = event.payload
 
           controller = payload[:controller]

data/lib/sentry/rails/log_subscribers/action_mailer_subscriber.rb

@@ -26,6 +26,8 @@ module Sentry
         #
         # @param event [ActiveSupport::Notifications::Event] The email delivery event
         def deliver(event)
+          return unless Sentry.initialized?
+
           payload = event.payload
 
           mailer = payload[:mailer]
@@ -57,6 +59,8 @@ module Sentry
         #
         # @param event [ActiveSupport::Notifications::Event] The email processing event
         def process(event)
+          return unless Sentry.initialized?
+
           payload = event.payload
 
           mailer = payload[:mailer]

data/lib/sentry/rails/log_subscribers/active_job_subscriber.rb

@@ -26,6 +26,8 @@ module Sentry
         #
         # @param event [ActiveSupport::Notifications::Event] The job performance event
         def perform(event)
+          return unless Sentry.initialized?
+
           job = event.payload[:job]
           duration = duration_ms(event)
 
@@ -63,6 +65,8 @@ module Sentry
         #
         # @param event [ActiveSupport::Notifications::Event] The job enqueue event
         def enqueue(event)
+          return unless Sentry.initialized?
+
           job = event.payload[:job]
 
           attributes = {
@@ -89,6 +93,8 @@ module Sentry
         end
 
         def retry_stopped(event)
+          return unless Sentry.initialized?
+
           job = event.payload[:job]
           error = event.payload[:error]
 
@@ -111,6 +117,8 @@ module Sentry
         end
 
         def discard(event)
+          return unless Sentry.initialized?
+
           job = event.payload[:job]
           error = event.payload[:error]
 

data/lib/sentry/rails/log_subscribers/active_record_subscriber.rb

@@ -29,6 +29,8 @@ module Sentry
         #
         # @param event [ActiveSupport::Notifications::Event] The SQL event
         def sql(event)
+          return unless Sentry.initialized?
+          return if logger && !logger.info?
           return if EXCLUDED_NAMES.include?(event.payload[:name])
 
           sql = event.payload[:sql]
@@ -46,6 +48,17 @@ module Sentry
             cached: cached
           }
 
+          binds = event.payload[:binds]
+
+          if Sentry.configuration.send_default_pii && !binds&.empty?
+            type_casted_binds = type_casted_binds(event)
+
+            binds.each_with_index do |bind, index|
+              name = bind.is_a?(Symbol) ? bind : bind.name
+              attributes["db.query.parameter.#{name}"] = type_casted_binds[index].to_s
+            end
+          end
+
           attributes[:statement_name] = statement_name if statement_name && statement_name != "SQL"
           attributes[:connection_id] = connection_id if connection_id
 
@@ -60,6 +73,16 @@ module Sentry
           )
         end
 
+        if RUBY_ENGINE == "jruby"
+          def type_casted_binds(event)
+            event.payload[:type_casted_binds].call
+          end
+        else
+          def type_casted_binds(event)
+            event.payload[:type_casted_binds]
+          end
+        end
+
         private
 
         def build_log_message(statement_name)

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "sentry/rails/tracing/abstract_subscriber"
+require "sentry/backtrace"
 
 module Sentry
   module Rails
@@ -14,9 +15,11 @@ module Sentry
         SUPPORT_SOURCE_LOCATION = ActiveSupport::BacktraceCleaner.method_defined?(:clean_frame)
 
         if SUPPORT_SOURCE_LOCATION
-          class_attribute :backtrace_cleaner, default: (ActiveSupport::BacktraceCleaner.new.tap do |cleaner|
+          backtrace_cleaner = ActiveSupport::BacktraceCleaner.new.tap do |cleaner|
             cleaner.add_silencer { |line| line.include?("sentry-ruby/lib") || line.include?("sentry-rails/lib") }
-          end)
+          end.method(:clean_frame)
+
+          class_attribute :backtrace_cleaner, default: backtrace_cleaner
         end
 
         class << self
@@ -62,43 +65,21 @@ module Sentry
                 span.set_data(Span::DataConventions::SERVER_PORT, db_config[:port]) if db_config[:port]
                 span.set_data(Span::DataConventions::SERVER_SOCKET_ADDRESS, db_config[:socket]) if db_config[:socket]
 
-                next unless record_query_source
-
                 # both duration and query_source_threshold are in ms
-                next unless duration >= query_source_threshold
-
-                source_location = query_source_location
-
-                if source_location
-                  backtrace_line = Sentry::Backtrace::Line.parse(source_location)
-
-                  span.set_data(Span::DataConventions::FILEPATH, backtrace_line.file) if backtrace_line.file
-                  span.set_data(Span::DataConventions::LINENO, backtrace_line.number) if backtrace_line.number
-                  span.set_data(Span::DataConventions::FUNCTION, backtrace_line.method) if backtrace_line.method
-                  # Only JRuby has namespace in the backtrace
-                  span.set_data(Span::DataConventions::NAMESPACE, backtrace_line.module_name) if backtrace_line.module_name
+                if record_query_source && duration >= query_source_threshold
+                  backtrace_line = Backtrace.source_location(&backtrace_cleaner)
+
+                  if backtrace_line
+                    span.set_data(Span::DataConventions::FILEPATH, backtrace_line.file) if backtrace_line.file
+                    span.set_data(Span::DataConventions::LINENO, backtrace_line.number) if backtrace_line.number
+                    span.set_data(Span::DataConventions::FUNCTION, backtrace_line.method) if backtrace_line.method
+                    # Only JRuby has namespace in the backtrace
+                    span.set_data(Span::DataConventions::NAMESPACE, backtrace_line.module_name) if backtrace_line.module_name
+                  end
                 end
               end
             end
           end
-
-          # Thread.each_caller_location is an API added in Ruby 3.2 that doesn't always collect the entire stack like
-          # Kernel#caller or #caller_locations do. See https://github.com/rails/rails/pull/49095 for more context.
-          if SUPPORT_SOURCE_LOCATION && Thread.respond_to?(:each_caller_location)
-            def query_source_location
-              Thread.each_caller_location do |location|
-                frame = backtrace_cleaner.clean_frame(location)
-                return frame if frame
-              end
-              nil
-            end
-          else
-            # Since Sentry is mostly used in production, we don't want to fallback to the slower implementation
-            # and adds potentially big overhead to the application.
-            def query_source_location
-              nil
-            end
-          end
         end
       end
     end

data/lib/sentry/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module Rails
-    VERSION = "6.0.0"
+    VERSION = "6.1.1"
   end
 end

data/sentry-rails.gemspec

@@ -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.0.0"
+  spec.add_dependency "sentry-ruby", "~> 6.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Sentry Team
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.1
 description: A gem that provides Rails integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -89,15 +89,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.0.0/sentry-rails
+homepage: https://github.com/getsentry/sentry-ruby/tree/6.1.1/sentry-rails
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.0.0/sentry-rails
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.0.0/sentry-rails
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.0.0/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.1.1/sentry-rails
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.1.1/sentry-rails
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.1.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-rails/6.0.0
+  documentation_uri: http://www.rubydoc.info/gems/sentry-rails/6.1.1
 rdoc_options: []
 require_paths:
 - lib