|
18 | 18 | import io.grpc.ManagedChannel; |
19 | 19 | import io.grpc.ManagedChannelBuilder; |
20 | 20 | import io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSender; |
| 21 | +import io.opentelemetry.internal.testing.CleanupExtension; |
21 | 22 | import io.opentelemetry.internal.testing.slf4j.SuppressLogger; |
22 | 23 | import io.opentelemetry.sdk.common.export.GrpcStatusCode; |
23 | 24 | import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling; |
@@ -55,6 +56,8 @@ private static void addGrpcError(GrpcStatusCode code, @Nullable String message) |
55 | 56 | grpcErrors.add(new ArmeriaStatusException(code.getValue(), message)); |
56 | 57 | } |
57 | 58 |
|
| 59 | + @RegisterExtension CleanupExtension cleanup = new CleanupExtension(); |
| 60 | + |
58 | 61 | @RegisterExtension |
59 | 62 | LogCapturer logs = LogCapturer.create().captureForType(JaegerRemoteSampler.class, Level.TRACE); |
60 | 63 |
|
@@ -106,8 +109,11 @@ public void before() { |
106 | 109 | responses.clear(); |
107 | 110 | } |
108 | 111 |
|
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; |
111 | 117 | } |
112 | 118 |
|
113 | 119 | @Test |
@@ -148,9 +154,11 @@ void description() { |
148 | 154 |
|
149 | 155 | @Test |
150 | 156 | void initialSampler() { |
| 157 | + ManagedChannel channel = ManagedChannelBuilder.forTarget("example.com").build(); |
| 158 | + cleanup.addCloseable(channel::shutdownNow); |
151 | 159 | try (JaegerRemoteSampler sampler = |
152 | 160 | JaegerRemoteSampler.builder() |
153 | | - .setChannel(ManagedChannelBuilder.forTarget("example.com").build()) |
| 161 | + .setChannel(channel) |
154 | 162 | .setServiceName(SERVICE_NAME) |
155 | 163 | .setInitialSampler(Sampler.alwaysOn()) |
156 | 164 | .build()) { |
|
0 commit comments