sentry-rails 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b45b14487fb54357f496eea076b669d064b0f38bbd1960014960ecaf9214df
-  data.tar.gz: 1cd430829a299cdd9b357c940e17aa0c3984e6dc30d5f888f50a28b75accff9c
+  metadata.gz: b63ec61238dbea2a3fee7cebbdcf72d1810dc50fe4863502ecdbc66b8da7b31e
+  data.tar.gz: 165e2974b74f63c062db1587c1852c151a5b350a15df13c408cea97476d6c10f
 SHA512:
-  metadata.gz: ebba56359ebb4c5ac43076f10b069864a61004ba33ddf893ba2a5eba825f8da1f12d18ad685a900a3b253ee8521566a983e83508809b33e02f2d634ff078f181
-  data.tar.gz: e01b630f88aa297426743f96635e837d6de0fd888c3dec63b8382affae263c8764f6c92a9972a765d38d5aa8252629c1a568a3edde98e26b3368f530010009f6
+  metadata.gz: ec0d90eb1b44f1dfb45bb369586cb8ee22da1a79604679ec12f475e1916eefe646a34c1ab97de386a43e7a27c3e3999c684d61038571ad88c6e0dca667f23f45
+  data.tar.gz: fa67c7c00d3d9f71efd13fecb195ea945538f6535464e704115d5e1a8bf7f6c3cf65c3423369270809a6d49cb99ce4b7ab700cca0885756da673f39f99fac166

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_subscriber.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/log_subscriber"
+require "sentry/utils/logging_helper"
 
 module Sentry
   module Rails
@@ -27,6 +28,8 @@ module Sentry
     #     end
     #   end
     class LogSubscriber < ActiveSupport::LogSubscriber
+      include Sentry::LoggingHelper
+
       ORIGIN = "auto.log.rails.log_subscriber"
 
       class << self

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

@@ -24,12 +24,14 @@ module Sentry
         include ParameterFilter
 
         EXCLUDED_NAMES = ["SCHEMA", "TRANSACTION"].freeze
+        EMPTY_ARRAY = [].freeze
 
         # Handle sql.active_record events
         #
         # @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]
@@ -39,8 +41,6 @@ module Sentry
           cached = event.payload.fetch(:cached, false)
           connection_id = event.payload[:connection_id]
 
-          db_config = extract_db_config(event.payload)
-
           attributes = {
             sql: sql,
             duration_ms: duration_ms(event),
@@ -49,19 +49,21 @@ module Sentry
 
           binds = event.payload[:binds]
 
-          if Sentry.configuration.send_default_pii && !binds&.empty?
+          if Sentry.configuration.send_default_pii && (binds && !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
+            type_casted_binds.each_with_index do |value, index|
+              bind = binds[index]
+              name = bind.respond_to?(:name) ? bind.name : index.to_s
+
+              attributes["db.query.parameter.#{name}"] = value.to_s
             end
           end
 
           attributes[:statement_name] = statement_name if statement_name && statement_name != "SQL"
           attributes[:connection_id] = connection_id if connection_id
 
-          add_db_config_attributes(attributes, db_config)
+          maybe_add_db_config_attributes(attributes, event.payload)
 
           message = build_log_message(statement_name)
 
@@ -70,15 +72,19 @@ module Sentry
             level: :info,
             attributes: attributes
           )
+        rescue => e
+          log_debug("[#{self.class}] failed to log sql event: #{e.message}")
         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]
+        def type_casted_binds(event)
+          binds = event.payload[:type_casted_binds]
+
+          # When a query is cached, binds are a callable,
+          # and under JRuby they're always a callable.
+          if binds.respond_to?(:call)
+            binds.call
+          else
+            binds
           end
         end
 
@@ -92,15 +98,9 @@ module Sentry
           end
         end
 
-        def extract_db_config(payload)
-          connection = payload[:connection]
+        def maybe_add_db_config_attributes(attributes, payload)
+          db_config = extract_db_config(payload)
 
-          return unless connection
-
-          extract_db_config_from_connection(connection)
-        end
-
-        def add_db_config_attributes(attributes, db_config)
           return unless db_config
 
           attributes[:db_system] = db_config[:adapter] if db_config[:adapter]
@@ -120,6 +120,14 @@ module Sentry
           attributes[:server_socket_address] = db_config[:socket] if db_config[:socket]
         end
 
+        def extract_db_config(payload)
+          connection = payload[:connection]
+
+          return unless connection
+
+          extract_db_config_from_connection(connection)
+        end
+
         if ::Rails.version.to_f >= 6.1
           def extract_db_config_from_connection(connection)
             if connection.pool.respond_to?(:db_config)

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.1.0"
+    VERSION = "6.2.0"
   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.1.0"
+  spec.add_dependency "sentry-ruby", "~> 6.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Sentry Team
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 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.1.0/sentry-rails
+homepage: https://github.com/getsentry/sentry-ruby/tree/6.2.0/sentry-rails
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.1.0/sentry-rails
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.1.0/sentry-rails
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.1.0/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.2.0/sentry-rails
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.2.0/sentry-rails
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.2.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-rails/6.1.0
+  documentation_uri: http://www.rubydoc.info/gems/sentry-rails/6.2.0
 rdoc_options: []
 require_paths:
 - lib