Merge branch '4-3'

Author: st0012

sentry-rails/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.3.2
+
+- Avoid recording SendEventJob's transaction [#1351](https://github.com/getsentry/sentry-ruby/pull/1351)
+  - Fixes [#1348](https://github.com/getsentry/sentry-ruby/issues/1348)
+
 ## 4.3.1
 
 - Only apply background worker patch if ActiveRecord is loaded [#1350](https://github.com/getsentry/sentry-ruby/pull/1350)

sentry-ruby/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Add Sentry.set_context helper [#1337](https://github.com/getsentry/sentry-ruby/pull/1337)
 - Fix handle the case where the logger messages is not of String type [#1341](https://github.com/getsentry/sentry-ruby/pull/1341)
+- Don't report Sentry::ExternalError to Sentry [#1353](https://github.com/getsentry/sentry-ruby/pull/1353)
 
 ## 4.3.0
 

sentry-ruby/lib/sentry/exceptions.rb

@@ -2,6 +2,6 @@ module Sentry
   class Error < StandardError
   end
 
-  class ExternalError < StandardError
+  class ExternalError < Error
   end
 end

sentry-ruby/spec/sentry/client_spec.rb

@@ -179,6 +179,13 @@ class Exception < RuntimeError; end
         end
       end
 
+      context 'for a Sentry::ExternalError' do
+        let(:exception) { Sentry::ExternalError.new }
+        it 'does not create an event' do
+          expect(subject.event_from_exception(exception)).to be_nil
+        end
+      end
+
       context 'for an excluded exception type' do
         module Sentry::Test
           class BaseExc < RuntimeError; end