Skip to content

Commit eb529cb

Browse files
jkwatsonjkwatson
authored
Revert the SpanContext trace/span id accessor methods. (open-telemetry#2749)
1 parent d9c4602 commit eb529cb

File tree

22 files changed

+89
-89
lines changed

22 files changed

+89
-89
lines changed

‎api/all/src/jmh/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagatorBenchmark.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public Context measureExtractCreateInject() {
7676
SpanContext current = Span.fromContext(result).getSpanContext();
7777
SpanContext clientSpanContext =
7878
SpanContext.create(
79-
current.getTraceIdHex(),
80-
current.getSpanIdHex(),
79+
current.getTraceId(),
80+
current.getSpanId(),
8181
current.getTraceFlags(),
8282
current.getTraceState());
8383
result = Span.wrap(clientSpanContext).storeInContext(result);

‎api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ static SpanContext createFromRemoteParent(
7070
*
7171
* @return the trace identifier associated with this {@link SpanContext} as lowercase hex.
7272
*/
73-
String getTraceIdHex();
73+
String getTraceId();
7474

7575
/**
7676
* Returns the trace identifier associated with this {@link SpanContext} as 16-byte array.
7777
*
7878
* @return the trace identifier associated with this {@link SpanContext} as 16-byte array.
7979
*/
8080
default byte[] getTraceIdBytes() {
81-
return BigendianEncoding.bytesFromBase16(getTraceIdHex(), TraceId.getLength());
81+
return BigendianEncoding.bytesFromBase16(getTraceId(), TraceId.getLength());
8282
}
8383

8484
/**
@@ -88,15 +88,15 @@ default byte[] getTraceIdBytes() {
8888
* @return the span identifier associated with this {@link SpanContext} as 16 character lowercase
8989
* hex (base16) String.
9090
*/
91-
String getSpanIdHex();
91+
String getSpanId();
9292

9393
/**
9494
* Returns the span identifier associated with this {@link SpanContext} as 8-byte array.
9595
*
9696
* @return the span identifier associated with this {@link SpanContext} as 8-byte array.
9797
*/
9898
default byte[] getSpanIdBytes() {
99-
return BigendianEncoding.bytesFromBase16(getSpanIdHex(), SpanId.getLength());
99+
return BigendianEncoding.bytesFromBase16(getSpanId(), SpanId.getLength());
100100
}
101101

102102
/** Whether the span in this context is sampled. */
@@ -124,7 +124,7 @@ default boolean isSampled() {
124124
* @return {@code true} if this {@code SpanContext} is valid.
125125
*/
126126
default boolean isValid() {
127-
return TraceId.isValid(getTraceIdHex()) && SpanId.isValid(getSpanIdHex());
127+
return TraceId.isValid(getTraceId()) && SpanId.isValid(getSpanId());
128128
}
129129

130130
/**

‎api/all/src/main/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ public <C> void inject(Context context, @Nullable C carrier, Setter<C> setter) {
111111
chars[1] = VERSION.charAt(1);
112112
chars[2] = TRACEPARENT_DELIMITER;
113113

114-
String traceId = spanContext.getTraceIdHex();
114+
String traceId = spanContext.getTraceId();
115115
for (int i = 0; i < traceId.length(); i++) {
116116
chars[TRACE_ID_OFFSET + i] = traceId.charAt(i);
117117
}
118118

119119
chars[SPAN_ID_OFFSET - 1] = TRACEPARENT_DELIMITER;
120120

121-
String spanId = spanContext.getSpanIdHex();
121+
String spanId = spanContext.getSpanId();
122122
for (int i = 0; i < spanId.length(); i++) {
123123
chars[SPAN_ID_OFFSET + i] = spanId.charAt(i);
124124
}
@@ -177,8 +177,8 @@ private static <C> SpanContext extractImpl(
177177
try {
178178
TraceState traceState = extractTraceState(traceStateHeader);
179179
return SpanContext.createFromRemoteParent(
180-
contextFromParentHeader.getTraceIdHex(),
181-
contextFromParentHeader.getSpanIdHex(),
180+
contextFromParentHeader.getTraceId(),
181+
contextFromParentHeader.getSpanId(),
182182
contextFromParentHeader.getTraceFlags(),
183183
traceState);
184184
} catch (IllegalArgumentException e) {

‎api/all/src/test/java/io/opentelemetry/api/trace/SpanContextTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class SpanContextTest {
3030

3131
@Test
3232
void invalidSpanContext() {
33-
assertThat(SpanContext.getInvalid().getTraceIdHex()).isEqualTo(TraceId.getInvalid());
34-
assertThat(SpanContext.getInvalid().getSpanIdHex()).isEqualTo(SpanId.getInvalid());
33+
assertThat(SpanContext.getInvalid().getTraceId()).isEqualTo(TraceId.getInvalid());
34+
assertThat(SpanContext.getInvalid().getSpanId()).isEqualTo(SpanId.getInvalid());
3535
assertThat(SpanContext.getInvalid().getTraceFlags()).isEqualTo(TraceFlags.getDefault());
3636
}
3737

@@ -60,14 +60,14 @@ void isValid() {
6060

6161
@Test
6262
void getTraceId() {
63-
assertThat(first.getTraceIdHex()).isEqualTo(FIRST_TRACE_ID);
64-
assertThat(second.getTraceIdHex()).isEqualTo(SECOND_TRACE_ID);
63+
assertThat(first.getTraceId()).isEqualTo(FIRST_TRACE_ID);
64+
assertThat(second.getTraceId()).isEqualTo(SECOND_TRACE_ID);
6565
}
6666

6767
@Test
6868
void getSpanId() {
69-
assertThat(first.getSpanIdHex()).isEqualTo(FIRST_SPAN_ID);
70-
assertThat(second.getSpanIdHex()).isEqualTo(SECOND_SPAN_ID);
69+
assertThat(first.getSpanId()).isEqualTo(FIRST_SPAN_ID);
70+
assertThat(second.getSpanId()).isEqualTo(SECOND_SPAN_ID);
7171
}
7272

7373
@Test

‎exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ static SpanRef toSpanRef(LinkData link) {
227227
// https://github.com/open-telemetry/opentelemetry-java/pull/481/files#r312577862
228228
return new SpanRef(
229229
SpanRefType.FOLLOWS_FROM,
230-
traceIdAsLongLow(link.getSpanContext().getTraceIdHex()),
231-
traceIdAsLongHigh(link.getSpanContext().getTraceIdHex()),
232-
spanIdAsLong(link.getSpanContext().getSpanIdHex()));
230+
traceIdAsLongLow(link.getSpanContext().getTraceId()),
231+
traceIdAsLongHigh(link.getSpanContext().getTraceId()),
232+
spanIdAsLong(link.getSpanContext().getSpanId()));
233233
}
234234

235235
private static long traceIdAsLongHigh(String traceId) {

‎extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXrayPropagator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ public <C> void inject(Context context, @Nullable C carrier, Setter<C> setter) {
9090

9191
SpanContext spanContext = span.getSpanContext();
9292

93-
String otTraceId = spanContext.getTraceIdHex();
93+
String otTraceId = spanContext.getTraceId();
9494
String xrayTraceId =
9595
TRACE_ID_VERSION
9696
+ TRACE_ID_DELIMITER
9797
+ otTraceId.substring(0, TRACE_ID_FIRST_PART_LENGTH)
9898
+ TRACE_ID_DELIMITER
9999
+ otTraceId.substring(TRACE_ID_FIRST_PART_LENGTH);
100-
String parentId = spanContext.getSpanIdHex();
100+
String parentId = spanContext.getSpanId();
101101
char samplingFlag = spanContext.isSampled() ? IS_SAMPLED : NOT_SAMPLED;
102102
// TODO: Add OT trace state to the X-Ray trace header
103103

‎extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public <C> void inject(Context context, C carrier, TextMapPropagator.Setter<C> s
3131
sampled = Common.TRUE_INT;
3232
}
3333

34-
setter.set(carrier, B3Propagator.TRACE_ID_HEADER, spanContext.getTraceIdHex());
35-
setter.set(carrier, B3Propagator.SPAN_ID_HEADER, spanContext.getSpanIdHex());
34+
setter.set(carrier, B3Propagator.TRACE_ID_HEADER, spanContext.getTraceId());
35+
setter.set(carrier, B3Propagator.SPAN_ID_HEADER, spanContext.getSpanId());
3636
setter.set(carrier, B3Propagator.SAMPLED_HEADER, sampled);
3737
}
3838
}

‎extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public <C> void inject(Context context, C carrier, TextMapPropagator.Setter<C> s
3636
}
3737

3838
char[] chars = new char[COMBINED_HEADER_SIZE];
39-
String traceId = spanContext.getTraceIdHex();
39+
String traceId = spanContext.getTraceId();
4040
traceId.getChars(0, traceId.length(), chars, 0);
4141
chars[SPAN_ID_OFFSET - 1] = B3Propagator.COMBINED_HEADER_DELIMITER_CHAR;
4242

43-
String spanId = spanContext.getSpanIdHex();
43+
String spanId = spanContext.getSpanId();
4444
System.arraycopy(spanId.toCharArray(), 0, chars, SPAN_ID_OFFSET, SpanId.getLength());
4545

4646
chars[SAMPLED_FLAG_OFFSET - 1] = B3Propagator.COMBINED_HEADER_DELIMITER_CHAR;

‎extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ private static <C> void injectSpan(SpanContext spanContext, C carrier, Setter<C>
9595

9696
char[] chars = new char[PROPAGATION_HEADER_SIZE];
9797

98-
String traceId = spanContext.getTraceIdHex();
98+
String traceId = spanContext.getTraceId();
9999
for (int i = 0; i < traceId.length(); i++) {
100100
chars[i] = traceId.charAt(i);
101101
}
102102

103103
chars[SPAN_ID_OFFSET - 1] = PROPAGATION_HEADER_DELIMITER;
104-
String spanId = spanContext.getSpanIdHex();
104+
String spanId = spanContext.getSpanId();
105105
for (int i = 0; i < spanId.length(); i++) {
106106
chars[SPAN_ID_OFFSET + i] = spanId.charAt(i);
107107
}

‎extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public <C> void inject(Context context, C carrier, Setter<C> setter) {
6464
// Lightstep trace id MUST be 64-bits therefore OpenTelemetry trace id is truncated to 64-bits
6565
// by retaining least significant (right-most) bits.
6666
setter.set(
67-
carrier, TRACE_ID_HEADER, spanContext.getTraceIdHex().substring(TraceId.getLength() / 2));
68-
setter.set(carrier, SPAN_ID_HEADER, spanContext.getSpanIdHex());
67+
carrier, TRACE_ID_HEADER, spanContext.getTraceId().substring(TraceId.getLength() / 2));
68+
setter.set(carrier, SPAN_ID_HEADER, spanContext.getSpanId());
6969
setter.set(carrier, SAMPLED_HEADER, String.valueOf(spanContext.isSampled()));
7070

7171
// Baggage is only injected if there is a valid SpanContext

‎opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ static Span fromOtelSpan(io.opentelemetry.api.trace.Span otSpan) {
5050

5151
static SpanContext mapSpanContext(io.opentelemetry.api.trace.SpanContext otelSpanContext) {
5252
return SpanContext.create(
53-
TraceId.fromLowerBase16(otelSpanContext.getTraceIdHex()),
54-
SpanId.fromLowerBase16(otelSpanContext.getSpanIdHex()),
53+
TraceId.fromLowerBase16(otelSpanContext.getTraceId()),
54+
SpanId.fromLowerBase16(otelSpanContext.getSpanId()),
5555
TraceOptions.builder().setIsSampled(otelSpanContext.isSampled()).build(),
5656
mapTracestate(otelSpanContext.getTraceState()));
5757
}

‎opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/InteroperabilityTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void testRemoteParent() {
170170
assertThat(export1.size()).isEqualTo(1);
171171
SpanData spanData1 = export1.iterator().next();
172172
assertThat(spanData1.getName()).isEqualTo("OpenCensusSpan");
173-
assertThat(spanData1.getLinks().get(0).getSpanContext().getSpanIdHex())
173+
assertThat(spanData1.getLinks().get(0).getSpanContext().getSpanId())
174174
.isEqualTo(remoteParentSpan.getContext().getSpanId().toLowerBase16());
175175
}
176176

@@ -237,7 +237,7 @@ void testParentChildRelationshipsAreExportedCorrectlyForOpenCensusOnly() {
237237
assertThat(export3.size()).isEqualTo(1);
238238
SpanData spanData3 = export3.iterator().next();
239239
assertThat(spanData3.getName()).isEqualTo("OpenCensusSpan");
240-
assertThat(spanData3.getLinks().get(0).getSpanContext().getSpanIdHex())
240+
assertThat(spanData3.getLinks().get(0).getSpanContext().getSpanId())
241241
.isEqualTo(parentLinkSpan.getContext().getSpanId().toLowerBase16());
242242
assertThat(spanData3.getKind()).isEqualTo(SpanKind.SERVER);
243243
assertThat(spanData3.getStatus()).isEqualTo(StatusData.ok());

‎opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanContextShim.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ Baggage getBaggage() {
6060

6161
@Override
6262
public String toTraceId() {
63-
return context.getTraceIdHex();
63+
return context.getTraceId();
6464
}
6565

6666
@Override
6767
public String toSpanId() {
68-
return context.getSpanIdHex();
68+
return context.getSpanId();
6969
}
7070

7171
@Override

‎opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/SpanShimTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ void context_simple() {
4343
SpanContextShim contextShim = (SpanContextShim) spanShim.context();
4444
assertThat(contextShim).isNotNull();
4545
assertThat(span.getSpanContext()).isEqualTo(contextShim.getSpanContext());
46-
assertThat(span.getSpanContext().getTraceIdHex().toString()).isEqualTo(contextShim.toTraceId());
47-
assertThat(span.getSpanContext().getSpanIdHex().toString()).isEqualTo(contextShim.toSpanId());
46+
assertThat(span.getSpanContext().getTraceId().toString()).isEqualTo(contextShim.toTraceId());
47+
assertThat(span.getSpanContext().getSpanId().toString()).isEqualTo(contextShim.toSpanId());
4848
assertThat(contextShim.baggageItems().iterator().hasNext()).isFalse();
4949
}
5050

‎sdk-extensions/jfr-events/src/main/java/io/opentelemetry/sdk/extension/jfr/ScopeEvent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class ScopeEvent extends Event {
2424
private final String spanId;
2525

2626
ScopeEvent(SpanContext spanContext) {
27-
this.traceId = spanContext.getTraceIdHex();
28-
this.spanId = spanContext.getSpanIdHex();
27+
this.traceId = spanContext.getTraceId();
28+
this.spanId = spanContext.getSpanId();
2929
}
3030

3131
@Label("Trace Id")

‎sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public void basicSpan() throws IOException {
7373
events.stream()
7474
.forEach(
7575
e -> {
76-
assertEquals(span.getSpanContext().getTraceIdHex(), e.getValue("traceId"));
77-
assertEquals(span.getSpanContext().getSpanIdHex(), e.getValue("spanId"));
76+
assertEquals(span.getSpanContext().getTraceId(), e.getValue("traceId"));
77+
assertEquals(span.getSpanContext().getSpanId(), e.getValue("spanId"));
7878
assertEquals(OPERATION_NAME, e.getValue("operationName"));
7979
});
8080

@@ -113,8 +113,8 @@ public void basicSpanWithScope() throws IOException, InterruptedException {
113113
events.stream()
114114
.forEach(
115115
e -> {
116-
assertEquals(span.getSpanContext().getTraceIdHex(), e.getValue("traceId"));
117-
assertEquals(span.getSpanContext().getSpanIdHex(), e.getValue("spanId"));
116+
assertEquals(span.getSpanContext().getTraceId(), e.getValue("traceId"));
117+
assertEquals(span.getSpanContext().getSpanId(), e.getValue("spanId"));
118118
if ("Span".equals(e.getEventType().getLabel())) {
119119
assertEquals(OPERATION_NAME, e.getValue("operationName"));
120120
}

‎sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class TracezSpanProcessor implements SpanProcessor {
3737

3838
@Override
3939
public void onStart(Context parentContext, ReadWriteSpan span) {
40-
runningSpanCache.put(span.getSpanContext().getSpanIdHex(), span);
40+
runningSpanCache.put(span.getSpanContext().getSpanId(), span);
4141
}
4242

4343
@Override
@@ -47,7 +47,7 @@ public boolean isStartRequired() {
4747

4848
@Override
4949
public void onEnd(ReadableSpan span) {
50-
runningSpanCache.remove(span.getSpanContext().getSpanIdHex());
50+
runningSpanCache.remove(span.getSpanContext().getSpanId());
5151
if (!sampled || span.getSpanContext().isSampled()) {
5252
completedSpanCache.putIfAbsent(span.getName(), new TracezSpanBuckets());
5353
completedSpanCache.get(span.getName()).addToBucket(span);

‎sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandlerTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ void spanDetails_emitRunningSpanDetailsCorrectly() {
270270
assertThat(output.toString()).contains("<h2>Span Details</h2>");
271271
assertThat(output.toString()).contains("<b> Span Name: " + RUNNING_SPAN + "</b>");
272272
assertThat(output.toString()).contains("<b> Number of running: 1");
273-
assertThat(output.toString()).contains(runningSpan.getSpanContext().getTraceIdHex());
274-
assertThat(output.toString()).contains(runningSpan.getSpanContext().getSpanIdHex());
273+
assertThat(output.toString()).contains(runningSpan.getSpanContext().getTraceId());
274+
assertThat(output.toString()).contains(runningSpan.getSpanContext().getSpanId());
275275

276276
runningSpan.end();
277277
}
@@ -294,10 +294,10 @@ void spanDetails_emitLatencySpanDetailsCorrectly() {
294294
assertThat(output.toString()).contains("<h2>Span Details</h2>");
295295
assertThat(output.toString()).contains("<b> Span Name: " + LATENCY_SPAN + "</b>");
296296
assertThat(output.toString()).contains("<b> Number of latency samples: 2");
297-
assertThat(output.toString()).contains(latencySpan1.getSpanContext().getTraceIdHex());
298-
assertThat(output.toString()).contains(latencySpan1.getSpanContext().getSpanIdHex());
299-
assertThat(output.toString()).contains(latencySpan2.getSpanContext().getTraceIdHex());
300-
assertThat(output.toString()).contains(latencySpan2.getSpanContext().getSpanIdHex());
297+
assertThat(output.toString()).contains(latencySpan1.getSpanContext().getTraceId());
298+
assertThat(output.toString()).contains(latencySpan1.getSpanContext().getSpanId());
299+
assertThat(output.toString()).contains(latencySpan2.getSpanContext().getTraceId());
300+
assertThat(output.toString()).contains(latencySpan2.getSpanContext().getSpanId());
301301
}
302302

303303
@Test
@@ -318,10 +318,10 @@ void spanDetails_emitErrorSpanDetailsCorrectly() {
318318
assertThat(output.toString()).contains("<h2>Span Details</h2>");
319319
assertThat(output.toString()).contains("<b> Span Name: " + ERROR_SPAN + "</b>");
320320
assertThat(output.toString()).contains("<b> Number of error samples: 2");
321-
assertThat(output.toString()).contains(errorSpan1.getSpanContext().getTraceIdHex());
322-
assertThat(output.toString()).contains(errorSpan1.getSpanContext().getSpanIdHex());
323-
assertThat(output.toString()).contains(errorSpan2.getSpanContext().getTraceIdHex());
324-
assertThat(output.toString()).contains(errorSpan2.getSpanContext().getSpanIdHex());
321+
assertThat(output.toString()).contains(errorSpan1.getSpanContext().getTraceId());
322+
assertThat(output.toString()).contains(errorSpan1.getSpanContext().getSpanId());
323+
assertThat(output.toString()).contains(errorSpan2.getSpanContext().getTraceId());
324+
assertThat(output.toString()).contains(errorSpan2.getSpanContext().getSpanId());
325325
}
326326

327327
@Test

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,9 @@ public String toString() {
514514
}
515515
StringBuilder sb = new StringBuilder();
516516
sb.append("RecordEventsReadableSpan{traceId=");
517-
sb.append(context.getTraceIdHex());
517+
sb.append(context.getTraceId());
518518
sb.append(", spanId=");
519-
sb.append(context.getSpanIdHex());
519+
sb.append(context.getSpanId());
520520
sb.append(", parentSpanContext=");
521521
sb.append(parentSpanContext);
522522
sb.append(", name=");

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public Span startSpan() {
174174
traceId = idGenerator.generateTraceId();
175175
} else {
176176
// New child span.
177-
traceId = parentSpanContext.getTraceIdHex();
177+
traceId = parentSpanContext.getTraceId();
178178
}
179179
List<LinkData> immutableLinks =
180180
links == null ? Collections.emptyList() : Collections.unmodifiableList(links);

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface SpanData {
3030
* @return the trace id.
3131
*/
3232
default String getTraceId() {
33-
return getSpanContext().getTraceIdHex();
33+
return getSpanContext().getTraceId();
3434
}
3535

3636
/**
@@ -39,7 +39,7 @@ default String getTraceId() {
3939
* @return the span id.
4040
*/
4141
default String getSpanId() {
42-
return getSpanContext().getSpanIdHex();
42+
return getSpanContext().getSpanId();
4343
}
4444

4545
/**
@@ -55,7 +55,7 @@ default String getSpanId() {
5555
* @return the parent {@code SpanId} or an invalid SpanId if this is a root {@code Span}.
5656
*/
5757
default String getParentSpanId() {
58-
return getParentSpanContext().getSpanIdHex();
58+
return getParentSpanContext().getSpanId();
5959
}
6060

6161
/**

0 commit comments

Comments
 (0)