Skip to content

Commit f7bb668

Browse files
committed
Remove obsolete build step in agroal
Removing work around step now that open-telemetry/opentelemetry-java-instrumentation#8080 is closed
1 parent ec6bf3c commit f7bb668

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -375,29 +375,6 @@ HealthBuildItem addHealthCheck(Capabilities capabilities, DataSourcesBuildTimeCo
375375
}
376376
}
377377

378-
/**
379-
* TODO: remove the step when https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8080 is closed
380-
*/
381-
@BuildStep
382-
void adaptOpenTelemetryJdbcInstrumentationForNative(BuildProducer<RemovedResourceBuildItem> producer,
383-
Capabilities capabilities) {
384-
// remove 'JdbcSingletons' as it initialize OpenTelemetry at build time
385-
// 'OpenTelemetryDriver' is removed as it is directly using 'JdbcSingletons'
386-
// we also need to check for the driver presence at classpath as it is possible that both OpenTelemetry
387-
// and Agroal extensions are used, but dependency 'opentelemetry-jdbc' is not present
388-
if (capabilities.isPresent(OPENTELEMETRY_TRACER) && QuarkusClassLoader.isClassPresentAtRuntime(OPEN_TELEMETRY_DRIVER)) {
389-
producer.produce(
390-
new RemovedResourceBuildItem(ArtifactKey.fromString("io.opentelemetry.instrumentation:opentelemetry-jdbc"),
391-
Set.of("META-INF/services/java.sql.Driver")));
392-
producer.produce(
393-
new RemovedResourceBuildItem(ArtifactKey.fromString("io.opentelemetry.instrumentation:opentelemetry-jdbc"),
394-
Set.of("io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver")));
395-
producer.produce(
396-
new RemovedResourceBuildItem(ArtifactKey.fromString("io.opentelemetry.instrumentation:opentelemetry-jdbc"),
397-
Set.of("io/opentelemetry/instrumentation.jdbc/internal/JdbcSingletons")));
398-
}
399-
}
400-
401378
@BuildStep
402379
void registerRowSetSupport(
403380
BuildProducer<NativeImageResourceBundleBuildItem> resourceBundleProducer,

0 commit comments

Comments
 (0)