Remove hash based event logic

Author: sl0thentr0py

sentry-ruby/lib/sentry/client.rb

@@ -53,8 +53,7 @@ def capture_event(event, scope, hint = {})
         return
       end
 
-      event_type = event.is_a?(Event) ? event.type : event["type"]
-      data_category = Envelope::Item.data_category(event_type)
+      data_category = Envelope::Item.data_category(event.type)
       event = scope.apply_to_event(event, hint)
 
       if event.nil?
@@ -164,10 +163,9 @@ def event_from_transaction(transaction)
 
     # @!macro send_event
     def send_event(event, hint = nil)
-      event_type = event.is_a?(Event) ? event.type : event["type"]
-      data_category = Envelope::Item.data_category(event_type)
+      data_category = Envelope::Item.data_category(event.type)
 
-      if event_type != TransactionEvent::TYPE && configuration.before_send
+      if event.type != TransactionEvent::TYPE && configuration.before_send
         event = configuration.before_send.call(event, hint)
 
         if event.nil?
@@ -177,7 +175,7 @@ def send_event(event, hint = nil)
         end
       end
 
-      if event_type == TransactionEvent::TYPE && configuration.before_send_transaction
+      if event.type == TransactionEvent::TYPE && configuration.before_send_transaction
         event = configuration.before_send_transaction.call(event, hint)
 
         if event.nil?

sentry-ruby/lib/sentry/transport.rb

@@ -127,10 +127,7 @@ def envelope_from_event(event)
         sent_at: Sentry.utc_now.iso8601
       }
 
-      if event.is_a?(Event) && event.dynamic_sampling_context
-        envelope_headers[:trace] = event.dynamic_sampling_context
-      end
-
+      envelope_headers[:trace] = event.dynamic_sampling_context if event.dynamic_sampling_context
       envelope = Envelope.new(envelope_headers)
 
       envelope.add_item(

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

@@ -129,22 +129,12 @@
 
       it "applies before_send callback before sending the event" do
         configuration.before_send = lambda do |event, _hint|
-          if event.is_a?(Sentry::Event)
-            event.tags[:called] = true
-          else
-            event["tags"]["called"] = true
-          end
-
+          event.tags[:called] = true
           event
         end
 
         subject.send_event(event)
-
-        if event.is_a?(Sentry::Event)
-          expect(event.tags[:called]).to eq(true)
-        else
-          expect(event["tags"]["called"]).to eq(true)
-        end
+        expect(event.tags[:called]).to eq(true)
       end
 
       it "doesn't apply before_send_transaction to Event" do
@@ -161,10 +151,6 @@
       let(:event) { event_object }
     end
 
-    it_behaves_like "Event in send_event" do
-      let(:event) { event_object.to_json_compatible }
-    end
-
     shared_examples "TransactionEvent in send_event" do
       it "sends data through the transport" do
         subject.send_event(event)
@@ -180,32 +166,18 @@
 
       it "applies before_send_transaction callback before sending the event" do
         configuration.before_send_transaction = lambda do |event, _hint|
-          if event.is_a?(Sentry::TransactionEvent)
-            event.tags[:called] = true
-          else
-            event["tags"]["called"] = true
-          end
-
+          event.tags[:called] = true
           event
         end
 
         subject.send_event(event)
-
-        if event.is_a?(Sentry::Event)
-          expect(event.tags[:called]).to eq(true)
-        else
-          expect(event["tags"]["called"]).to eq(true)
-        end
+        expect(event.tags[:called]).to eq(true)
       end
     end
 
     it_behaves_like "TransactionEvent in send_event" do
       let(:event) { transaction_event_object }
     end
-
-    it_behaves_like "TransactionEvent in send_event" do
-      let(:event) { transaction_event_object.to_json_compatible }
-    end
   end
 
   describe "integrated error handling testing with HTTPTransport" do

sentry-ruby/spec/sentry/transport/http_transport_rate_limiting_spec.rb

@@ -14,7 +14,7 @@
   let(:configuration) { Sentry.configuration }
   let(:client) { Sentry.get_current_client }
   let(:data) do
-    subject.envelope_from_event(client.event_from_message("foobarbaz").to_hash).to_s
+    subject.envelope_from_event(client.event_from_message("foobarbaz")).to_s
   end
 
   subject { Sentry::HTTPTransport.new(configuration) }

sentry-ruby/spec/sentry/transport/http_transport_spec.rb

@@ -14,7 +14,7 @@
   let(:event) { client.event_from_message("foobarbaz") }
   let(:fake_time) { Time.now }
   let(:data) do
-    subject.serialize_envelope(subject.envelope_from_event(event.to_hash)).first
+    subject.serialize_envelope(subject.envelope_from_event(event)).first
   end
 
   subject { client.transport }

sentry-ruby/spec/sentry/transport/spotlight_transport_spec.rb

@@ -18,7 +18,7 @@
   let(:client) { Sentry::Client.new(configuration) }
   let(:event) { client.event_from_message("foobarbaz") }
   let(:data) do
-    subject.serialize_envelope(subject.envelope_from_event(event.to_hash)).first
+    subject.serialize_envelope(subject.envelope_from_event(event)).first
   end
 
   subject { described_class.new(configuration) }

sentry-ruby/spec/sentry/transport_spec.rb

@@ -387,18 +387,6 @@
         expect(io.string).to match(/Sending envelope with items \[event\]/)
       end
 
-      context "when the event hash has string keys" do
-        let(:envelope) { subject.envelope_from_event(event.to_json_compatible) }
-
-        it "deletes the event's breadcrumbs and sends it" do
-          expect(subject).to receive(:send_data)
-
-          subject.send_envelope(envelope)
-
-          expect(io.string).to match(/Sending envelope with items \[event\]/)
-        end
-      end
-
       context "if it's still oversized" do
         before do
           1000.times do |i|
@@ -450,12 +438,6 @@
         expect(subject.send_event(event)).to eq(event)
       end
 
-      it "sends Event hash" do
-        expect(subject).not_to receive(:failed_send)
-
-        expect(subject.send_event(event.to_json_compatible)).to eq(event.to_json_compatible)
-      end
-
       it "logs correct message" do
         expect(subject.send_event(event)).to eq(event)