Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use traceparent header from incoming shape requests to set parent span #2000

Merged
merged 4 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/odd-walls-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@core/sync-service": patch
---

use traceparent header from incoming shape requests to set parent span
1 change: 1 addition & 0 deletions packages/sync-service/lib/electric/plug/router.ex
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ defmodule Electric.Plug.Router do
plug Plug.Head
plug :match
plug Electric.Plug.LabelProcessPlug
plug Electric.Plug.TraceContextPlug
plug Plug.Telemetry, event_prefix: [:electric, :routing]
plug Plug.Logger
plug :put_cors_headers
Expand Down
28 changes: 28 additions & 0 deletions packages/sync-service/lib/electric/plug/trace_context_plug.ex
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
defmodule Electric.Plug.TraceContextPlug do
@moduledoc """
A plug that extracts trace context from incoming HTTP headers and sets it as the parent span.
"""
@behaviour Plug

require Logger

def init(opts), do: opts

def call(%Plug.Conn{req_headers: headers} = conn, _opts) do
# Extract function expects a list of headers as tuples and knows
# the expected header keys, so we don't have to prefilter.
ctx = :otel_propagator_text_map.extract_to(:otel_ctx.new(), headers)

# Get the span context from the extracted context
case :otel_tracer.current_span_ctx(ctx) do
:undefined ->
# No parent, continue as-is
conn

span_ctx ->
# Parent found, set as current span
:otel_tracer.set_current_span(span_ctx)
conn
end
end
end
Loading