open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use extended opentelemetry

This commit is contained in:
Gregor Zeitlinger 2025-07-16 14:30:41 +02:00
parent eb8720f491
commit a8325cb902
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
instrumentation/jdbc/library/build.gradle.kts
View File

@ -65,3 +65,10 @@ tasks {
jvmArgs("-Dotel.instrumentation.jdbc.experimental.transaction.enabled=true")
}
}
// todo remove when the next release is published
configurations.all {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api-incubator:1.53.0-alpha-SNAPSHOT")
}
}

27
instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java
View File

@ -5,9 +5,13 @@
package io.opentelemetry.instrumentation.jdbc.internal;
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
import static java.util.Collections.emptyList;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
import io.opentelemetry.api.incubator.config.ConfigProvider;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeSpanNameExtractor;
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientMetrics;
@ -48,11 +52,30 @@ public final class JdbcInstrumenterFactory {
openTelemetry,
emptyList(),
true,
ConfigPropertiesUtil.getBoolean(
"otel.instrumentation.common.db-statement-sanitizer.enabled", true),
isStatementSanitizationEnabled(openTelemetry),
captureQueryParameters);
}
private static boolean isStatementSanitizationEnabled(OpenTelemetry openTelemetry) {
if (openTelemetry instanceof ExtendedOpenTelemetry) {
ConfigProvider configProvider = ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider();
// we might want to pull the config bridge to instrumentation-api-incubator which we can
// use here
DeclarativeConfigProperties properties = configProvider.getInstrumentationConfig();
if (properties == null) {
properties = DeclarativeConfigProperties.empty();
}
return properties
.getStructured("java", empty())
.getStructured("common", empty())
.getStructured("db_statement_sanitizer", empty())
.getBoolean("enabled", true);
}
return ConfigPropertiesUtil.getBoolean(
"otel.instrumentation.common.db-statement-sanitizer.enabled", true);
}
public static Instrumenter<DbRequest, Void> createStatementInstrumenter(
OpenTelemetry openTelemetry,
boolean enabled,