change the default nested attribute joiner to . to better align with …

…otlp
marcdel · May 4, 2023 · 42321ea · 42321ea
1 parent b222b5f
commit 42321ea
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/config/config.exs b/config/config.exs
@@ -7,7 +7,8 @@
 # General application configuration
 import Config
 
-# config :open_telemetry_decorator, attr_prefix: ""
+config :open_telemetry_decorator, attr_prefix: ""
+config :open_telemetry_decorator, attr_joiner: "."
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.

diff --git a/lib/open_telemetry_decorator/attributes.ex b/lib/open_telemetry_decorator/attributes.ex
@@ -37,7 +37,7 @@ defmodule OpenTelemetryDecorator.Attributes do
   end
 
   defp composite_name(keys) do
-    joiner = Application.get_env(:open_telemetry_decorator, :attr_joiner) || "_"
+    joiner = Application.get_env(:open_telemetry_decorator, :attr_joiner) || "."
     Enum.join(keys, joiner)
   end
 

diff --git a/test/open_telemetry_decorator/attributes_test.exs b/test/open_telemetry_decorator/attributes_test.exs
@@ -4,6 +4,12 @@ defmodule OpenTelemetryDecorator.AttributesTest do
   alias OpenTelemetryDecorator.Attributes
 
   describe "take_attrs" do
+    setup do
+      prev = Application.get_env(:open_telemetry_decorator, :attr_joiner)
+      Application.put_env(:open_telemetry_decorator, :attr_joiner, "_")
+      on_exit(fn -> Application.put_env(:open_telemetry_decorator, :attr_joiner, prev) end)
+    end
+
     test "handles flat attributes" do
       assert Attributes.get([id: 1], [:id]) == [id: 1]
     end

diff --git a/test/open_telemetry_decorator_test.exs b/test/open_telemetry_decorator_test.exs
@@ -27,6 +27,12 @@ defmodule OpenTelemetryDecoratorTest do
   end
 
   describe "trace" do
+    setup do
+      prev = Application.get_env(:open_telemetry_decorator, :attr_joiner)
+      Application.put_env(:open_telemetry_decorator, :attr_joiner, "_")
+      on_exit(fn -> Application.put_env(:open_telemetry_decorator, :attr_joiner, prev) end)
+    end
+
     defmodule Example do
       use OpenTelemetryDecorator