From c733fef8dfdbd6135322708baf9bebc04f3cf85c Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Fri, 19 Nov 2021 12:39:10 +0000 Subject: [PATCH 1/2] evict okhttp connections on shutdown --- .../exporter/otlp/internal/grpc/OkHttpGrpcExporter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/grpc/OkHttpGrpcExporter.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/grpc/OkHttpGrpcExporter.java index bc38c980d7d..bdd92904f40 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/grpc/OkHttpGrpcExporter.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/grpc/OkHttpGrpcExporter.java @@ -222,6 +222,7 @@ private static String grpcMessage(Response response) { public CompletableResultCode shutdown() { client.dispatcher().cancelAll(); client.dispatcher().executorService().shutdownNow(); + client.connectionPool().evictAll(); this.seen.unbind(); this.success.unbind(); this.failed.unbind(); From 12f541fb9c225742b199540efa89c0e42d2cb272 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Tue, 23 Nov 2021 11:15:32 +0900 Subject: [PATCH 2/2] Evict in HTTP exporter as well --- .../exporter/otlp/internal/okhttp/OkHttpExporter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/okhttp/OkHttpExporter.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/okhttp/OkHttpExporter.java index f9ea7e2fafa..b888e67d5fc 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/okhttp/OkHttpExporter.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/okhttp/OkHttpExporter.java @@ -127,6 +127,7 @@ public CompletableResultCode shutdown() { final CompletableResultCode result = CompletableResultCode.ofSuccess(); client.dispatcher().cancelAll(); client.dispatcher().executorService().shutdownNow(); + client.connectionPool().evictAll(); exporterMetrics.unbind(); return result; }