Remove span records after sending a transaction

Author: solnic

lib/sentry/opentelemetry/span_processor.ex

@@ -25,6 +25,9 @@ defmodule Sentry.Opentelemetry.SpanProcessor do
       transaction = build_transaction(root_span, child_spans)
 
       Sentry.send_transaction(transaction)
+
+      SpanStorage.remove_span(span_record.span_id)
+      SpanStorage.remove_child_spans(span_record.span_id)
     end
 
     :ok

lib/sentry/opentelemetry/span_storage.ex

@@ -25,6 +25,14 @@ defmodule Sentry.Opentelemetry.SpanStorage do
     GenServer.call(__MODULE__, {:update_span, span_data})
   end
 
+  def remove_span(span_id) do
+    GenServer.call(__MODULE__, {:remove_span, span_id})
+  end
+
+  def remove_child_spans(parent_span_id) do
+    GenServer.call(__MODULE__, {:remove_child_spans, parent_span_id})
+  end
+
   def handle_call({:store_span, span_data}, _from, state) do
     if span_data.parent_span_id == nil do
       new_state = put_in(state, [:root_spans, span_data.span_id], span_data)
@@ -62,4 +70,18 @@ defmodule Sentry.Opentelemetry.SpanStorage do
       {:reply, :ok, new_state}
     end
   end
+
+  def handle_call({:remove_span, span_id}, _from, state) do
+    new_state = %{
+      state |
+      root_spans: Map.delete(state.root_spans, span_id),
+      child_spans: Map.delete(state.child_spans, span_id)
+    }
+    {:reply, :ok, new_state}
+  end
+
+  def handle_call({:remove_child_spans, parent_span_id}, _from, state) do
+    new_state = %{state | child_spans: Map.delete(state.child_spans, parent_span_id)}
+    {:reply, :ok, new_state}
+  end
 end

test/sentry/opentelemetry/span_processor_test.exs

@@ -80,6 +80,22 @@ defmodule Sentry.Opentelemetry.SpanProcessorTest do
     assert_valid_trace_id(child_span_two.trace_id)
   end
 
+  test "removes span records from storage after sending a transaction" do
+    put_test_config(environment_name: "test")
+
+    Sentry.Test.start_collecting_sentry_reports()
+
+    TestEndpoint.instrumented_function()
+
+    assert [%Sentry.Transaction{} = transaction] = Sentry.Test.pop_sentry_transactions()
+
+    assert nil ==
+             Sentry.Opentelemetry.SpanStorage.get_root_span(transaction.contexts.trace.span_id)
+
+    assert [] ==
+             Sentry.Opentelemetry.SpanStorage.get_child_spans(transaction.contexts.trace.span_id)
+  end
+
   defp assert_valid_iso8601(timestamp) do
     case DateTime.from_iso8601(timestamp) do
       {:ok, datetime, _offset} ->