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

Fix build breakage due to conflicting merges. (#1844) 

* Fix build breakage due to conflicting merges.

* Test too
This commit is contained in:
Anuraag Agrawal 2020-10-21 13:33:00 +09:00 committed by GitHub
parent f20b3d73a9
commit 9efb503544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/SamplersTest.java
View File

@ -20,7 +20,6 @@ import io.opentelemetry.trace.SpanContext;
import io.opentelemetry.trace.TraceFlags;
import io.opentelemetry.trace.TraceId;
import io.opentelemetry.trace.TraceState;
import io.opentelemetry.trace.TracingContextUtils;
import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.Test;
@ -36,27 +35,26 @@ class SamplersTest {
private final TraceState traceState = TraceState.builder().build();
private final SpanContext sampledSpanContext =
SpanContext.create(traceId, parentSpanId, TraceFlags.getSampled(), traceState);
private final Context sampledParentContext =
TracingContextUtils.withSpan(Span.wrap(sampledSpanContext), Context.root());
private final Context sampledParentContext = Context.root().with(Span.wrap(sampledSpanContext));
private final Context notSampledParentContext =
TracingContextUtils.withSpan(
Span.wrap(SpanContext.create(traceId, parentSpanId, TraceFlags.getDefault(), traceState)),
Context.root());
private final Context invalidParentContext =
TracingContextUtils.withSpan(Span.getInvalid(), Context.current());
Context.root()
.with(
Span.wrap(
SpanContext.create(traceId, parentSpanId, TraceFlags.getDefault(), traceState)));
private final Context invalidParentContext = Context.root().with(Span.getInvalid());
private final Link sampledParentLink = Link.create(sampledSpanContext);
private final Context sampledRemoteParentContext =
TracingContextUtils.withSpan(
Span.wrap(
SpanContext.createFromRemoteParent(
traceId, parentSpanId, TraceFlags.getSampled(), traceState)),
Context.root());
Context.root()
.with(
Span.wrap(
SpanContext.createFromRemoteParent(
traceId, parentSpanId, TraceFlags.getSampled(), traceState)));
private final Context notSampledRemoteParentContext =
TracingContextUtils.withSpan(
Span.wrap(
SpanContext.createFromRemoteParent(
traceId, parentSpanId, TraceFlags.getDefault(), traceState)),
Context.root());
Context.root()
.with(
Span.wrap(
SpanContext.createFromRemoteParent(
traceId, parentSpanId, TraceFlags.getDefault(), traceState)));
@Test
void emptySamplingDecision() {

15
sdk_extensions/jaeger_remote_sampler/src/test/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/RateLimitingSamplerTest.java
View File

@ -18,7 +18,6 @@ import io.opentelemetry.trace.SpanId;
import io.opentelemetry.trace.TraceFlags;
import io.opentelemetry.trace.TraceId;
import io.opentelemetry.trace.TraceState;
import io.opentelemetry.trace.TracingContextUtils;
import java.util.Collections;
import org.junit.jupiter.api.Test;
@ -30,13 +29,15 @@ class RateLimitingSamplerTest {
private final String parentSpanId = SpanId.fromLong(250);
private final TraceState traceState = TraceState.builder().build();
private final Context sampledSpanContext =
TracingContextUtils.withSpan(
Span.wrap(SpanContext.create(traceId, parentSpanId, TraceFlags.getSampled(), traceState)),
Context.root());
Context.root()
.with(
Span.wrap(
SpanContext.create(traceId, parentSpanId, TraceFlags.getSampled(), traceState)));
private final Context notSampledSpanContext =
TracingContextUtils.withSpan(
Span.wrap(SpanContext.create(traceId, parentSpanId, TraceFlags.getDefault(), traceState)),
Context.root());
Context.root()
.with(
Span.wrap(
SpanContext.create(traceId, parentSpanId, TraceFlags.getDefault(), traceState)));
@Test
void alwaysSampleSampledContext() {