diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java index fc284b21b7827..ea5dcf5d13b34 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; +import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder; import io.opentelemetry.sdk.logs.export.LogRecordExporter; @@ -26,6 +27,7 @@ static void configureLoggerProvider( SpiHelper spiHelper, MeterProvider meterProvider, BiFunction logRecordExporterCustomizer, + BiFunction logRecordProcessorCustomizer, List closeables) { // Logs not supported yet. No need to call LogRecordExporterConfiguration.configureExporter } diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java index 98a3257ac53ab..395a6663a5a1b 100644 --- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java +++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/BasicTest.java @@ -147,10 +147,10 @@ void shouldCreateClientSpans() { String serverTraceId = null; String clientSpanId = null; - Awaitility.await().atMost(Duration.ofMinutes(2)) - .until(() -> getServerSpans("POST /call-hello-client-trace", "/call-hello-client-trace").size() > 0); + Awaitility.await().atMost(Duration.ofSeconds(30)) + .until(() -> getServerSpansFromPath("POST /call-hello-client-trace", "/call-hello-client-trace").size() > 0); - List> spans = getServerSpans("POST /call-hello-client-trace", "/call-hello-client-trace"); + List> spans = getServerSpansFromPath("POST /call-hello-client-trace", "/call-hello-client-trace"); Assertions.assertEquals(1, spans.size()); final Map initialServerSpan = spans.get(0); @@ -177,7 +177,10 @@ void shouldCreateClientSpans() { Assertions.assertNotNull(initialServerSpan.get("attr_client.address")); Assertions.assertNotNull(initialServerSpan.get("attr_user_agent.original")); - spans = getClientSpans("POST", "http://localhost:8081/hello?count=3"); + Awaitility.await().atMost(Duration.ofSeconds(30)) + .until(() -> getClientSpansFromFullUrl("POST", "http://localhost:8081/hello?count=3").size() > 0); + + spans = getClientSpansFromFullUrl("POST", "http://localhost:8081/hello?count=3"); Assertions.assertEquals(1, spans.size()); final Map clientSpan = spans.get(0); @@ -205,7 +208,9 @@ void shouldCreateClientSpans() { clientSpanId = (String) clientSpan.get("spanId"); - spans = getServerSpans("POST /hello", "/hello?count=3"); + Awaitility.await().atMost(Duration.ofSeconds(30)) + .until(() -> getServerSpansFromPath("POST /hello", "/hello").size() > 0); + spans = getServerSpansFromPath("POST /hello", "/hello"); Assertions.assertEquals(1, spans.size()); final Map serverSpanClientSide = spans.get(0); @@ -242,16 +247,16 @@ public void shouldConvertParamFirstToOneUsingCustomConverter() { .body(equalTo("1")); } - private List> getServerSpans(final String spanName, final String httpTarget) { + private List> getServerSpansFromPath(final String spanName, final String urlPath) { return get("/export").body().as(new TypeRef>>() { }).stream() .filter(stringObjectMap -> spanName.equals(stringObjectMap.get("name")) && "SERVER".equals(stringObjectMap.get("kind")) && - ((String) stringObjectMap.get("attr_url.path")).startsWith(httpTarget)) + ((String) stringObjectMap.get("attr_url.path")).startsWith(urlPath)) .collect(Collectors.toList()); } - private List> getClientSpans(final String spanName, final String httpUrl) { + private List> getClientSpansFromFullUrl(final String spanName, final String httpUrl) { return get("/export").body().as(new TypeRef>>() { }).stream() .filter(stringObjectMap -> spanName.equals(stringObjectMap.get("name")) && diff --git a/tcks/pom.xml b/tcks/pom.xml index 284143d1d6786..24e04d682d64a 100644 --- a/tcks/pom.xml +++ b/tcks/pom.xml @@ -116,7 +116,7 @@ microprofile-rest-client microprofile-rest-client-reactive microprofile-openapi - microprofile-opentelemetry + microprofile-lra resteasy-reactive