sentry-rails 4.6.4 → 4.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e479516d519975728175dbed14dc5fe29032abd53c90cbadc9f4e1e12c3b0901
-  data.tar.gz: ac6d95f904049f87ba1ce0023301cb5d7294c5efbdd2bfe7710c53eb91b2d1f0
+  metadata.gz: 601a533a33e665e2a7b470eead7e2598827189e985903fb78c0391d9a446ddeb
+  data.tar.gz: e33f1dae2e5d5305432f8fcec69bd26daef8217adf582e6d6747ab1bdb79b112
 SHA512:
-  metadata.gz: 16ade3270e7c3b1e4df50bb1a696e0ef2e238673ddc44c05a5a2b3136ce8503bb325d8b73209ce1102c6acca1761e19583790370c6dbd6032b5764695b58734d
-  data.tar.gz: 94d3f619a04c98c60c4a02a4200e201a11454c1726cbd9c870829e9870f1615c1149137b6ab10259b7374ddbd8309532f7dbfe7a98942345c835c179df853eb3
+  metadata.gz: e459f55b49f1b468ee151f5094e3e2bcc28ba6289f86ec83e69c00b2205c37982f34f4922c3c97af72a02902379c61b3a7bb2cb30cf6f6d8972fc2dbba70eeb2
+  data.tar.gz: 794f8644fe6499cdeeb7bba75e9bf899629afe77ebbd0daca6dd587b8270b53c386f5bbcdae393d747341d3c758983520546e519aecfe23f6c31d94371e76375

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 st0012
+Copyright (c) 2020 Sentry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/app/jobs/sentry/send_event_job.rb

@@ -22,11 +22,6 @@ if defined?(ActiveJob)
       end
 
       def perform(event, hint = {})
-        # users don't need the tracing result of this job
-        if transaction = Sentry.get_current_scope.span
-          transaction.instance_variable_set(:@sampled, false)
-        end
-
         Sentry.send_event(event, hint)
       end
     end

data/lib/sentry/rails/active_job.rb

@@ -21,7 +21,12 @@ module Sentry
 
       def capture_and_reraise_with_sentry(job, scope, block)
         scope.set_transaction_name(job.class.name)
-        transaction = Sentry.start_transaction(name: scope.transaction_name, op: "active_job")
+        transaction =
+          if job.is_a?(::Sentry::SendEventJob)
+            nil
+          else
+            Sentry.start_transaction(name: scope.transaction_name, op: "active_job")
+          end
 
         scope.set_span(transaction) if transaction
 

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

@@ -0,0 +1,44 @@
+require "sentry/rails/instrument_payload_cleanup_helper"
+
+module Sentry
+  module Rails
+    module Breadcrumb
+      module MonotonicActiveSupportLogger
+        class << self
+          include InstrumentPayloadCleanupHelper
+
+          def add(name, started, _finished, _unique_id, data)
+            # skip Rails' internal events
+            return if name.start_with?("!")
+
+            if data.is_a?(Hash)
+              # we should only mutate the copy of the data
+              data = data.dup
+              cleanup_data(data)
+            end
+
+            crumb = Sentry::Breadcrumb.new(
+              data: data,
+              category: name,
+              timestamp: started.to_i
+            )
+            Sentry.add_breadcrumb(crumb)
+          end
+
+          def inject
+            @subscriber = ::ActiveSupport::Notifications.monotonic_subscribe(/.*/) do |name, started, finished, unique_id, data|
+              # we only record events that has a float as started timestamp
+              if started.is_a?(Float)
+                add(name, started, finished, unique_id, data)
+              end
+            end
+          end
+
+          def detach
+            ::ActiveSupport::Notifications.unsubscribe(@subscriber)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sentry/rails/railtie.rb

@@ -8,8 +8,8 @@ module Sentry
     initializer "sentry.use_rack_middleware" do |app|
       # placed after all the file-sending middlewares so we can avoid unnecessary transactions
       app.config.middleware.insert_after ActionDispatch::Executor, Sentry::Rails::CaptureExceptions
-      # need to be placed at last to smuggle app exceptions via env
-      app.config.middleware.use(Sentry::Rails::RescuedExceptionInterceptor)
+      # need to place as close to DebugExceptions as possible to intercept most of the exceptions, including those raised by middlewares
+      app.config.middleware.insert_after ActionDispatch::DebugExceptions, Sentry::Rails::RescuedExceptionInterceptor
     end
 
     # because the extension works by registering the around_perform callcack, it should always be ran
@@ -69,6 +69,13 @@ module Sentry
         require 'sentry/rails/breadcrumb/active_support_logger'
         Sentry::Rails::Breadcrumb::ActiveSupportLogger.inject
       end
+
+      if Sentry.configuration.breadcrumbs_logger.include?(:monotonic_active_support_logger)
+        return warn "Usage of `monotonic_active_support_logger` require a version of Rails >= 6.1, please upgrade your Rails version or use another logger" if ::Rails.version.to_f < 6.1
+
+        require 'sentry/rails/breadcrumb/monotonic_active_support_logger'
+        Sentry::Rails::Breadcrumb::MonotonicActiveSupportLogger.inject
+      end
     end
 
     def setup_backtrace_cleanup_callback

data/lib/sentry/rails/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Rails
-    VERSION = "4.6.4"
+    VERSION = "4.7.2"
   end
 end

data/sentry-rails.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Sentry Team"]
   spec.description = spec.summary = "A gem that provides Rails integration for the Sentry error logger"
   spec.email = "accounts@sentry.io"
-  spec.license = 'Apache-2.0'
+  spec.license = 'MIT'
   spec.homepage = "https://github.com/getsentry/sentry-ruby"
 
   spec.platform = Gem::Platform::RUBY
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 5.0"
-  spec.add_dependency "sentry-ruby-core", "~> 4.6.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 4.6.4
+  version: 4.7.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 description: A gem that provides Rails integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -64,6 +64,7 @@ files:
 - lib/sentry/rails/background_worker.rb
 - lib/sentry/rails/backtrace_cleaner.rb
 - lib/sentry/rails/breadcrumb/active_support_logger.rb
+- lib/sentry/rails/breadcrumb/monotonic_active_support_logger.rb
 - lib/sentry/rails/capture_exceptions.rb
 - lib/sentry/rails/configuration.rb
 - lib/sentry/rails/controller_methods.rb
@@ -82,7 +83,7 @@ files:
 - sentry-rails.gemspec
 homepage: https://github.com/getsentry/sentry-ruby
 licenses:
-- Apache-2.0
+- MIT
 metadata:
   homepage_uri: https://github.com/getsentry/sentry-ruby
   source_code_uri: https://github.com/getsentry/sentry-ruby