Update Span processor to updated Transaction/Span

Author: solnic

lib/sentry/opentelemetry/span_processor.ex

@@ -67,11 +67,13 @@ defmodule Sentry.OpenTelemetry.SpanProcessor do
       span_id: root_span.span_id,
       transaction: transaction_name(root_span_record),
       transaction_info: %{source: :custom},
+      start_timestamp: root_span_record.start_time,
+      timestamp: root_span_record.end_time,
       contexts: %{
         trace: build_trace_context(root_span_record),
         otel: build_otel_context(root_span_record)
       },
-      spans: [root_span | child_spans]
+      spans: child_spans
     })
   end
 

test/sentry/opentelemetry/span_processor_test.exs

@@ -44,18 +44,14 @@ defmodule Sentry.Opentelemetry.SpanProcessorTest do
 
     assert [%Sentry.Transaction{} = transaction] = Sentry.Test.pop_sentry_transactions()
 
-    transaction_data = Sentry.Transaction.to_map(transaction)
-
-    assert transaction_data.event_id
-    assert transaction_data.environment == "test"
-    assert transaction_data.type == "transaction"
-    assert transaction_data.op == "child_instrumented_function_one"
-    assert transaction_data.transaction_info == %{source: :custom}
-    assert_valid_iso8601(transaction_data.timestamp)
-    assert_valid_iso8601(transaction_data.start_timestamp)
-    assert transaction_data.timestamp > transaction_data.start_timestamp
-    assert_valid_trace_id(transaction_data.contexts.trace.trace_id)
-    assert length(transaction_data.spans) == 0
+    assert transaction.event_id
+    assert transaction.environment == "test"
+    assert transaction.transaction_info == %{source: :custom}
+    assert_valid_iso8601(transaction.timestamp)
+    assert_valid_iso8601(transaction.start_timestamp)
+    assert transaction.timestamp > transaction.start_timestamp
+    assert_valid_trace_id(transaction.contexts.trace.trace_id)
+    assert length(transaction.spans) == 0
   end
 
   test "sends captured spans as transactions with child spans" do
@@ -67,15 +63,12 @@ defmodule Sentry.Opentelemetry.SpanProcessorTest do
 
     assert [%Sentry.Transaction{} = transaction] = Sentry.Test.pop_sentry_transactions()
 
-    transaction_data = Sentry.Transaction.to_map(transaction)
-
-    assert transaction_data.op == "instrumented_function"
-    assert_valid_iso8601(transaction_data.timestamp)
-    assert_valid_iso8601(transaction_data.start_timestamp)
-    assert transaction_data.timestamp > transaction_data.start_timestamp
-    assert length(transaction_data.spans) == 2
+    assert_valid_iso8601(transaction.timestamp)
+    assert_valid_iso8601(transaction.start_timestamp)
+    assert transaction.timestamp > transaction.start_timestamp
+    assert length(transaction.spans) == 2
 
-    [child_span_one, child_span_two] = transaction_data.spans
+    [child_span_one, child_span_two] = transaction.spans
     assert child_span_one.op == "child_instrumented_function_one"
     assert child_span_two.op == "child_instrumented_function_two"
     assert child_span_one.parent_span_id == transaction.contexts.trace.span_id
@@ -88,10 +81,10 @@ defmodule Sentry.Opentelemetry.SpanProcessorTest do
 
     assert child_span_one.timestamp > child_span_one.start_timestamp
     assert child_span_two.timestamp > child_span_two.start_timestamp
-    assert transaction_data.timestamp >= child_span_one.timestamp
-    assert transaction_data.timestamp >= child_span_two.timestamp
-    assert transaction_data.start_timestamp <= child_span_one.start_timestamp
-    assert transaction_data.start_timestamp <= child_span_two.start_timestamp
+    assert transaction.timestamp >= child_span_one.timestamp
+    assert transaction.timestamp >= child_span_two.timestamp
+    assert transaction.start_timestamp <= child_span_one.start_timestamp
+    assert transaction.start_timestamp <= child_span_two.start_timestamp
 
     assert_valid_trace_id(transaction.contexts.trace.trace_id)
     assert_valid_trace_id(child_span_one.trace_id)