Merge pull request #26779 from tmihalac/issue_26764

OpenTelemetry: NPE in HttpInstrumenterVertxTracer.RouteGetter when request got cancelled
quarkusio · Jul 25, 2022 · b2574a8 · b2574a8
2 parents a00af11 + 0322976
commit b2574a8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/HttpInstrumenterVertxTracer.java b/...main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/HttpInstrumenterVertxTracer.java
@@ -4,6 +4,7 @@
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_CLIENT_IP;
 import static io.quarkus.opentelemetry.runtime.OpenTelemetryConfig.INSTRUMENTATION_NAME;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 
@@ -151,7 +152,7 @@ public String get(final io.opentelemetry.context.Context context, final HttpRequ
                 return route;
             }
 
-            if (HttpResponseStatus.NOT_FOUND.code() == response.statusCode()) {
+            if (response != null && HttpResponseStatus.NOT_FOUND.code() == response.statusCode()) {
                 return "/*";
             }
 
@@ -231,12 +232,12 @@ public Long requestContentLengthUncompressed(final HttpRequest request, final Ht
 
         @Override
         public Integer statusCode(final HttpRequest request, final HttpResponse response) {
-            return response.statusCode();
+            return response != null ? response.statusCode() : null;
         }
 
         @Override
         public Long responseContentLength(final HttpRequest request, final HttpResponse response) {
-            return getContentLength(response.headers());
+            return response != null ? getContentLength(response.headers()) : null;
         }
 
         @Override
@@ -246,7 +247,7 @@ public Long responseContentLengthUncompressed(final HttpRequest request, final H
 
         @Override
         public List<String> responseHeader(final HttpRequest request, final HttpResponse response, final String name) {
-            return response.headers().getAll(name);
+            return response != null ? response.headers().getAll(name) : Collections.emptyList();
         }
 
         private static Long getContentLength(final MultiMap headers) {