Merge pull request #41438 from geoand/#41351

Avoid exporter related exceptions when application has been shutdown
quarkusio · Jun 26, 2024 · 48c21c8 · 48c21c8
2 parents ec71cc9 + 39fd819
commit 48c21c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...ntime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/VertxGrpcExporter.java b/...ntime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/VertxGrpcExporter.java
@@ -139,6 +139,10 @@ private void failOnClientRequest(int numItems, Throwable t, CompletableResultCod
 
     @Override
     public CompletableResultCode export(Collection<SpanData> spans) {
+        if (isShutdown.get()) {
+            return CompletableResultCode.ofFailure();
+        }
+
         TraceRequestMarshaler request = TraceRequestMarshaler.create(spans);
 
         return export(request, spans.size());

diff --git a/...ntime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/VertxHttpExporter.java b/...ntime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/VertxHttpExporter.java
@@ -44,13 +44,18 @@ final class VertxHttpExporter implements SpanExporter {
     private static final int MAX_ATTEMPTS = 3;
 
     private final HttpExporter<TraceRequestMarshaler> delegate;
+    private final AtomicBoolean isShutdown = new AtomicBoolean();
 
     VertxHttpExporter(HttpExporter<TraceRequestMarshaler> delegate) {
         this.delegate = delegate;
     }
 
     @Override
     public CompletableResultCode export(Collection<SpanData> spans) {
+        if (isShutdown.get()) {
+            return CompletableResultCode.ofFailure();
+        }
+
         TraceRequestMarshaler exportRequest = TraceRequestMarshaler.create(spans);
         return delegate.export(exportRequest, spans.size());
     }
@@ -62,6 +67,10 @@ public CompletableResultCode flush() {
 
     @Override
     public CompletableResultCode shutdown() {
+        if (!isShutdown.compareAndSet(false, true)) {
+            logger.log(Level.FINE, "Calling shutdown() multiple times.");
+            return CompletableResultCode.ofSuccess();
+        }
         return delegate.shutdown();
     }
 
@@ -95,7 +104,6 @@ static final class VertxHttpSender implements HttpSender {
             this.client = vertx.createHttpClient(httpClientOptions);
         }
 
-        private final AtomicBoolean isShutdown = new AtomicBoolean();
         private final CompletableResultCode shutdownResult = new CompletableResultCode();
 
         private static String determineBasePath(URI baseUri) {
@@ -148,11 +156,6 @@ public void accept(HttpClientRequest request) {
 
         @Override
         public CompletableResultCode shutdown() {
-            if (!isShutdown.compareAndSet(false, true)) {
-                logger.log(Level.FINE, "Calling shutdown() multiple times.");
-                return shutdownResult;
-            }
-
             client.close()
                     .onSuccess(
                             new Handler<>() {