Skip to content

Commit 777213e

Browse files
authored
Cleanup managed channel instances in jaeger remote sampler tests (open-telemetry#8183)
1 parent de07b70 commit 777213e

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

sdk-extensions/jaeger-remote-sampler/src/testGrpcNetty/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerGrpcNettyTest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.grpc.ManagedChannel;
1919
import io.grpc.ManagedChannelBuilder;
2020
import io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSender;
21+
import io.opentelemetry.internal.testing.CleanupExtension;
2122
import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
2223
import io.opentelemetry.sdk.common.export.GrpcStatusCode;
2324
import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling;
@@ -55,6 +56,8 @@ private static void addGrpcError(GrpcStatusCode code, @Nullable String message)
5556
grpcErrors.add(new ArmeriaStatusException(code.getValue(), message));
5657
}
5758

59+
@RegisterExtension CleanupExtension cleanup = new CleanupExtension();
60+
5861
@RegisterExtension
5962
LogCapturer logs = LogCapturer.create().captureForType(JaegerRemoteSampler.class, Level.TRACE);
6063

@@ -106,8 +109,11 @@ public void before() {
106109
responses.clear();
107110
}
108111

109-
private static ManagedChannel managedChannel() {
110-
return ManagedChannelBuilder.forTarget(server.httpUri().getAuthority()).usePlaintext().build();
112+
private ManagedChannel managedChannel() {
113+
ManagedChannel channel =
114+
ManagedChannelBuilder.forTarget(server.httpUri().getAuthority()).usePlaintext().build();
115+
cleanup.addCloseable(channel::shutdownNow);
116+
return channel;
111117
}
112118

113119
@Test
@@ -148,9 +154,11 @@ void description() {
148154

149155
@Test
150156
void initialSampler() {
157+
ManagedChannel channel = ManagedChannelBuilder.forTarget("example.com").build();
158+
cleanup.addCloseable(channel::shutdownNow);
151159
try (JaegerRemoteSampler sampler =
152160
JaegerRemoteSampler.builder()
153-
.setChannel(ManagedChannelBuilder.forTarget("example.com").build())
161+
.setChannel(channel)
154162
.setServiceName(SERVICE_NAME)
155163
.setInitialSampler(Sampler.alwaysOn())
156164
.build()) {

0 commit comments

Comments
 (0)