From 5ae67803a47686bfd0c1a1624bd91d2dd7d78377 Mon Sep 17 00:00:00 2001 From: wyctxwd1 <469104809@qq.com> Date: Tue, 21 Oct 2025 11:50:09 +0800 Subject: [PATCH 1/2] Add connect prop support for jdbc (#15055) --- .../instrumentation/jdbc/DataSourcePostProcessor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java index ad11fa09c991..8de7619af5c9 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java @@ -74,7 +74,11 @@ public Object postProcessAfterInitialization(Object bean, String beanName) { configPropertiesProvider .getObject() .getBoolean( - "otel.instrumentation.jdbc.experimental.transaction.enabled", false)); + "otel.instrumentation.jdbc.experimental.transaction.enabled", false)) + .setDataSourceInstrumenterEnabled(configPropertiesProvider + .getObject() + .getBoolean( + "otel.instrumentation.jdbc.experimental.datasource.connections.enabled", true)); Experimental.setEnableSqlCommenter( builder, configPropertiesProvider From 3dc3fc29abb2adfe62269724211b5afb88488b45 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Tue, 21 Oct 2025 04:00:45 +0000 Subject: [PATCH 2/2] ./gradlew spotlessApply --- .../instrumentation/jdbc/DataSourcePostProcessor.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java index 8de7619af5c9..af32af37bea1 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java @@ -75,10 +75,12 @@ public Object postProcessAfterInitialization(Object bean, String beanName) { .getObject() .getBoolean( "otel.instrumentation.jdbc.experimental.transaction.enabled", false)) - .setDataSourceInstrumenterEnabled(configPropertiesProvider - .getObject() - .getBoolean( - "otel.instrumentation.jdbc.experimental.datasource.connections.enabled", true)); + .setDataSourceInstrumenterEnabled( + configPropertiesProvider + .getObject() + .getBoolean( + "otel.instrumentation.jdbc.experimental.datasource.connections.enabled", + true)); Experimental.setEnableSqlCommenter( builder, configPropertiesProvider