diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java index 18d17ec078be..d3bddb3d8055 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java @@ -33,7 +33,6 @@ public Object postProcessAfterInitialization(Object bean, String beanName) { if (bean instanceof ConnectionFactory && !ScopedProxyUtils.isScopedTarget(beanName)) { ConnectionFactory connectionFactory = (ConnectionFactory) bean; return R2dbcTelemetry.builder(openTelemetryProvider.getObject()) - // there is no instrumentation-specific property, so we use the common one .setStatementSanitizationEnabled( InstrumentationConfigUtil.isStatementSanitizationEnabled( configPropertiesProvider.getObject(), diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 2583fb468387..9bea00f40e19 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -291,7 +291,6 @@ "description": "Enables the DB statement sanitization.", "defaultValue": true }, - { "name": "otel.instrumentation.kafka.enabled", "type": "java.lang.Boolean", @@ -372,7 +371,13 @@ { "name": "otel.instrumentation.r2dbc.enabled", "type": "java.lang.Boolean", - "description": "Enable the R2DBC (reactive JDBC) instrumentation. Also see otel.instrumentation.common.db-statement-sanitizer.enabled.", + "description": "Enable the R2DBC (reactive JDBC) instrumentation.", + "defaultValue": true + }, + { + "name": "otel.instrumentation.r2dbc.statement-sanitizer.enabled", + "type": "java.lang.Boolean", + "description": "Enables the DB statement sanitization.", "defaultValue": true }, {