Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

format b3 headers as 16 chars when 64 bit #166

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

format b3 headers as 16 chars when 64 bit #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
838b22a
encode b3 headers without padding when not 32 chars
castengo Jul 29, 2020
33de39d
alternative way of encoding traceid by checking size first
castengo Jul 29, 2020
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
9 changes: 8 additions & 1 deletion src/oc_propagation_http_b3.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,21 @@ to_headers(#span_ctx{trace_id=TraceId,
trace_options=TraceOptions}) ->
Options = case TraceOptions band 1 of 1 -> "1"; _ -> "0" end,
%% iolist_to_binary only needed for versions before otp-21
EncodedTraceId = iolist_to_binary(io_lib:format("~32.16.0b", [TraceId])),
EncodedTraceId = encode_trace_id(TraceId),
EncodedSpanId = iolist_to_binary(io_lib:format("~16.16.0b", [SpanId])),
[{?B3_TRACE_ID, EncodedTraceId},
{?B3_SPAN_ID, EncodedSpanId},
{?B3_SAMPLED, Options}];
to_headers(undefined) ->
[].

encode_trace_id(TraceId) ->
encode_trace_id(TraceId, binary:encode_unsigned(TraceId)).
encode_trace_id(TraceId, TraceIdBin) when bit_size(TraceIdBin) == 64 ->
iolist_to_binary(io_lib:format("~16.16.0b", [TraceId]));
encode_trace_id(TraceId, _TraceIdBin) ->
iolist_to_binary(io_lib:format("~32.16.0b", [TraceId])).

-spec from_headers(list() | map()) -> maybe(opencensus:span_ctx()).
from_headers(Headers) when is_map(Headers) ->
from_headers(maps:to_list(Headers));
Expand Down
9 changes: 9 additions & 0 deletions test/oc_span_ctx_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,15 @@ b3_encode_decode_headers(_Config) ->
compare_b3_headers(Encoded, Headers),
?assertEqual(Decoded, oc_propagation_http_b3:from_headers(Encoded)),

%% TraceId: 4bf92f3577b34da6
%% SpanId: 00f067aa0ba902b7
%% Enabled: true
ShortTraceIDHeaders = ?B3_HEADERS(<<"4bf92f3577b34da6">>, <<"00f067aa0ba902b7">>, <<"1">>),
ShortTraceIDDecoded = oc_propagation_http_b3:from_headers(ShortTraceIDHeaders),
ShortTraceIDEncoded = oc_propagation_http_b3:to_headers(ShortTraceIDDecoded),
compare_b3_headers(ShortTraceIDEncoded, ShortTraceIDHeaders),
?assertEqual(ShortTraceIDDecoded, oc_propagation_http_b3:from_headers(ShortTraceIDEncoded)),

%% TraceId: 4bf92f3577b34da6a3ce929d0e0e4736
%% SpanId: 00f067aa0ba902b7
%% Enabled: false
Expand Down