Move SpanStorage to its own file

Author: solnic

lib/sentry/application.ex

@@ -26,7 +26,7 @@ defmodule Sentry.Application do
         {Registry, keys: :unique, name: Sentry.Transport.SenderRegistry},
         Sentry.Sources,
         Sentry.Dedupe,
-        Sentry.Telemetry.SpanProcessor.SpanStorage,
+        Sentry.Telemetry.SpanStorage,
         {Sentry.Integrations.CheckInIDMappings,
          [
            max_expected_check_in_time:

lib/sentry/telemetry/span_processor.ex

@@ -6,73 +6,7 @@ defmodule Sentry.Telemetry.SpanProcessor do
   @fields Record.extract(:span, from: "deps/opentelemetry/include/otel_span.hrl")
   Record.defrecordp(:span, @fields)
 
-  alias Sentry.{Span, Transaction}
-
-  defmodule SpanStorage do
-    use GenServer
-
-    def start_link(_opts) do
-      GenServer.start_link(__MODULE__, nil, name: __MODULE__)
-    end
-
-    def init(_) do
-      {:ok, %{root_spans: %{}, child_spans: %{}}}
-    end
-
-    def store_span(span_data) do
-      GenServer.call(__MODULE__, {:store_span, span_data})
-    end
-
-    def get_root_span(span_id) do
-      GenServer.call(__MODULE__, {:get_root_span, span_id})
-    end
-
-    def get_child_spans(parent_span_id) do
-      GenServer.call(__MODULE__, {:get_child_spans, parent_span_id})
-    end
-
-    def update_span(span_data) do
-      GenServer.call(__MODULE__, {:update_span, span_data})
-    end
-
-    def handle_call({:store_span, span_data}, _from, state) do
-      if span_data[:parent_span_id] == :undefined do
-        new_state = put_in(state, [:root_spans, span_data[:span_id]], span_data)
-        {:reply, :ok, new_state}
-      else
-        new_state =
-          update_in(state, [:child_spans, span_data[:parent_span_id]], fn spans ->
-            (spans || []) ++ [span_data]
-          end)
-
-        {:reply, :ok, new_state}
-      end
-    end
-
-    def handle_call({:get_root_span, span_id}, _from, state) do
-      {:reply, state.root_spans[span_id], state}
-    end
-
-    def handle_call({:get_child_spans, parent_span_id}, _from, state) do
-      {:reply, state.child_spans[parent_span_id] || [], state}
-    end
-
-    def handle_call({:update_span, span_data}, _from, state) do
-      if span_data[:parent_span_id] == :undefined do
-        new_state = put_in(state, [:root_spans, span_data[:span_id]], span_data)
-        {:reply, :ok, new_state}
-      else
-        new_state =
-          update_in(state, [:child_spans, span_data[:parent_span_id]], fn spans ->
-            Enum.map(spans || [], fn span ->
-              if span[:span_id] == span_data[:span_id], do: span_data, else: span
-            end)
-          end)
-
-        {:reply, :ok, new_state}
-      end
-    end
-  end
+  alias Sentry.{Span, Transaction, Telemetry.SpanStorage}
 
   @impl true
   def on_start(_ctx, otel_span, _config) do

lib/sentry/telemetry/span_storage.ex

@@ -0,0 +1,65 @@
+defmodule Sentry.Telemetry.SpanStorage do
+  use GenServer
+
+  def start_link(_opts) do
+    GenServer.start_link(__MODULE__, nil, name: __MODULE__)
+  end
+
+  def init(_) do
+    {:ok, %{root_spans: %{}, child_spans: %{}}}
+  end
+
+  def store_span(span_data) do
+    GenServer.call(__MODULE__, {:store_span, span_data})
+  end
+
+  def get_root_span(span_id) do
+    GenServer.call(__MODULE__, {:get_root_span, span_id})
+  end
+
+  def get_child_spans(parent_span_id) do
+    GenServer.call(__MODULE__, {:get_child_spans, parent_span_id})
+  end
+
+  def update_span(span_data) do
+    GenServer.call(__MODULE__, {:update_span, span_data})
+  end
+
+  def handle_call({:store_span, span_data}, _from, state) do
+    if span_data[:parent_span_id] == :undefined do
+      new_state = put_in(state, [:root_spans, span_data[:span_id]], span_data)
+      {:reply, :ok, new_state}
+    else
+      new_state =
+        update_in(state, [:child_spans, span_data[:parent_span_id]], fn spans ->
+          (spans || []) ++ [span_data]
+        end)
+
+      {:reply, :ok, new_state}
+    end
+  end
+
+  def handle_call({:get_root_span, span_id}, _from, state) do
+    {:reply, state.root_spans[span_id], state}
+  end
+
+  def handle_call({:get_child_spans, parent_span_id}, _from, state) do
+    {:reply, state.child_spans[parent_span_id] || [], state}
+  end
+
+  def handle_call({:update_span, span_data}, _from, state) do
+    if span_data[:parent_span_id] == :undefined do
+      new_state = put_in(state, [:root_spans, span_data[:span_id]], span_data)
+      {:reply, :ok, new_state}
+    else
+      new_state =
+        update_in(state, [:child_spans, span_data[:parent_span_id]], fn spans ->
+          Enum.map(spans || [], fn span ->
+            if span[:span_id] == span_data[:span_id], do: span_data, else: span
+          end)
+        end)
+
+      {:reply, :ok, new_state}
+    end
+  end
+end