From f7bb6687e664e415df510a633b28dbb0595e8d15 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Mon, 13 Jan 2025 15:03:34 +0200 Subject: [PATCH] Remove obsolete build step in agroal Removing work around step now that https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8080 is closed --- .../agroal/deployment/AgroalProcessor.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java index bea70573a34d5c..1569a395029441 100644 --- a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java +++ b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java @@ -375,29 +375,6 @@ HealthBuildItem addHealthCheck(Capabilities capabilities, DataSourcesBuildTimeCo } } - /** - * TODO: remove the step when https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8080 is closed - */ - @BuildStep - void adaptOpenTelemetryJdbcInstrumentationForNative(BuildProducer producer, - Capabilities capabilities) { - // remove 'JdbcSingletons' as it initialize OpenTelemetry at build time - // 'OpenTelemetryDriver' is removed as it is directly using 'JdbcSingletons' - // we also need to check for the driver presence at classpath as it is possible that both OpenTelemetry - // and Agroal extensions are used, but dependency 'opentelemetry-jdbc' is not present - if (capabilities.isPresent(OPENTELEMETRY_TRACER) && QuarkusClassLoader.isClassPresentAtRuntime(OPEN_TELEMETRY_DRIVER)) { - producer.produce( - new RemovedResourceBuildItem(ArtifactKey.fromString("io.opentelemetry.instrumentation:opentelemetry-jdbc"), - Set.of("META-INF/services/java.sql.Driver"))); - producer.produce( - new RemovedResourceBuildItem(ArtifactKey.fromString("io.opentelemetry.instrumentation:opentelemetry-jdbc"), - Set.of("io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver"))); - producer.produce( - new RemovedResourceBuildItem(ArtifactKey.fromString("io.opentelemetry.instrumentation:opentelemetry-jdbc"), - Set.of("io/opentelemetry/instrumentation.jdbc/internal/JdbcSingletons"))); - } - } - @BuildStep void registerRowSetSupport( BuildProducer resourceBundleProducer,