Cleanup before_send to only apply to ErrorEvent

* also remove the Hash deprecation message

Author: sl0thentr0py

sentry-ruby/lib/sentry/client.rb

@@ -209,18 +209,10 @@ def send_event(event, hint = nil)
       data_category = Envelope::Item.data_category(event.type)
       spans_before = event.is_a?(TransactionEvent) ? event.spans.size : 0
 
-      if event.type != TransactionEvent::TYPE && configuration.before_send
+      if event.is_a?(ErrorEvent) && configuration.before_send
         event = configuration.before_send.call(event, hint)
 
-        case event
-        when ErrorEvent, CheckInEvent
-          # do nothing
-        when Hash
-          log_debug(<<~MSG)
-            Returning a Hash from before_send is deprecated and will be removed in the next major version.
-            Please return a Sentry::ErrorEvent object instead.
-          MSG
-        else
+        if !event.is_a?(ErrorEvent)
           # Avoid serializing the event object in this case because we aren't sure what it is and what it contains
           log_debug(<<~MSG)
             Discarded event because before_send didn't return a Sentry::ErrorEvent object but an instance of #{event.class}
@@ -233,18 +225,7 @@ def send_event(event, hint = nil)
       if event.type == TransactionEvent::TYPE && configuration.before_send_transaction
         event = configuration.before_send_transaction.call(event, hint)
 
-        if event.is_a?(TransactionEvent) || event.is_a?(Hash)
-          spans_after = event.is_a?(TransactionEvent) ? event.spans.size : 0
-          spans_delta = spans_before - spans_after
-          transport.record_lost_event(:before_send, "span", num: spans_delta) if spans_delta > 0
-
-          if event.is_a?(Hash)
-            log_debug(<<~MSG)
-              Returning a Hash from before_send_transaction is deprecated and will be removed in the next major version.
-              Please return a Sentry::TransactionEvent object instead.
-            MSG
-          end
-        else
+        if !event.is_a?(TransactionEvent)
           # Avoid serializing the event object in this case because we aren't sure what it is and what it contains
           log_debug(<<~MSG)
             Discarded event because before_send_transaction didn't return a Sentry::TransactionEvent object but an instance of #{event.class}
@@ -253,6 +234,10 @@ def send_event(event, hint = nil)
           transport.record_lost_event(:before_send, "span", num: spans_before + 1)
           return
         end
+
+        spans_after = event.is_a?(TransactionEvent) ? event.spans.size : 0
+        spans_delta = spans_before - spans_after
+        transport.record_lost_event(:before_send, "span", num: spans_delta) if spans_delta > 0
       end
 
       transport.send_event(event) if configuration.sending_to_dsn_allowed?

sentry-ruby/spec/sentry/client/event_sending_spec.rb

@@ -200,19 +200,6 @@
         expect(string_io.string).to include("Discarded event because before_send didn't return a Sentry::ErrorEvent object but an instance of Integer")
         expect(return_value).to eq(nil)
       end
-
-      it "warns about Hash value's deprecation" do
-        string_io = StringIO.new
-        logger = Logger.new(string_io, level: :debug)
-        configuration.sdk_logger = logger
-        configuration.before_send = lambda do |_event, _hint|
-          { foo: "bar" }
-        end
-
-        return_value = client.send_event(event)
-        expect(string_io.string).to include("Returning a Hash from before_send is deprecated and will be removed in the next major version.")
-        expect(return_value).to eq({ foo: "bar" })
-      end
     end
 
     it_behaves_like "Event in send_event" do
@@ -254,19 +241,6 @@
         expect(string_io.string).to include("Discarded event because before_send_transaction didn't return a Sentry::TransactionEvent object but an instance of NilClass")
         expect(return_value).to be_nil
       end
-
-      it "warns about Hash value's deprecation" do
-        string_io = StringIO.new
-        logger = Logger.new(string_io, level: :debug)
-        configuration.sdk_logger = logger
-        configuration.before_send_transaction = lambda do |_event, _hint|
-          { foo: "bar" }
-        end
-
-        return_value = client.send_event(event)
-        expect(string_io.string).to include("Returning a Hash from before_send_transaction is deprecated and will be removed in the next major version.")
-        expect(return_value).to eq({ foo: "bar" })
-      end
     end
 
     it_behaves_like "TransactionEvent in send_event" do