refactor(telemetry): move span builder helpers from CommandedAttributes to Helpers

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

Author: yordis

lib/commanded/opentelemetry/commanded_attributes.ex

@@ -1,6 +1,4 @@
 defmodule Commanded.OpenTelemetry.CommandedAttributes do
-  alias OpenTelemetry.SemConv.Incubating.MessagingAttributes
-
   @moduledoc """
   OpenTelemetry span attribute names for Commanded.
 
@@ -202,48 +200,4 @@ defmodule Commanded.OpenTelemetry.CommandedAttributes do
   @spec eventstore_stream_delete_type() :: :"eventstore.stream.delete_type"
   def eventstore_stream_delete_type, do: :"eventstore.stream.delete_type"
 
-  def maybe_add_operation_type(attrs, nil), do: attrs
-
-  def maybe_add_operation_type(attrs, type),
-    do: [{MessagingAttributes.messaging_operation_type(), type} | attrs]
-
-  def maybe_add_destination_name(attrs, nil), do: attrs
-
-  def maybe_add_destination_name(attrs, name),
-    do: [{MessagingAttributes.messaging_destination_name(), name} | attrs]
-
-  def maybe_add_stream_uuid(attrs, nil), do: attrs
-
-  def maybe_add_stream_uuid(attrs, uuid),
-    do: [{commanded_stream_uuid(), uuid} | attrs]
-
-  def maybe_add_expected_version(attrs, nil), do: attrs
-
-  def maybe_add_expected_version(attrs, version),
-    do: [{commanded_expected_version(), version} | attrs]
-
-  def maybe_add_event_count(attrs, nil), do: attrs
-
-  def maybe_add_event_count(attrs, count),
-    do: [{commanded_event_count(), count} | attrs]
-
-  def maybe_add_subscription_name(attrs, nil), do: attrs
-
-  def maybe_add_subscription_name(attrs, name) do
-    [
-      {MessagingAttributes.messaging_destination_subscription_name(), name},
-      {commanded_subscription_name(), name}
-      | attrs
-    ]
-  end
-
-  def maybe_add_source_uuid(attrs, nil), do: attrs
-
-  def maybe_add_source_uuid(attrs, uuid),
-    do: [{commanded_source_uuid(), uuid} | attrs]
-
-  def to_destination_name(nil), do: nil
-  def to_destination_name(name) when is_binary(name), do: name
-  def to_destination_name(name) when is_atom(name), do: inspect(name)
-  def to_destination_name(_), do: nil
 end

lib/commanded/opentelemetry/event_store.ex

@@ -9,7 +9,7 @@ defmodule Commanded.OpenTelemetry.EventStore do
   alias OpenTelemetry.SemConv.Incubating.MessagingAttributes
   alias OpenTelemetry.Span
 
-  import CommandedAttributes,
+  import Helpers,
     only: [
       maybe_add_operation_type: 2,
       maybe_add_destination_name: 2,

lib/commanded/opentelemetry/event_store/adapters/event_store.ex

@@ -8,7 +8,7 @@ defmodule Commanded.OpenTelemetry.EventStore.Adapters.EventStore do
   alias OpenTelemetry.SemConv.Incubating.MessagingAttributes
   alias OpenTelemetry.Span
 
-  import CommandedAttributes,
+  import Helpers,
     only: [
       maybe_add_operation_type: 2,
       maybe_add_destination_name: 2,

lib/commanded/opentelemetry/helpers.ex

@@ -1,6 +1,8 @@
 defmodule Commanded.OpenTelemetry.Helpers do
   @moduledoc false
 
+  alias Commanded.OpenTelemetry.CommandedAttributes
+  alias OpenTelemetry.SemConv.Incubating.MessagingAttributes
   alias OpenTelemetry.Span
 
   def extract_propagated_ctx(nil), do: {[], :undefined}
@@ -108,4 +110,49 @@ defmodule Commanded.OpenTelemetry.Helpers do
 
   def struct_name(%name{}), do: inspect(name)
   def struct_name(_), do: nil
+
+  def maybe_add_operation_type(attrs, nil), do: attrs
+
+  def maybe_add_operation_type(attrs, type),
+    do: [{MessagingAttributes.messaging_operation_type(), type} | attrs]
+
+  def maybe_add_destination_name(attrs, nil), do: attrs
+
+  def maybe_add_destination_name(attrs, name),
+    do: [{MessagingAttributes.messaging_destination_name(), name} | attrs]
+
+  def maybe_add_stream_uuid(attrs, nil), do: attrs
+
+  def maybe_add_stream_uuid(attrs, uuid),
+    do: [{CommandedAttributes.commanded_stream_uuid(), uuid} | attrs]
+
+  def maybe_add_expected_version(attrs, nil), do: attrs
+
+  def maybe_add_expected_version(attrs, version),
+    do: [{CommandedAttributes.commanded_expected_version(), version} | attrs]
+
+  def maybe_add_event_count(attrs, nil), do: attrs
+
+  def maybe_add_event_count(attrs, count),
+    do: [{CommandedAttributes.commanded_event_count(), count} | attrs]
+
+  def maybe_add_subscription_name(attrs, nil), do: attrs
+
+  def maybe_add_subscription_name(attrs, name) do
+    [
+      {MessagingAttributes.messaging_destination_subscription_name(), name},
+      {CommandedAttributes.commanded_subscription_name(), name}
+      | attrs
+    ]
+  end
+
+  def maybe_add_source_uuid(attrs, nil), do: attrs
+
+  def maybe_add_source_uuid(attrs, uuid),
+    do: [{CommandedAttributes.commanded_source_uuid(), uuid} | attrs]
+
+  def to_destination_name(nil), do: nil
+  def to_destination_name(name) when is_binary(name), do: name
+  def to_destination_name(name) when is_atom(name), do: inspect(name)
+  def to_destination_name(_), do: nil
 end