Skip to content

Commit 2d3f000

Browse files
authored
Prepare for SQLQueryAnalyzer analyze change in 3.0 (#18921)
1 parent 7fd551e commit 2d3f000

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

  • instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlQueryAnalyzer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics.CounterNames.SQL_SANITIZER_CACHE_MISS;
99

1010
import com.google.auto.value.AutoValue;
11+
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1112
import io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics;
1213
import io.opentelemetry.instrumentation.api.internal.cache.Cache;
1314
import javax.annotation.Nullable;
@@ -34,6 +35,9 @@ private SqlQueryAnalyzer(boolean querySanitizationEnabled) {
3435
}
3536

3637
public SqlQuery analyze(@Nullable String query, SqlDialect dialect) {
38+
if (SemconvStability.v3Preview()) {
39+
return analyzeWithSummary(query, dialect);
40+
}
3741
if (!querySanitizationEnabled || query == null) {
3842
return SqlQuery.create(query, null, null);
3943
}
@@ -52,7 +56,7 @@ private static SqlQuery analyzeImpl(String query, SqlDialect dialect) {
5256
return AutoSqlSanitizer.sanitize(query, dialect);
5357
}
5458

55-
/** Analyze and extract query summary. */
59+
// To be removed in 3.0 (or rather, inlined into analyze() above)
5660
public SqlQuery analyzeWithSummary(@Nullable String query, SqlDialect dialect) {
5761
if (!querySanitizationEnabled || query == null) {
5862
return SqlQuery.createWithSummary(query, null, null);

0 commit comments

Comments
 (0)