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

use new api function from_remote_span for propagated span context #265

Merged
merged 1 commit into from
Aug 9, 2021
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
3 changes: 2 additions & 1 deletion apps/opentelemetry_api/include/opentelemetry.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
%% TraceID and a non-zero SpanID.
is_valid :: boolean() | undefined,
%% true if the span context came from a remote process
is_remote :: boolean() | undefined,
%% defaults to false and the propagator must set to true when extracting
is_remote = false :: boolean(),
%% this field is not propagated and is only here as an implementation optimization
%% If true updates like adding events are done on the span. The same as if the
%% trace flags lowest bit is 1 but simply not propagated.
Expand Down
6 changes: 3 additions & 3 deletions apps/opentelemetry_api/src/otel_propagator_http_b3.erl
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ extract(Headers, _) when is_list(Headers) ->
TraceId = trace_id(Headers),
SpanId = span_id(Headers),
Sampled = lookup(?B3_SAMPLED, Headers),
otel_tracer:non_recording_span(string_to_integer(TraceId, 16),
string_to_integer(SpanId, 16),
case Sampled of True when ?B3_IS_SAMPLED(True) -> 1; _ -> 0 end)
otel_tracer:from_remote_span(string_to_integer(TraceId, 16),
string_to_integer(SpanId, 16),
case Sampled of True when ?B3_IS_SAMPLED(True) -> 1; _ -> 0 end)
catch
throw:invalid ->
undefined;
Expand Down
6 changes: 3 additions & 3 deletions apps/opentelemetry_api/src/otel_propagator_http_w3c.erl
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ to_span_ctx(Version, TraceId, SpanId, Opts) ->
try
%% verify version is hexadecimal
_ = binary_to_integer(Version, 16),
otel_tracer:non_recording_span(binary_to_integer(TraceId, 16),
binary_to_integer(SpanId, 16),
case Opts of <<"01">> -> 1; <<"00">> -> 0; _ -> error(badarg) end)
otel_tracer:from_remote_span(binary_to_integer(TraceId, 16),
binary_to_integer(SpanId, 16),
case Opts of <<"01">> -> 1; <<"00">> -> 0; _ -> error(badarg) end)
catch
%% to integer from base 16 string failed
error:badarg ->
Expand Down
12 changes: 12 additions & 0 deletions apps/opentelemetry_api/src/otel_tracer.erl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
with_span/4,
with_span/5,
non_recording_span/3,
from_remote_span/3,
set_current_span/1,
set_current_span/2,
current_span_ctx/0,
Expand Down Expand Up @@ -82,6 +83,17 @@ non_recording_span(TraceId, SpanId, Traceflags) ->
is_recording=false,
trace_flags=Traceflags}.

%% @doc Returns a `span_ctx' record with `is_recording' set to `false' and `is_remote' set to `true'.
%% This is mainly for use in propagators when they extract a Span to be used as a parent.
-spec from_remote_span(opentelemetry:trace_id(), opentelemetry:span_id(), opentelemetry:trace_flags())
-> opentelemetry:span_ctx().
from_remote_span(TraceId, SpanId, Traceflags) ->
#span_ctx{trace_id=TraceId,
span_id=SpanId,
is_recording=false,
is_remote=true,
trace_flags=Traceflags}.

-spec set_current_span(opentelemetry:span_ctx() | undefined) -> ok.
set_current_span(SpanCtx) ->
otel_ctx:set_value(?CURRENT_SPAN_CTX, SpanCtx).
Expand Down
9 changes: 6 additions & 3 deletions apps/opentelemetry_api/test/otel_propagators_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,16 @@ nonrecording_no_sdk_propagation(_Config) ->
%% is_recording will always be false in extracted `span_ctx'
otel_propagator:text_map_extract(BinaryHeaders),

?assertEqual(NonRecordingSpanCtx, otel_tracer:current_span_ctx()),
%% after being extracted `is_remote' will be set to `true'
RemoteSpanCtx = NonRecordingSpanCtx#span_ctx{is_remote=true},

?assertEqual(RemoteSpanCtx, otel_tracer:current_span_ctx()),
?with_span(<<"span-1">>, #{}, fun(_) ->
%% parent is non-recording so it should be returned
%% as the "new" span
?assertEqual(NonRecordingSpanCtx, otel_tracer:current_span_ctx())
?assertEqual(RemoteSpanCtx, otel_tracer:current_span_ctx())
end),
?assertEqual(NonRecordingSpanCtx, otel_tracer:current_span_ctx()),
?assertEqual(RemoteSpanCtx, otel_tracer:current_span_ctx()),

BinaryHeaders = otel_propagator:text_map_inject([]),
?assertMatch(?EXPECTED_HEADERS, BinaryHeaders),
Expand Down