From 727850e94faa1edcb45c469620e7fa1f9baecf60 Mon Sep 17 00:00:00 2001 From: jack-berg <34418638+jack-berg@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:33:03 -0600 Subject: [PATCH] Shutdown ManagedChannel resources in tests (#5114) --- .../OtlpGrpcNettyMetricExporterTest.java | 9 +++--- .../trace/OtlpGrpcNettySpanExporterTest.java | 9 +++--- ...OtlpGrpcNettyShadedMetricExporterTest.java | 9 +++--- .../OtlpGrpcNettyShadedSpanExporterTest.java | 9 +++--- .../OtlpGrpcOkHttpMetricExporterTest.java | 9 +++--- .../trace/OtlpGrpcOkHttpSpanExporterTest.java | 9 +++--- .../OtlpGrpcNettyLogRecordExporterTest.java | 9 +++--- ...pGrpcNettyShadedLogRecordExporterTest.java | 9 +++--- ...pGrpcNettyOkHttpLogRecordExporterTest.java | 9 +++--- .../AbstractGrpcTelemetryExporterTest.java | 28 ++++++++++++------- 10 files changed, 63 insertions(+), 46 deletions(-) diff --git a/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java b/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java index b2468379c15..1f3c46219ac 100644 --- a/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java +++ b/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -43,11 +44,11 @@ void testSetRetryPolicyOnDelegate() { @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcMetricExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcMetricExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java b/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java index 956a73354cb..8e0c3134a41 100644 --- a/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java +++ b/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -43,11 +44,11 @@ void testSetRetryPolicyOnDelegate() { @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcSpanExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcSpanExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java b/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java index 5a143d7a08c..26d2d509ba7 100644 --- a/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java +++ b/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -31,11 +32,11 @@ class OtlpGrpcNettyShadedMetricExporterTest @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcMetricExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcMetricExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java b/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java index 2be7d950171..191708af242 100644 --- a/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java +++ b/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -31,11 +32,11 @@ class OtlpGrpcNettyShadedSpanExporterTest @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcSpanExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcSpanExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java b/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java index 4aeb1191cb2..f18a5e715d2 100644 --- a/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java +++ b/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -31,11 +32,11 @@ class OtlpGrpcOkHttpMetricExporterTest @Test @SuppressWarnings("deprecation") // testing deprecated featurea void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcMetricExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcMetricExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java b/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java index 7b7f338f21f..e41bfc5660a 100644 --- a/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java +++ b/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -31,11 +32,11 @@ class OtlpGrpcOkHttpSpanExporterTest @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcSpanExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcSpanExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyLogRecordExporterTest.java b/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyLogRecordExporterTest.java index 85d9e67235e..82485750238 100644 --- a/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyLogRecordExporterTest.java +++ b/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyLogRecordExporterTest.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -43,11 +44,11 @@ void testSetRetryPolicyOnDelegate() { @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcLogRecordExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcLogRecordExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyShadedLogRecordExporterTest.java b/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyShadedLogRecordExporterTest.java index 502e6b64e34..5789d33653f 100644 --- a/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyShadedLogRecordExporterTest.java +++ b/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyShadedLogRecordExporterTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -31,11 +32,11 @@ class OtlpGrpcNettyShadedLogRecordExporterTest @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcLogRecordExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcLogRecordExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyOkHttpLogRecordExporterTest.java b/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyOkHttpLogRecordExporterTest.java index c5fc358915d..9923df2b1ea 100644 --- a/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyOkHttpLogRecordExporterTest.java +++ b/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyOkHttpLogRecordExporterTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.opentelemetry.exporter.internal.grpc.UpstreamGrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; @@ -31,11 +32,11 @@ class OtlpGrpcNettyOkHttpLogRecordExporterTest @Test @SuppressWarnings("deprecation") // testing deprecated feature void usingGrpc() throws Exception { - try (Closeable exporter = - OtlpGrpcLogRecordExporter.builder() - .setChannel(InProcessChannelBuilder.forName("test").build()) - .build()) { + ManagedChannel channel = InProcessChannelBuilder.forName("test").build(); + try (Closeable exporter = OtlpGrpcLogRecordExporter.builder().setChannel(channel).build()) { assertThat(exporter).extracting("delegate").isInstanceOf(UpstreamGrpcExporter.class); + } finally { + channel.shutdownNow(); } } diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java index 6cdde874d41..8708170e00c 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java @@ -242,22 +242,30 @@ void multipleItems() { void compressionWithNone() { TelemetryExporter exporter = exporterBuilder().setEndpoint(server.httpUri().toString()).setCompression("none").build(); - // UpstreamGrpcExporter doesn't support compression, so we skip the assertion - assumeThat(exporter.unwrap()) - .extracting("delegate") - .isNotInstanceOf(UpstreamGrpcExporter.class); - assertThat(exporter.unwrap()).extracting("delegate.compressionEnabled").isEqualTo(false); + try { + // UpstreamGrpcExporter doesn't support compression, so we skip the assertion + assumeThat(exporter.unwrap()) + .extracting("delegate") + .isNotInstanceOf(UpstreamGrpcExporter.class); + assertThat(exporter.unwrap()).extracting("delegate.compressionEnabled").isEqualTo(false); + } finally { + exporter.shutdown(); + } } @Test void compressionWithGzip() { TelemetryExporter exporter = exporterBuilder().setEndpoint(server.httpUri().toString()).setCompression("gzip").build(); - // UpstreamGrpcExporter doesn't support compression, so we skip the assertion - assumeThat(exporter.unwrap()) - .extracting("delegate") - .isNotInstanceOf(UpstreamGrpcExporter.class); - assertThat(exporter.unwrap()).extracting("delegate.compressionEnabled").isEqualTo(true); + try { + // UpstreamGrpcExporter doesn't support compression, so we skip the assertion + assumeThat(exporter.unwrap()) + .extracting("delegate") + .isNotInstanceOf(UpstreamGrpcExporter.class); + assertThat(exporter.unwrap()).extracting("delegate.compressionEnabled").isEqualTo(true); + } finally { + exporter.shutdown(); + } } @Test