open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: make invalid span context public (#896)

This commit is contained in:
Uladzislau Kiva 2020-02-21 00:05:59 +03:00 committed by GitHub
parent aadea3d5a1
commit 1c7da07432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/io/opentelemetry/trace/SpanContext.java
View File

@ -44,7 +44,7 @@ public abstract class SpanContext {
*
* @return the invalid {@code SpanContext}.
*/
static SpanContext getInvalid() {
public static SpanContext getInvalid() {
return INVALID;
}

8
api/src/main/java/io/opentelemetry/trace/propagation/HttpTraceContext.java
View File

@ -62,12 +62,6 @@ public class HttpTraceContext implements HttpTextFormat<SpanContext> {
private static final char TRACESTATE_ENTRY_DELIMITER = ',';
private static final Pattern TRACESTATE_ENTRY_DELIMITER_SPLIT_PATTERN =
Pattern.compile("[ \t]*" + TRACESTATE_ENTRY_DELIMITER + "[ \t]*");
static final SpanContext INVALID_SPAN_CONTEXT =
SpanContext.create(
TraceId.getInvalid(),
SpanId.getInvalid(),
TraceFlags.getDefault(),
TraceState.getDefault());
@Override
public List<String> fields() {
@ -116,7 +110,7 @@ public class HttpTraceContext implements HttpTextFormat<SpanContext> {
TraceFlags traceFlags;
String traceparent = getter.get(carrier, TRACE_PARENT);
if (traceparent == null) {
return INVALID_SPAN_CONTEXT;
return SpanContext.getInvalid();
}
try {
// TODO(bdrutu): Do we need to verify that version is hex and that for the version

3
api/src/test/java/io/opentelemetry/trace/propagation/HttpTraceContextTest.java
View File

@ -308,7 +308,6 @@ public class HttpTraceContextTest {
@Test
public void extract_emptyCarrier() {
Map<String, String> emptyHeaders = new HashMap<>();
assertThat(httpTraceContext.extract(emptyHeaders, getter))
.isEqualTo(HttpTraceContext.INVALID_SPAN_CONTEXT);
assertThat(httpTraceContext.extract(emptyHeaders, getter)).isEqualTo(SpanContext.getInvalid());
}
}

9
sdk/src/test/java/io/opentelemetry/sdk/trace/data/SpanDataTest.java
View File

@ -27,9 +27,7 @@ import io.opentelemetry.trace.Span.Kind;
import io.opentelemetry.trace.SpanContext;
import io.opentelemetry.trace.SpanId;
import io.opentelemetry.trace.Status;
import io.opentelemetry.trace.TraceFlags;
import io.opentelemetry.trace.TraceId;
import io.opentelemetry.trace.TraceState;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@ -96,12 +94,7 @@ public class SpanDataTest {
}
private static Link emptyLink() {
return SpanData.Link.create(
SpanContext.create(
TraceId.getInvalid(),
SpanId.getInvalid(),
TraceFlags.getDefault(),
TraceState.getDefault()));
return SpanData.Link.create(SpanContext.getInvalid());
}
private static SpanData.Builder createBasicSpanBuilder() {

7
sdk/src/test/java/io/opentelemetry/sdk/trace/export/SimpleSpansProcessorTest.java
View File

@ -58,12 +58,7 @@ public class SimpleSpansProcessorTest {
SpanId.getInvalid(),
TraceFlags.builder().setIsSampled(true).build(),
TraceState.builder().build());
private static final SpanContext NOT_SAMPLED_SPAN_CONTEXT =
SpanContext.create(
TraceId.getInvalid(),
SpanId.getInvalid(),
TraceFlags.builder().build(),
TraceState.builder().build());
private static final SpanContext NOT_SAMPLED_SPAN_CONTEXT = SpanContext.getInvalid();
private SimpleSpansProcessor simpleSampledSpansProcessor;