Use otel propagator

simplebet · Jul 19, 2021 · 6ddabc2 · 6ddabc2
1 parent ce4a52d
commit 6ddabc2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/lib/commanded/aggregate.ex b/lib/commanded/aggregate.ex
@@ -45,9 +45,10 @@ defmodule OpentelemetryCommanded.Aggregate do
       "aggregate.lifespan": context.lifespan
     ]
 
+    :otel_propagator.text_map_extract(context.metadata.trace_ctx)
+
     Tracer.start_span("commanded:aggregate:execute", %{
       kind: :CONSUMER,
-      parent: decode_ctx(context.metadata.trace_ctx),
       attributes: attributes
     })
   end

diff --git a/lib/commanded/event_handler.ex b/lib/commanded/event_handler.ex
@@ -3,8 +3,6 @@ defmodule OpentelemetryCommanded.EventHandler do
 
   require OpenTelemetry.Tracer
 
-  import OpentelemetryCommanded.Util
-
   alias OpenTelemetry.Tracer
 
   def setup do
@@ -32,7 +30,6 @@ defmodule OpentelemetryCommanded.EventHandler do
 
   def handle_start(_event, _measurements, meta, _) do
     event = meta.recorded_event
-    ctx = decode_ctx(event.metadata["trace_ctx"])
 
     attributes = [
       "causation.id": event.causation_id,
@@ -51,9 +48,10 @@ defmodule OpentelemetryCommanded.EventHandler do
       # "event.last_seen": meta.last_seen_event
     ]
 
+    :otel_propagator.text_map_extract(event.metadata["trace_ctx"])
+
     Tracer.start_span("commanded:event:handle", %{
       kind: :CONSUMER,
-      parent: ctx,
       attributes: attributes
     })
   end

diff --git a/lib/commanded/middleware.ex b/lib/commanded/middleware.ex
@@ -16,15 +16,14 @@ defmodule OpentelemetryCommanded.Middleware do
   require OpenTelemetry.Tracer
 
   import Commanded.Middleware.Pipeline
-  import OpentelemetryCommanded.Util
 
   alias Commanded.Middleware.Pipeline
   alias OpenTelemetry.Tracer
 
   def before_dispatch(%Pipeline{} = pipeline) do
     trace_ctx = Tracer.current_span_ctx()
 
-    assign_metadata(pipeline, :trace_ctx, encode_ctx(trace_ctx))
+    assign_metadata(pipeline, :trace_ctx, trace_ctx)
   end
 
   def after_dispatch(pipeline) do

diff --git a/lib/commanded/process_manager.ex b/lib/commanded/process_manager.ex
@@ -3,8 +3,6 @@ defmodule OpentelemetryCommanded.ProcessManager do
 
   require OpenTelemetry.Tracer
 
-  import OpentelemetryCommanded.Util
-
   alias OpenTelemetry.Tracer
 
   def setup do
@@ -47,9 +45,10 @@ defmodule OpentelemetryCommanded.ProcessManager do
       "stream.version": event.stream_version
     ]
 
+    :otel_propagator.text_map_extract(event.metadata["trace_ctx"])
+
     Tracer.start_span("commanded:process_manager:handle", %{
       kind: :CONSUMER,
-      parent: decode_ctx(event.metadata["trace_ctx"]),
       attributes: attributes
     })
   end