Use opentelemetry_xray instead of otel_xray

cogini · Oct 23, 2023 · 5a36306 · 5a36306
1 parent dcc1e42
commit 5a36306
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/src/otel_xray_id_generator.erl → src/opentelemetry_xray_id_generator.erl b/src/otel_xray_id_generator.erl → src/opentelemetry_xray_id_generator.erl
@@ -16,7 +16,7 @@
 %% https://aws-otel.github.io/docs/getting-started/x-ray#configuring-the-aws-x-ray-exporter
 %% @end
 
--module(otel_xray_id_generator).
+-module(opentelemetry_xray_id_generator).
 
 % Don't implement behavior to avoid dependency on opentelemetry
 % -behaviour(otel_id_generator).

diff --git a/src/otel_xray_propagator.erl → src/opentelemetry_xray_propagator.erl b/src/otel_xray_propagator.erl → src/opentelemetry_xray_propagator.erl
@@ -16,7 +16,7 @@
 %% https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
 %% @end
 
--module(otel_xray_propagator).
+-module(opentelemetry_xray_propagator).
 
 -behaviour(otel_propagator_text_map).
 

diff --git a/src/otel_xray.app.src → src/optentelemetry_propagator_xray.app.src b/src/otel_xray.app.src → src/optentelemetry_propagator_xray.app.src
@@ -1,6 +1,12 @@
 {
   application,
+<<<<<<<< HEAD:src/otel_xray.app.src
   otel_xray,
+|||||||| parent of d8e7e4b (Use opentelemetry_xray instead of otel_xray):src/otel_propagator_xray.app.src
+  otel_propagator_xray,
+========
+  opentelemetry_propagator_xray,
+>>>>>>>> d8e7e4b (Use opentelemetry_xray instead of otel_xray):src/optentelemetry_propagator_xray.app.src
   [
     {description, "OpenTelemetry propagator for AWS X-Ray"},
     {vsn, "0.1.0"},

diff --git a/test/otel_xray_id_generator_SUITE.erl → ...opentelemetry_xray_id_generator_SUITE.erl b/test/otel_xray_id_generator_SUITE.erl → ...opentelemetry_xray_id_generator_SUITE.erl
@@ -1,4 +1,4 @@
--module(otel_xray_id_generator_SUITE).
+-module(opentelemetry_xray_id_generator_SUITE).
 
 -compile(export_all).
 
@@ -16,6 +16,6 @@ merge(_) ->
   UniqueId = 51635583967283991042469687690,
   ?assertEqual(
     ((1698024497 bsl 96) bor 51635583967283991042469687690),
-    otel_xray_id_generator:merge_trace_id(Timestamp, UniqueId)
+    opentelemetry_xray_id_generator:merge_trace_id(Timestamp, UniqueId)
   ),
   ok.
diff --git a/test/otel_xray_propagator_SUITE.erl → test/opentelemetry_xray_propagator_SUITE.erl b/test/otel_xray_propagator_SUITE.erl → test/opentelemetry_xray_propagator_SUITE.erl
@@ -1,4 +1,4 @@
--module(otel_xray_propagator_SUITE).
+-module(opentelemetry_xray_propagator_SUITE).
 
 -compile(export_all).
 
@@ -14,7 +14,7 @@ parse() -> [{docs, "low level parsing"}].
 parse(_) ->
   ?assertEqual(
     binary_to_integer(<<"5759e988bd862e3fe1be46a994272793">>, 16),
-    otel_xray_propagator:parse_trace_id(<<"5759e988">>, <<"bd862e3fe1be46a994272793">>)
+    opentelemetry_xray_propagator:parse_trace_id(<<"5759e988">>, <<"bd862e3fe1be46a994272793">>)
   ),
   ok.
 
@@ -27,33 +27,33 @@ decode(_) ->
   SpanId = binary_to_integer(<<"53995c3f42cd8ad8">>, 16),
   ?assertEqual(
     SpanCtx#span_ctx{trace_id = TraceId},
-    otel_xray_propagator:decode(<<"Root=1-5759e988-bd862e3fe1be46a994272793">>, SpanCtx)
+    opentelemetry_xray_propagator:decode(<<"Root=1-5759e988-bd862e3fe1be46a994272793">>, SpanCtx)
   ),
   ?assertEqual(
     SpanCtx#span_ctx{span_id = SpanId},
-    otel_xray_propagator:decode(<<"Parent=53995c3f42cd8ad8">>, SpanCtx)
+    opentelemetry_xray_propagator:decode(<<"Parent=53995c3f42cd8ad8">>, SpanCtx)
   ),
   ?assertEqual(
     SpanCtx#span_ctx{trace_flags = 0},
-    otel_xray_propagator:decode(<<"Sampled=0">>, SpanCtx)
+    opentelemetry_xray_propagator:decode(<<"Sampled=0">>, SpanCtx)
   ),
   ?assertEqual(
     SpanCtx#span_ctx{trace_flags = 1},
-    otel_xray_propagator:decode(<<"Sampled=1">>, SpanCtx)
+    opentelemetry_xray_propagator:decode(<<"Sampled=1">>, SpanCtx)
   ),
   ?assertEqual(
     SpanCtx,
-    otel_xray_propagator:decode(<<"Lineage=a87bd80c:1|68fd508a:5|c512fbe3:2">>, SpanCtx)
+    opentelemetry_xray_propagator:decode(<<"Lineage=a87bd80c:1|68fd508a:5|c512fbe3:2">>, SpanCtx)
   ),
   ?assertEqual(
     SpanCtx#span_ctx{trace_id = TraceId, span_id = SpanId},
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=0">>
     )
   ),
   ?assertEqual(
     SpanCtx#span_ctx{trace_id = TraceId, trace_flags = 1},
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<
         "Root=1-5759e988-bd862e3fe1be46a994272793;Sampled=1;Lineage=a87bd80c:1|68fd508a:5|c512fbe3:2"
       >>
@@ -68,49 +68,49 @@ decode_invalid(_) ->
   % invalid trace id
   ?assertError(
     badarg,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-12345678-abcdefghijklmnopqrstuvwx;Parent=53995c3f42cd8ad8;Sampled=0">>
     )
   ),
   % invalid size trace id
   ?assertThrow(
     invalid,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-8a3c60f7-d188f8fa79d48a391a778fa600;Parent=53995c3f42cd8ad8;Sampled=0">>
     )
   ),
   % invalid span id
   ?assertError(
     badarg,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=abcdefghijklmnop;Sampled=0">>
     )
   ),
   % invalid size span id
   ?assertThrow(
     invalid,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad800;Sampled=0">>
     )
   ),
   % no sampled flag
   ?assertThrow(
     invalid,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=">>
     )
   ),
   % invalid size sampled
   ?assertThrow(
     invalid,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=011">>
     )
   ),
   % non numeric sampled flag
   ?assertThrow(
     invalid,
-    otel_xray_propagator:decode(
+    opentelemetry_xray_propagator:decode(
       <<"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=a">>
     )
   ),
@@ -124,15 +124,15 @@ encode(_) ->
   SpanCtx = otel_tracer:from_remote_span(0, 0, 0),
   ?assertEqual(
     <<"Root=1-5759e988-bd862e3fe1be46a994272793;Sampled=1">>,
-    otel_xray_propagator:encode(SpanCtx#span_ctx{trace_id = TraceId, trace_flags = 1})
+    opentelemetry_xray_propagator:encode(SpanCtx#span_ctx{trace_id = TraceId, trace_flags = 1})
   ),
   ?assertEqual(
     <<"Root=1-5759e988-bd862e3fe1be46a994272793">>,
-    otel_xray_propagator:encode(SpanCtx#span_ctx{trace_id = TraceId, trace_flags = 0})
+    opentelemetry_xray_propagator:encode(SpanCtx#span_ctx{trace_id = TraceId, trace_flags = 0})
   ),
   ok.
 
 
 fields(_) ->
-  ?assertEqual([<<"X-Amzn-Trace-Id">>], otel_xray_propagator:fields(foo)),
+  ?assertEqual([<<"X-Amzn-Trace-Id">>], opentelemetry_xray_propagator:fields(foo)),
   ok.