From 541912d5e5453db97f5a6c9447b1393779217b0f Mon Sep 17 00:00:00 2001 From: pablo gonzalez granados Date: Wed, 15 Jun 2022 16:24:59 +0200 Subject: [PATCH] Rollback workaround related to jaeger UdsNettyChannelProvider --- .../src/main/resources/application.properties | 3 --- .../src/main/resources/reflection-config.json | 11 ----------- .../src/main/resources/application.properties | 2 -- .../src/main/resources/reflection-config.json | 11 ----------- .../reactive/OpentelemetryReactiveIT.java | 3 --- .../io/quarkus/ts/opentelemetry/OpentelemetryIT.java | 3 --- .../opentelemetry/src/test/resources/pong.properties | 2 -- 7 files changed, 35 deletions(-) delete mode 100644 http/graphql-telemetry/src/main/resources/reflection-config.json delete mode 100644 http/vertx-web-client/src/main/resources/reflection-config.json diff --git a/http/graphql-telemetry/src/main/resources/application.properties b/http/graphql-telemetry/src/main/resources/application.properties index f154495dd..32a4d00d9 100644 --- a/http/graphql-telemetry/src/main/resources/application.properties +++ b/http/graphql-telemetry/src/main/resources/application.properties @@ -1,5 +1,2 @@ smallrye.graphql.allowGet=true quarkus.application.name=graphql-telemetry - -#TODO https://github.com/quarkusio/quarkus/issues/26083 -quarkus.native.additional-build-args=--allow-incomplete-classpath, -H:ReflectionConfigurationFiles=reflection-config.json \ No newline at end of file diff --git a/http/graphql-telemetry/src/main/resources/reflection-config.json b/http/graphql-telemetry/src/main/resources/reflection-config.json deleted file mode 100644 index c7525b203..000000000 --- a/http/graphql-telemetry/src/main/resources/reflection-config.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "name": "io.grpc.netty.UdsNettyChannelProvider", - "allDeclaredConstructors" : true, - "allPublicConstructors" : true, - "allDeclaredMethods" : true, - "allPublicMethods" : true, - "allDeclaredFields" : true, - "allPublicFields" : true - } -] \ No newline at end of file diff --git a/http/vertx-web-client/src/main/resources/application.properties b/http/vertx-web-client/src/main/resources/application.properties index 00802787b..2bc06b646 100644 --- a/http/vertx-web-client/src/main/resources/application.properties +++ b/http/vertx-web-client/src/main/resources/application.properties @@ -6,7 +6,5 @@ vertx.webclient.retries=3 # Jaeger quarkus.opentelemetry.tracer.exporter.jaeger.endpoint=http://localhost:14250/api/traces -#TODO https://github.com/quarkusio/quarkus/issues/26083 -quarkus.native.additional-build-args=--allow-incomplete-classpath, -H:ReflectionConfigurationFiles=reflection-config.json # debug symbols enabled quarkus.native.debug.enabled=true diff --git a/http/vertx-web-client/src/main/resources/reflection-config.json b/http/vertx-web-client/src/main/resources/reflection-config.json deleted file mode 100644 index c7525b203..000000000 --- a/http/vertx-web-client/src/main/resources/reflection-config.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "name": "io.grpc.netty.UdsNettyChannelProvider", - "allDeclaredConstructors" : true, - "allPublicConstructors" : true, - "allDeclaredMethods" : true, - "allPublicMethods" : true, - "allDeclaredFields" : true, - "allPublicFields" : true - } -] \ No newline at end of file diff --git a/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpentelemetryReactiveIT.java b/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpentelemetryReactiveIT.java index 96a34f592..b1fc93588 100644 --- a/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpentelemetryReactiveIT.java +++ b/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpentelemetryReactiveIT.java @@ -18,15 +18,12 @@ import io.quarkus.test.bootstrap.JaegerService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; -import io.quarkus.test.scenarios.annotations.DisabledOnNative; import io.quarkus.test.services.JaegerContainer; import io.quarkus.test.services.QuarkusApplication; import io.restassured.response.Response; @QuarkusScenario @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support Linux Containers / Testcontainers") -// TODO https://github.com/quarkusio/quarkus/issues/26083 -@DisabledOnNative(reason = "Native opentelemtry reported issue: NoSuchMethodException: UdsNettyChannelProvider") public class OpentelemetryReactiveIT { private static final int GRPC_COLLECTOR_PORT = 14250; diff --git a/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java b/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java index ed50557ac..fd217d23c 100644 --- a/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java +++ b/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java @@ -18,15 +18,12 @@ import io.quarkus.test.bootstrap.JaegerService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; -import io.quarkus.test.scenarios.annotations.DisabledOnNative; import io.quarkus.test.services.JaegerContainer; import io.quarkus.test.services.QuarkusApplication; import io.restassured.response.Response; @QuarkusScenario @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support Linux Containers / Testcontainers") -// TODO https://github.com/quarkusio/quarkus/issues/26083 -@DisabledOnNative(reason = "Native opentelemtry reported issue: NoSuchMethodException: UdsNettyChannelProvider") public class OpentelemetryIT { private static final int GRPC_COLLECTOR_PORT = 14250; diff --git a/monitoring/opentelemetry/src/test/resources/pong.properties b/monitoring/opentelemetry/src/test/resources/pong.properties index e05f1fb73..e69de29bb 100644 --- a/monitoring/opentelemetry/src/test/resources/pong.properties +++ b/monitoring/opentelemetry/src/test/resources/pong.properties @@ -1,2 +0,0 @@ -//TODO https://github.com/quarkusio/quarkus/issues/26083 -quarkus.native.additional-build-args=--allow-incomplete-classpath, -H:ReflectionConfigurationFiles=reflection-config.json