Extract SpanRecord into its own file

Author: solnic

lib/sentry/opentelemetry/span_processor.ex

@@ -1,70 +1,7 @@
 defmodule Sentry.Opentelemetry.SpanProcessor do
   @behaviour :otel_span_processor
 
-  alias Sentry.{Span, Transaction, Opentelemetry.SpanStorage}
-
-  defmodule SpanRecord do
-    require Record
-
-    @fields Record.extract(:span, from: "deps/opentelemetry/include/otel_span.hrl")
-    Record.defrecordp(:span, @fields)
-
-    defstruct @fields ++ [:origin]
-
-    def new(otel_span) do
-      otel_attrs = span(otel_span)
-
-      {:attributes, _, _, _, attributes} = otel_attrs[:attributes]
-
-      origin =
-        case otel_attrs[:instrumentation_scope] do
-          {:instrumentation_scope, origin, _version, _} ->
-            origin
-
-          _ ->
-            :undefined
-        end
-
-      attrs =
-        otel_attrs
-        |> Keyword.delete(:attributes)
-        |> Keyword.merge(
-          trace_id: cast_trace_id(otel_attrs[:trace_id]),
-          span_id: cast_span_id(otel_attrs[:span_id]),
-          parent_span_id: cast_span_id(otel_attrs[:parent_span_id]),
-          origin: origin,
-          start_time: cast_timestamp(otel_attrs[:start_time]),
-          end_time: cast_timestamp(otel_attrs[:end_time]),
-          attributes: attributes
-        )
-        |> Map.new()
-
-      struct(__MODULE__, attrs)
-    end
-
-    defp cast_span_id(nil), do: nil
-    defp cast_span_id(:undefined), do: nil
-    defp cast_span_id(span_id), do: bytes_to_hex(span_id, 16)
-
-    defp cast_trace_id(trace_id), do: bytes_to_hex(trace_id, 32)
-
-    defp cast_timestamp(:undefined), do: nil
-    defp cast_timestamp(nil), do: nil
-
-    defp cast_timestamp(timestamp) do
-      nano_timestamp = :opentelemetry.timestamp_to_nano(timestamp)
-      {:ok, datetime} = DateTime.from_unix(div(nano_timestamp, 1_000_000), :millisecond)
-
-      DateTime.to_iso8601(datetime)
-    end
-
-    defp bytes_to_hex(bytes, length) do
-      case(:otel_utils.format_binary_string("~#{length}.16.0b", [bytes])) do
-        {:ok, result} -> result
-        {:error, _} -> raise "Failed to convert bytes to hex: #{inspect(bytes)}"
-      end
-    end
-  end
+  alias Sentry.{Span, Transaction, Opentelemetry.SpanStorage, Opentelemetry.SpanRecord}
 
   @impl true
   def on_start(_ctx, otel_span, _config) do

lib/sentry/opentelemetry/span_record.ex

@@ -0,0 +1,62 @@
+defmodule Sentry.Opentelemetry.SpanRecord do
+  require Record
+
+  @fields Record.extract(:span, from: "deps/opentelemetry/include/otel_span.hrl")
+  Record.defrecordp(:span, @fields)
+
+  defstruct @fields ++ [:origin]
+
+  def new(otel_span) do
+    otel_attrs = span(otel_span)
+
+    {:attributes, _, _, _, attributes} = otel_attrs[:attributes]
+
+    origin =
+      case otel_attrs[:instrumentation_scope] do
+        {:instrumentation_scope, origin, _version, _} ->
+          origin
+
+        _ ->
+          :undefined
+      end
+
+    attrs =
+      otel_attrs
+      |> Keyword.delete(:attributes)
+      |> Keyword.merge(
+        trace_id: cast_trace_id(otel_attrs[:trace_id]),
+        span_id: cast_span_id(otel_attrs[:span_id]),
+        parent_span_id: cast_span_id(otel_attrs[:parent_span_id]),
+        origin: origin,
+        start_time: cast_timestamp(otel_attrs[:start_time]),
+        end_time: cast_timestamp(otel_attrs[:end_time]),
+        attributes: attributes
+      )
+      |> Map.new()
+
+    struct(__MODULE__, attrs)
+  end
+
+  defp cast_span_id(nil), do: nil
+  defp cast_span_id(:undefined), do: nil
+  defp cast_span_id(span_id), do: bytes_to_hex(span_id, 16)
+
+  defp cast_trace_id(trace_id), do: bytes_to_hex(trace_id, 32)
+
+  defp cast_timestamp(:undefined), do: nil
+  defp cast_timestamp(nil), do: nil
+
+  defp cast_timestamp(timestamp) do
+    nano_timestamp = :opentelemetry.timestamp_to_nano(timestamp)
+    {:ok, datetime} = DateTime.from_unix(div(nano_timestamp, 1_000_000), :millisecond)
+
+    DateTime.to_iso8601(datetime)
+  end
+
+  defp bytes_to_hex(bytes, length) do
+    case(:otel_utils.format_binary_string("~#{length}.16.0b", [bytes])) do
+      {:ok, result} -> result
+      {:error, _} -> raise "Failed to convert bytes to hex: #{inspect(bytes)}"
+    end
+  end
+end