Merge pull request #24169 from radcortez/fix-24102-2.7

Fix URISyntaxException on Span name extraction
quarkusio · Mar 8, 2022 · 74a7f85 · 74a7f85
2 parents a844979 + 137a70d
commit 74a7f85
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...yment/src/test/java/io/quarkus/opentelemetry/deployment/VertxClientOpenTelemetryTest.java b/...yment/src/test/java/io/quarkus/opentelemetry/deployment/VertxClientOpenTelemetryTest.java
@@ -114,6 +114,18 @@ void path() throws Exception {
         assertEquals(server.getParentSpanId(), client.getSpanId());
     }
 
+    @Test
+    void uri() throws Exception {
+        HttpResponse<Buffer> response = WebClient.create(vertx)
+                .get(uri.getPort(), uri.getHost(), "/hello?q=g\\+\\+&dataOnly=true")
+                .send()
+                .toCompletionStage().toCompletableFuture()
+                .get();
+
+        List<SpanData> spans = spanExporter.getFinishedSpanItems(2);
+        assertEquals(2, spans.size());
+    }
+
     @ApplicationScoped
     public static class HelloRouter {
         @Inject

diff --git a/...rc/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/OpenTelemetryVertxTracer.java b/...rc/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/OpenTelemetryVertxTracer.java
@@ -5,7 +5,6 @@
 import static io.quarkus.opentelemetry.runtime.OpenTelemetryConfig.INSTRUMENTATION_NAME;
 import static io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.setContextSafe;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
@@ -303,9 +302,8 @@ private ServerSpanNameExtractor(
         @Override
         public String extract(final HttpRequest httpRequest) {
             if (httpRequest instanceof HttpServerRequest) {
-                String path = URI.create(httpRequest.uri()).getPath();
-                if (path != null && path.length() > 1) {
-                    return path.substring(1);
+                if (httpRequest.uri() != null && httpRequest.uri().length() > 1) {
+                    return httpRequest.uri().substring(1);
                 } else {
                     return "HTTP " + httpRequest.method();
                 }