resolve merge conflicts

eclipse-vertx · Dec 11, 2023 · be65e02 · be65e02
1 parent cc25d31
commit be65e02
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/test/java/io/vertx/core/spi/tracing/HttpTracingTestBase.java b/src/test/java/io/vertx/core/spi/tracing/HttpTracingTestBase.java
@@ -164,7 +164,7 @@ public void testMultipleHttpServerRequest() throws Exception {
       assertEquals("q=true", server2Span.getTags().get("http.query"));
       Span client2Span = spanMap.get(server2Span.parentId);
       assertEquals("GET", client2Span.operation);
-      assertEquals(scheme + "://" + DEFAULT_HTTP_HOST_AND_PORT + "/2", client2Span.getTags().get("http.url"));
+      assertEquals(scheme + "://" + DEFAULT_HTTP_HOST_AND_PORT + "/2?q=true", client2Span.getTags().get("http.url"));
       assertEquals("200", client2Span.getTags().get("http.status_code"));
       assertEquals("client", client2Span.getTags().get("span_kind"));
       Span server1Span = spanMap.get(client2Span.parentId);