Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ private static SpanContext buildSpanContext(String traceId, String spanId, Strin
try {
String otelTraceId = StringUtils.padLeft(traceId, MAX_TRACE_ID_LENGTH);
String otelSpanId = StringUtils.padLeft(spanId, MAX_SPAN_ID_LENGTH);
int flagsInt = Integer.parseInt(flags);
int flagsInt = Integer.parseInt(flags, 16);
return SpanContext.createFromRemoteParent(
otelTraceId,
otelSpanId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,29 @@ void extract_SampledContext() {
TRACE_ID, SPAN_ID, TraceFlags.getSampled(), TraceState.getDefault()));
}

@ParameterizedTest
@MethodSource
void extract_HexadecimalFlags(byte flags, String encodedFlags, TraceFlags expectedTraceFlags) {
Map<String, String> carrier = new LinkedHashMap<>();
JaegerSpanContext context =
new JaegerSpanContext(
TRACE_ID_HI, TRACE_ID_LOW, SPAN_ID_LONG, DEPRECATED_PARENT_SPAN_LONG, flags);
carrier.put(PROPAGATION_HEADER, TextMapCodec.contextAsString(context));

assertThat(carrier.get(PROPAGATION_HEADER)).endsWith(":" + encodedFlags);
assertThat(getSpanContext(jaegerPropagator.extract(Context.root(), carrier, getter)))
.isEqualTo(
SpanContext.createFromRemoteParent(
TRACE_ID, SPAN_ID, expectedTraceFlags, TraceState.getDefault()));
}

static Stream<Arguments> extract_HexadecimalFlags() {
return Stream.of(
Arguments.argumentSet("sampled debug firehose", (byte) 0x0b, "b", TraceFlags.getSampled()),
Arguments.argumentSet("unsampled hex", (byte) 0x0a, "a", TraceFlags.getDefault()),
Arguments.argumentSet("two-digit hex", (byte) 0xff, "ff", TraceFlags.getSampled()));
}

@Test
void extract_NotSampledContext() {
Map<String, String> carrier = new LinkedHashMap<>();
Expand Down
Loading