Skip to content

Fix flaky jaeger test by fully closing managed channel to isolate tests #8322

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
jack-berg merged 3 commits into from
Apr 23, 2026
Merged

Fix flaky jaeger test by fully closing managed channel to isolate tests #8322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c6cafc
Fix flaky jaeger test by fully closing managed channel to isolate tests
jack-berg Apr 23, 2026
3d5f192
Await shutdown, fix peek/poll bug
jack-berg Apr 23, 2026
1434a41
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg Apr 23, 2026
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
2 changes: 1 addition & 1 deletion ...rc/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@ public static JaegerRemoteSamplerBuilder builder() {
public void close() {
pollFuture.cancel(true);
pollExecutor.shutdownNow();
grpcSender.shutdown();
grpcSender.shutdown().join(10, TimeUnit.SECONDS);
Copy link
Copy Markdown
Member Author

@jack-berg jack-berg Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is consistent with SpanExporter, MetricExporter, LogRecordExporter close implementation.

JaegerREmoteSamplerTest would be prone to the same test flake as JaegerRemoteSamplerGrpcNettyTest if it weren't for a bug in which the server called grpcErrors.peek() instead of poll(). This causes JaegerRemoteSamplerTest to avoid test flakes by ignoring the error queue and just returning the same error over and over.

I fixed the peek / poll but, but need to make sure shutdown is thorough to isolate test cases, else JaegerRemoteSamplerTest will start being flaky.

}
}
3 changes: 2 additions & 1 deletion ...est/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,10 @@ public void getSamplingStrategy(
io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2
.Sampling.SamplingStrategyResponse>
responseObserver) {
ArmeriaStatusException grpcError = grpcErrors.peek();
ArmeriaStatusException grpcError = grpcErrors.poll();
if (grpcError != null) {
responseObserver.onError(grpcError);
return;
}
Sampling.SamplingStrategyResponse response = responses.poll();
// use default
Expand Down
16 changes: 15 additions & 1 deletion ...io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerGrpcNettyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,21 @@ public void before() {
private ManagedChannel managedChannel() {
ManagedChannel channel =
ManagedChannelBuilder.forTarget(server.httpUri().getAuthority()).usePlaintext().build();
cleanup.addCloseable(channel::shutdownNow);
cleanup.addCloseable(
() -> {
// Graceful shutdown ensures the server has processed all in-flight requests before
// the next test starts, preventing stale requests from consuming errors added to the
// queue by a subsequent test.
channel.shutdown();
try {
if (!channel.awaitTermination(10, TimeUnit.SECONDS)) {
channel.shutdownNow();
}
} catch (InterruptedException e) {
channel.shutdownNow();
Thread.currentThread().interrupt();
}
});
return channel;
}

Expand Down
Loading