Correct Transport's encoding logging

Author: st0012

sentry-ruby/lib/sentry/transport.rb

@@ -24,7 +24,7 @@ def send_event(event)
         return
       end
 
-      encoded_data = prepare_encoded_event(event)
+      encoded_data = encode(event)
 
       return nil unless encoded_data
 
@@ -45,29 +45,22 @@ def generate_auth_header
       'Sentry ' + fields.map { |key, value| "#{key}=#{value}" }.join(', ')
     end
 
-    def encode(event_hash)
-      event_id = event_hash[:event_id] || event_hash['event_id']
-      event_type = event_hash[:type] || event_hash['type']
+    def encode(event)
+      # Convert to hash
+      event_hash = event.to_hash
+
+      event_id = event_hash[:event_id] || event_hash["event_id"]
+      envelope_type = event_hash[:type] || event_hash["type"] || "event"
 
       envelope = <<~ENVELOPE
         {"event_id":"#{event_id}","dsn":"#{configuration.dsn.to_s}","sdk":#{Sentry.sdk_meta.to_json},"sent_at":"#{Sentry.utc_now.iso8601}"}
-        {"type":"#{event_type}","content_type":"application/json"}
+        {"type":"#{envelope_type}","content_type":"application/json"}
         #{JSON.generate(event_hash)}
       ENVELOPE
 
-      envelope
-    end
-
-    private
-
-    def prepare_encoded_event(event)
-      # Convert to hash
-      event_hash = event.to_hash
+      configuration.logger.info(LOGGER_PROGNAME) { "Sending envelope [#{envelope_type}] #{event_id} to Sentry" }
 
-      event_id = event_hash[:event_id] || event_hash["event_id"]
-      event_type = event_hash[:type] || event_hash["type"]
-      configuration.logger.info(LOGGER_PROGNAME) { "Sending #{event_type} #{event_id} to Sentry" }
-      encode(event_hash)
+      envelope
     end
   end
 end

sentry-ruby/spec/sentry/rake_spec.rb

@@ -10,6 +10,6 @@
       message = `cd spec/support && bundle exec rake raise_exception 2>&1`
     end.join
 
-    expect(message).to match(/Sending event [abcdef0-9]+ to Sentry/)
+    expect(message).to match(/Sending envelope \[event\] [abcdef0-9]+ to Sentry/)
   end
 end

sentry-ruby/spec/sentry/transport_spec.rb

@@ -115,7 +115,7 @@
         expect(subject.send_event(event)).to eq(event)
 
         expect(io.string).to match(
-          /INFO -- sentry: Sending event #{event.event_id} to Sentry/
+          /INFO -- sentry: Sending envelope \[event\] #{event.event_id} to Sentry/
         )
       end
     end