Skip to content

Sets ThreadLocalCurrentTraceContext as default for Brave Tracing in SampleTestRunner #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Sets ThreadLocalCurrentTraceContext as default for Brave Tracing in SampleTestRunner #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...n-test/src/main/java/io/micrometer/tracing/test/reporter/inmemory/InMemoryBraveSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import brave.Tracing;
import brave.http.HttpTracing;
import brave.propagation.ThreadLocalCurrentTraceContext;
import brave.sampler.Sampler;
import brave.test.TestSpanHandler;
import io.micrometer.observation.Observation;
Expand Down Expand Up @@ -316,7 +317,8 @@ private static Tracer tracer(Tracing tracing) {

private static Tracing tracing(TestSpanHandler testSpanHandler, String applicationName) {
return Tracing.newBuilder().localServiceName(applicationName).addSpanHandler(testSpanHandler)
.sampler(Sampler.ALWAYS_SAMPLE).build();
.currentTraceContext(ThreadLocalCurrentTraceContext.create()).sampler(Sampler.ALWAYS_SAMPLE)
.build();
}

private static HttpTracing httpTracing(Tracing tracing) {
Expand Down
4 changes: 3 additions & 1 deletion ...test/src/main/java/io/micrometer/tracing/test/reporter/wavefront/WavefrontBraveSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import brave.Tracing;
import brave.handler.SpanHandler;
import brave.http.HttpTracing;
import brave.propagation.ThreadLocalCurrentTraceContext;
import brave.sampler.Sampler;
import brave.test.TestSpanHandler;
import com.wavefront.sdk.common.application.ApplicationTags;
Expand Down Expand Up @@ -404,7 +405,8 @@ private static Tracer tracer(Tracing tracing) {

private static Tracing tracing(SpanHandler spanHandler, TestSpanHandler testSpanHandler) {
return Tracing.newBuilder().traceId128Bit(true).addSpanHandler(spanHandler).addSpanHandler(testSpanHandler)
.sampler(Sampler.ALWAYS_SAMPLE).build();
.currentTraceContext(ThreadLocalCurrentTraceContext.create()).sampler(Sampler.ALWAYS_SAMPLE)
.build();
}

private static HttpTracing httpTracing(Tracing tracing) {
Expand Down
30 changes: 13 additions & 17 deletions ...ation-test/src/main/java/io/micrometer/tracing/test/reporter/zipkin/ZipkinBraveSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,16 @@

package io.micrometer.tracing.test.reporter.zipkin;

import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import brave.Tracing;
import brave.http.HttpTracing;
import brave.propagation.ThreadLocalCurrentTraceContext;
import brave.sampler.Sampler;
import brave.test.TestSpanHandler;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.tracing.Tracer;
import io.micrometer.tracing.brave.bridge.BraveBaggageManager;
import io.micrometer.tracing.brave.bridge.BraveCurrentTraceContext;
import io.micrometer.tracing.brave.bridge.BraveFinishedSpan;
import io.micrometer.tracing.brave.bridge.BraveHttpClientHandler;
import io.micrometer.tracing.brave.bridge.BraveHttpServerHandler;
import io.micrometer.tracing.brave.bridge.BravePropagator;
import io.micrometer.tracing.brave.bridge.BraveTracer;
import io.micrometer.tracing.brave.bridge.*;
import io.micrometer.tracing.exporter.FinishedSpan;
import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
import io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler;
Expand All @@ -55,6 +41,15 @@
import zipkin2.reporter.brave.ZipkinSpanHandler;
import zipkin2.reporter.urlconnection.URLConnectionSender;

import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;

/**
* Provides Zipkin setup with Brave.
*
Expand Down Expand Up @@ -392,7 +387,8 @@ private static Tracing tracing(AsyncReporter<Span> reporter, TestSpanHandler tes
String applicationName) {
return Tracing.newBuilder().localServiceName(applicationName)
.addSpanHandler(ZipkinSpanHandler.newBuilder(reporter).build()).addSpanHandler(testSpanHandler)
.sampler(Sampler.ALWAYS_SAMPLE).build();
.currentTraceContext(ThreadLocalCurrentTraceContext.create()).sampler(Sampler.ALWAYS_SAMPLE)
.build();
}

private static HttpTracing httpTracing(Tracing tracing) {
Expand Down