Skip to content

Commit 370a516

Browse files
committed
use system property to configure OpenTelemetryDriver
1 parent 112a937 commit 370a516

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import io.opentelemetry.api.OpenTelemetry;
2626
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
27+
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
2728
import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
2829
import io.opentelemetry.instrumentation.jdbc.internal.DbRequest;
2930
import io.opentelemetry.instrumentation.jdbc.internal.JdbcConnectionUrlParser;
@@ -53,7 +54,6 @@ public final class OpenTelemetryDriver implements Driver {
5354
static final OpenTelemetryDriver INSTANCE = new OpenTelemetryDriver();
5455

5556
private volatile OpenTelemetry openTelemetry = OpenTelemetry.noop();
56-
private volatile boolean sqlCommenterEnabled;
5757

5858
private static final int MAJOR_VERSION;
5959
private static final int MINOR_VERSION;
@@ -62,6 +62,9 @@ public final class OpenTelemetryDriver implements Driver {
6262
private static final AtomicBoolean REGISTERED = new AtomicBoolean();
6363
private static final List<Driver> DRIVER_CANDIDATES = new CopyOnWriteArrayList<>();
6464

65+
private static final boolean sqlCommenterEnabled =
66+
ConfigPropertiesUtil.getBoolean("otel.instrumentation.common.db-sqlcommenter.enabled", false);
67+
6568
static {
6669
try {
6770
int[] version = parseInstrumentationVersion();
@@ -223,14 +226,6 @@ public void setOpenTelemetry(OpenTelemetry openTelemetry) {
223226
this.openTelemetry = openTelemetry;
224227
}
225228

226-
/**
227-
* Sets whether to augment sql query with comment containing the tracing information. See <a
228-
* href="https://google.github.io/sqlcommenter/">sqlcommenter</a> for more info.
229-
*/
230-
public void sqlCommenterEnabled(boolean sqlCommenterEnabled) {
231-
this.sqlCommenterEnabled = sqlCommenterEnabled;
232-
}
233-
234229
@Nullable
235230
@Override
236231
public Connection connect(String url, Properties info) throws SQLException {

0 commit comments

Comments
 (0)