From fe9c583cd3db8fd41c02e4a5f8895a0ef9fbc244 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Fri, 19 Aug 2022 13:01:57 -0700
Subject: [PATCH] Fix new jdbc javaagent config (#6492)

* Fix new jdbc javaagent config

* Fix
---
 .../javaagent/instrumentation/jdbc/JdbcSingletons.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java
index 531c90432d..6905e850fe 100644
--- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java
+++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java
@@ -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.SqlClientAttributesExtractor;
 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.JdbcAttributesGetter;
 import io.opentelemetry.instrumentation.jdbc.internal.JdbcNetAttributesGetter;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
 
 public final class JdbcSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc";
@@ -35,9 +35,10 @@ public final class JdbcSingletons {
             .addAttributesExtractor(
                 SqlClientAttributesExtractor.builder(dbAttributesGetter)
                     .setStatementSanitizationEnabled(
-                        ConfigPropertiesUtil.getBoolean(
-                            "otel.instrumentation.jdbc.statement-sanitizer.enabled",
-                            CommonConfig.get().isStatementSanitizationEnabled()))
+                        InstrumentationConfig.get()
+                            .getBoolean(
+                                "otel.instrumentation.jdbc.statement-sanitizer.enabled",
+                                CommonConfig.get().isStatementSanitizationEnabled()))
                     .build())
             .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter))
             .addAttributesExtractor(