diff --git a/api/all/src/jmh/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagatorBenchmark.java b/api/all/src/jmh/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagatorBenchmark.java index 9443d67054..e1273720ce 100644 --- a/api/all/src/jmh/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagatorBenchmark.java +++ b/api/all/src/jmh/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagatorBenchmark.java @@ -76,8 +76,8 @@ public class W3CTraceContextPropagatorBenchmark { SpanContext current = Span.fromContext(result).getSpanContext(); SpanContext clientSpanContext = SpanContext.create( - current.getTraceIdHex(), - current.getSpanIdHex(), + current.getTraceId(), + current.getSpanId(), current.getTraceFlags(), current.getTraceState()); result = Span.wrap(clientSpanContext).storeInContext(result); diff --git a/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java b/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java index ad032393b0..65d8ceb1a9 100644 --- a/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java +++ b/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java @@ -70,7 +70,7 @@ public interface SpanContext { * * @return the trace identifier associated with this {@link SpanContext} as lowercase hex. */ - String getTraceIdHex(); + String getTraceId(); /** * Returns the trace identifier associated with this {@link SpanContext} as 16-byte array. @@ -78,7 +78,7 @@ public interface SpanContext { * @return the trace identifier associated with this {@link SpanContext} as 16-byte array. */ default byte[] getTraceIdBytes() { - return BigendianEncoding.bytesFromBase16(getTraceIdHex(), TraceId.getLength()); + return BigendianEncoding.bytesFromBase16(getTraceId(), TraceId.getLength()); } /** @@ -88,7 +88,7 @@ public interface SpanContext { * @return the span identifier associated with this {@link SpanContext} as 16 character lowercase * hex (base16) String. */ - String getSpanIdHex(); + String getSpanId(); /** * Returns the span identifier associated with this {@link SpanContext} as 8-byte array. @@ -96,7 +96,7 @@ public interface SpanContext { * @return the span identifier associated with this {@link SpanContext} as 8-byte array. */ default byte[] getSpanIdBytes() { - return BigendianEncoding.bytesFromBase16(getSpanIdHex(), SpanId.getLength()); + return BigendianEncoding.bytesFromBase16(getSpanId(), SpanId.getLength()); } /** Whether the span in this context is sampled. */ @@ -124,7 +124,7 @@ public interface SpanContext { * @return {@code true} if this {@code SpanContext} is valid. */ default boolean isValid() { - return TraceId.isValid(getTraceIdHex()) && SpanId.isValid(getSpanIdHex()); + return TraceId.isValid(getTraceId()) && SpanId.isValid(getSpanId()); } /** diff --git a/api/all/src/main/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagator.java b/api/all/src/main/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagator.java index e4d97460bb..f59e248730 100644 --- a/api/all/src/main/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagator.java +++ b/api/all/src/main/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagator.java @@ -111,14 +111,14 @@ public final class W3CTraceContextPropagator implements TextMapPropagator { chars[1] = VERSION.charAt(1); chars[2] = TRACEPARENT_DELIMITER; - String traceId = spanContext.getTraceIdHex(); + String traceId = spanContext.getTraceId(); for (int i = 0; i < traceId.length(); i++) { chars[TRACE_ID_OFFSET + i] = traceId.charAt(i); } chars[SPAN_ID_OFFSET - 1] = TRACEPARENT_DELIMITER; - String spanId = spanContext.getSpanIdHex(); + String spanId = spanContext.getSpanId(); for (int i = 0; i < spanId.length(); i++) { chars[SPAN_ID_OFFSET + i] = spanId.charAt(i); } @@ -177,8 +177,8 @@ public final class W3CTraceContextPropagator implements TextMapPropagator { try { TraceState traceState = extractTraceState(traceStateHeader); return SpanContext.createFromRemoteParent( - contextFromParentHeader.getTraceIdHex(), - contextFromParentHeader.getSpanIdHex(), + contextFromParentHeader.getTraceId(), + contextFromParentHeader.getSpanId(), contextFromParentHeader.getTraceFlags(), traceState); } catch (IllegalArgumentException e) { diff --git a/api/all/src/test/java/io/opentelemetry/api/trace/SpanContextTest.java b/api/all/src/test/java/io/opentelemetry/api/trace/SpanContextTest.java index fc3879380f..ebe3b21870 100644 --- a/api/all/src/test/java/io/opentelemetry/api/trace/SpanContextTest.java +++ b/api/all/src/test/java/io/opentelemetry/api/trace/SpanContextTest.java @@ -30,8 +30,8 @@ class SpanContextTest { @Test void invalidSpanContext() { - assertThat(SpanContext.getInvalid().getTraceIdHex()).isEqualTo(TraceId.getInvalid()); - assertThat(SpanContext.getInvalid().getSpanIdHex()).isEqualTo(SpanId.getInvalid()); + assertThat(SpanContext.getInvalid().getTraceId()).isEqualTo(TraceId.getInvalid()); + assertThat(SpanContext.getInvalid().getSpanId()).isEqualTo(SpanId.getInvalid()); assertThat(SpanContext.getInvalid().getTraceFlags()).isEqualTo(TraceFlags.getDefault()); } @@ -60,14 +60,14 @@ class SpanContextTest { @Test void getTraceId() { - assertThat(first.getTraceIdHex()).isEqualTo(FIRST_TRACE_ID); - assertThat(second.getTraceIdHex()).isEqualTo(SECOND_TRACE_ID); + assertThat(first.getTraceId()).isEqualTo(FIRST_TRACE_ID); + assertThat(second.getTraceId()).isEqualTo(SECOND_TRACE_ID); } @Test void getSpanId() { - assertThat(first.getSpanIdHex()).isEqualTo(FIRST_SPAN_ID); - assertThat(second.getSpanIdHex()).isEqualTo(SECOND_SPAN_ID); + assertThat(first.getSpanId()).isEqualTo(FIRST_SPAN_ID); + assertThat(second.getSpanId()).isEqualTo(SECOND_SPAN_ID); } @Test diff --git a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java index 8f4dd3abe4..da8baf8c7f 100644 --- a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java +++ b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java @@ -227,9 +227,9 @@ final class Adapter { // https://github.com/open-telemetry/opentelemetry-java/pull/481/files#r312577862 return new SpanRef( SpanRefType.FOLLOWS_FROM, - traceIdAsLongLow(link.getSpanContext().getTraceIdHex()), - traceIdAsLongHigh(link.getSpanContext().getTraceIdHex()), - spanIdAsLong(link.getSpanContext().getSpanIdHex())); + traceIdAsLongLow(link.getSpanContext().getTraceId()), + traceIdAsLongHigh(link.getSpanContext().getTraceId()), + spanIdAsLong(link.getSpanContext().getSpanId())); } private static long traceIdAsLongHigh(String traceId) { diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXrayPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXrayPropagator.java index d0dc574593..06bce4ffd0 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXrayPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXrayPropagator.java @@ -90,14 +90,14 @@ public final class AwsXrayPropagator implements TextMapPropagator { SpanContext spanContext = span.getSpanContext(); - String otTraceId = spanContext.getTraceIdHex(); + String otTraceId = spanContext.getTraceId(); String xrayTraceId = TRACE_ID_VERSION + TRACE_ID_DELIMITER + otTraceId.substring(0, TRACE_ID_FIRST_PART_LENGTH) + TRACE_ID_DELIMITER + otTraceId.substring(TRACE_ID_FIRST_PART_LENGTH); - String parentId = spanContext.getSpanIdHex(); + String parentId = spanContext.getSpanId(); char samplingFlag = spanContext.isSampled() ? IS_SAMPLED : NOT_SAMPLED; // TODO: Add OT trace state to the X-Ray trace header diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java index 2298426ae1..5c9dc42cd3 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java @@ -31,8 +31,8 @@ final class B3PropagatorInjectorMultipleHeaders implements B3PropagatorInjector sampled = Common.TRUE_INT; } - setter.set(carrier, B3Propagator.TRACE_ID_HEADER, spanContext.getTraceIdHex()); - setter.set(carrier, B3Propagator.SPAN_ID_HEADER, spanContext.getSpanIdHex()); + setter.set(carrier, B3Propagator.TRACE_ID_HEADER, spanContext.getTraceId()); + setter.set(carrier, B3Propagator.SPAN_ID_HEADER, spanContext.getSpanId()); setter.set(carrier, B3Propagator.SAMPLED_HEADER, sampled); } } diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java index 08f3336de5..da3e88e4a9 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java @@ -36,11 +36,11 @@ final class B3PropagatorInjectorSingleHeader implements B3PropagatorInjector { } char[] chars = new char[COMBINED_HEADER_SIZE]; - String traceId = spanContext.getTraceIdHex(); + String traceId = spanContext.getTraceId(); traceId.getChars(0, traceId.length(), chars, 0); chars[SPAN_ID_OFFSET - 1] = B3Propagator.COMBINED_HEADER_DELIMITER_CHAR; - String spanId = spanContext.getSpanIdHex(); + String spanId = spanContext.getSpanId(); System.arraycopy(spanId.toCharArray(), 0, chars, SPAN_ID_OFFSET, SpanId.getLength()); chars[SAMPLED_FLAG_OFFSET - 1] = B3Propagator.COMBINED_HEADER_DELIMITER_CHAR; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java index e3b2c5a67a..242f465d7e 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java @@ -95,13 +95,13 @@ public final class JaegerPropagator implements TextMapPropagator { char[] chars = new char[PROPAGATION_HEADER_SIZE]; - String traceId = spanContext.getTraceIdHex(); + String traceId = spanContext.getTraceId(); for (int i = 0; i < traceId.length(); i++) { chars[i] = traceId.charAt(i); } chars[SPAN_ID_OFFSET - 1] = PROPAGATION_HEADER_DELIMITER; - String spanId = spanContext.getSpanIdHex(); + String spanId = spanContext.getSpanId(); for (int i = 0; i < spanId.length(); i++) { chars[SPAN_ID_OFFSET + i] = spanId.charAt(i); } diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java index 5f55edf77b..9c3b8fdb5f 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java @@ -64,8 +64,8 @@ public final class OtTracerPropagator implements TextMapPropagator { // Lightstep trace id MUST be 64-bits therefore OpenTelemetry trace id is truncated to 64-bits // by retaining least significant (right-most) bits. setter.set( - carrier, TRACE_ID_HEADER, spanContext.getTraceIdHex().substring(TraceId.getLength() / 2)); - setter.set(carrier, SPAN_ID_HEADER, spanContext.getSpanIdHex()); + carrier, TRACE_ID_HEADER, spanContext.getTraceId().substring(TraceId.getLength() / 2)); + setter.set(carrier, SPAN_ID_HEADER, spanContext.getSpanId()); setter.set(carrier, SAMPLED_HEADER, String.valueOf(spanContext.isSampled())); // Baggage is only injected if there is a valid SpanContext diff --git a/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java b/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java index 3c05ee6119..47157a5274 100644 --- a/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java +++ b/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java @@ -50,8 +50,8 @@ class SpanConverter { static SpanContext mapSpanContext(io.opentelemetry.api.trace.SpanContext otelSpanContext) { return SpanContext.create( - TraceId.fromLowerBase16(otelSpanContext.getTraceIdHex()), - SpanId.fromLowerBase16(otelSpanContext.getSpanIdHex()), + TraceId.fromLowerBase16(otelSpanContext.getTraceId()), + SpanId.fromLowerBase16(otelSpanContext.getSpanId()), TraceOptions.builder().setIsSampled(otelSpanContext.isSampled()).build(), mapTracestate(otelSpanContext.getTraceState())); } diff --git a/opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/InteroperabilityTest.java b/opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/InteroperabilityTest.java index e2c4d5b5ce..91fde1b2d4 100644 --- a/opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/InteroperabilityTest.java +++ b/opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/InteroperabilityTest.java @@ -170,7 +170,7 @@ class InteroperabilityTest { assertThat(export1.size()).isEqualTo(1); SpanData spanData1 = export1.iterator().next(); assertThat(spanData1.getName()).isEqualTo("OpenCensusSpan"); - assertThat(spanData1.getLinks().get(0).getSpanContext().getSpanIdHex()) + assertThat(spanData1.getLinks().get(0).getSpanContext().getSpanId()) .isEqualTo(remoteParentSpan.getContext().getSpanId().toLowerBase16()); } @@ -237,7 +237,7 @@ class InteroperabilityTest { assertThat(export3.size()).isEqualTo(1); SpanData spanData3 = export3.iterator().next(); assertThat(spanData3.getName()).isEqualTo("OpenCensusSpan"); - assertThat(spanData3.getLinks().get(0).getSpanContext().getSpanIdHex()) + assertThat(spanData3.getLinks().get(0).getSpanContext().getSpanId()) .isEqualTo(parentLinkSpan.getContext().getSpanId().toLowerBase16()); assertThat(spanData3.getKind()).isEqualTo(SpanKind.SERVER); assertThat(spanData3.getStatus()).isEqualTo(StatusData.ok()); diff --git a/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanContextShim.java b/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanContextShim.java index 4d0d7b90bb..53db4c3868 100644 --- a/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanContextShim.java +++ b/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanContextShim.java @@ -60,12 +60,12 @@ final class SpanContextShim extends BaseShimObject implements SpanContext { @Override public String toTraceId() { - return context.getTraceIdHex(); + return context.getTraceId(); } @Override public String toSpanId() { - return context.getSpanIdHex(); + return context.getSpanId(); } @Override diff --git a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/SpanShimTest.java b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/SpanShimTest.java index d2c2a4fe7d..37a58d55ed 100644 --- a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/SpanShimTest.java +++ b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/SpanShimTest.java @@ -43,8 +43,8 @@ class SpanShimTest { SpanContextShim contextShim = (SpanContextShim) spanShim.context(); assertThat(contextShim).isNotNull(); assertThat(span.getSpanContext()).isEqualTo(contextShim.getSpanContext()); - assertThat(span.getSpanContext().getTraceIdHex().toString()).isEqualTo(contextShim.toTraceId()); - assertThat(span.getSpanContext().getSpanIdHex().toString()).isEqualTo(contextShim.toSpanId()); + assertThat(span.getSpanContext().getTraceId().toString()).isEqualTo(contextShim.toTraceId()); + assertThat(span.getSpanContext().getSpanId().toString()).isEqualTo(contextShim.toSpanId()); assertThat(contextShim.baggageItems().iterator().hasNext()).isFalse(); } diff --git a/sdk-extensions/jfr-events/src/main/java/io/opentelemetry/sdk/extension/jfr/ScopeEvent.java b/sdk-extensions/jfr-events/src/main/java/io/opentelemetry/sdk/extension/jfr/ScopeEvent.java index 1a431c9da0..cf40bb4e10 100644 --- a/sdk-extensions/jfr-events/src/main/java/io/opentelemetry/sdk/extension/jfr/ScopeEvent.java +++ b/sdk-extensions/jfr-events/src/main/java/io/opentelemetry/sdk/extension/jfr/ScopeEvent.java @@ -24,8 +24,8 @@ class ScopeEvent extends Event { private final String spanId; ScopeEvent(SpanContext spanContext) { - this.traceId = spanContext.getTraceIdHex(); - this.spanId = spanContext.getSpanIdHex(); + this.traceId = spanContext.getTraceId(); + this.spanId = spanContext.getSpanId(); } @Label("Trace Id") diff --git a/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java b/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java index 90e2236d87..530d297725 100644 --- a/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java +++ b/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java @@ -73,8 +73,8 @@ class JfrSpanProcessorTest { events.stream() .forEach( e -> { - assertEquals(span.getSpanContext().getTraceIdHex(), e.getValue("traceId")); - assertEquals(span.getSpanContext().getSpanIdHex(), e.getValue("spanId")); + assertEquals(span.getSpanContext().getTraceId(), e.getValue("traceId")); + assertEquals(span.getSpanContext().getSpanId(), e.getValue("spanId")); assertEquals(OPERATION_NAME, e.getValue("operationName")); }); @@ -113,8 +113,8 @@ class JfrSpanProcessorTest { events.stream() .forEach( e -> { - assertEquals(span.getSpanContext().getTraceIdHex(), e.getValue("traceId")); - assertEquals(span.getSpanContext().getSpanIdHex(), e.getValue("spanId")); + assertEquals(span.getSpanContext().getTraceId(), e.getValue("traceId")); + assertEquals(span.getSpanContext().getSpanId(), e.getValue("spanId")); if ("Span".equals(e.getEventType().getLabel())) { assertEquals(OPERATION_NAME, e.getValue("operationName")); } diff --git a/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java b/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java index f45ffe4b13..7eabdeb874 100644 --- a/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java +++ b/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java @@ -37,7 +37,7 @@ final class TracezSpanProcessor implements SpanProcessor { @Override public void onStart(Context parentContext, ReadWriteSpan span) { - runningSpanCache.put(span.getSpanContext().getSpanIdHex(), span); + runningSpanCache.put(span.getSpanContext().getSpanId(), span); } @Override @@ -47,7 +47,7 @@ final class TracezSpanProcessor implements SpanProcessor { @Override public void onEnd(ReadableSpan span) { - runningSpanCache.remove(span.getSpanContext().getSpanIdHex()); + runningSpanCache.remove(span.getSpanContext().getSpanId()); if (!sampled || span.getSpanContext().isSampled()) { completedSpanCache.putIfAbsent(span.getName(), new TracezSpanBuckets()); completedSpanCache.get(span.getName()).addToBucket(span); diff --git a/sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandlerTest.java b/sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandlerTest.java index b223a9df09..88ffbbe611 100644 --- a/sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandlerTest.java +++ b/sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandlerTest.java @@ -270,8 +270,8 @@ class TracezZPageHandlerTest { assertThat(output.toString()).contains("