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

Fix new jdbc javaagent config (#6492) 

* Fix new jdbc javaagent config

* Fix
This commit is contained in:
Trask Stalnaker 2022-08-19 13:01:57 -07:00 committed by GitHub
parent 7f5d0cb5b7
commit fe9c583cd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java
View File

@ -12,11 +12,11 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
import io.opentelemetry.instrumentation.jdbc.internal.DbRequest; import io.opentelemetry.instrumentation.jdbc.internal.DbRequest;
import io.opentelemetry.instrumentation.jdbc.internal.JdbcAttributesGetter; import io.opentelemetry.instrumentation.jdbc.internal.JdbcAttributesGetter;
import io.opentelemetry.instrumentation.jdbc.internal.JdbcNetAttributesGetter; import io.opentelemetry.instrumentation.jdbc.internal.JdbcNetAttributesGetter;
import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
public final class JdbcSingletons { public final class JdbcSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc"; private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc";
@ -35,9 +35,10 @@ public final class JdbcSingletons {
.addAttributesExtractor( .addAttributesExtractor(
SqlClientAttributesExtractor.builder(dbAttributesGetter) SqlClientAttributesExtractor.builder(dbAttributesGetter)
.setStatementSanitizationEnabled( .setStatementSanitizationEnabled(
ConfigPropertiesUtil.getBoolean( InstrumentationConfig.get()
"otel.instrumentation.jdbc.statement-sanitizer.enabled", .getBoolean(
CommonConfig.get().isStatementSanitizationEnabled())) "otel.instrumentation.jdbc.statement-sanitizer.enabled",
CommonConfig.get().isStatementSanitizationEnabled()))
.build()) .build())
.addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter))
.addAttributesExtractor( .addAttributesExtractor(