Skip to content

Commit 3d5f192

Browse files
committed
Await shutdown, fix peek/poll bug
1 parent 0c6cafc commit 3d5f192

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,6 @@ public static JaegerRemoteSamplerBuilder builder() {
185185
public void close() {
186186
pollFuture.cancel(true);
187187
pollExecutor.shutdownNow();
188-
grpcSender.shutdown();
188+
grpcSender.shutdown().join(10, TimeUnit.SECONDS);
189189
}
190190
}

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ public void getSamplingStrategy(
103103
io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2
104104
.Sampling.SamplingStrategyResponse>
105105
responseObserver) {
106-
ArmeriaStatusException grpcError = grpcErrors.peek();
106+
ArmeriaStatusException grpcError = grpcErrors.poll();
107107
if (grpcError != null) {
108108
responseObserver.onError(grpcError);
109+
return;
109110
}
110111
Sampling.SamplingStrategyResponse response = responses.poll();
111112
// use default

0 commit comments

Comments
 (0)