Skip to content

Commit f177da6

Browse files
committed
fix: getSafeTracer()
1 parent 88751ad commit f177da6

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryStatement.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import com.google.common.collect.ImmutableList;
5858
import com.google.common.collect.Iterators;
5959
import com.google.common.util.concurrent.Uninterruptibles;
60-
import io.opentelemetry.api.GlobalOpenTelemetry;
6160
import io.opentelemetry.api.trace.Span;
6261
import io.opentelemetry.api.trace.SpanBuilder;
6362
import io.opentelemetry.api.trace.StatusCode;
@@ -1663,11 +1662,9 @@ private <T> T withTracing(String spanName, TracedOperation<T> operation) throws
16631662

16641663
private Tracer getSafeTracer() {
16651664
if (connection != null) {
1666-
Tracer tracer = connection.getTracer();
1667-
if (tracer != null) {
1668-
return tracer;
1669-
}
1665+
return connection.getTracer();
16701666
}
1671-
return GlobalOpenTelemetry.getTracer(BigQueryJdbcOpenTelemetry.INSTRUMENTATION_SCOPE_NAME);
1667+
return BigQueryJdbcOpenTelemetry.getOpenTelemetry(false, null)
1668+
.getTracer(BigQueryJdbcOpenTelemetry.INSTRUMENTATION_SCOPE_NAME);
16721669
}
16731670
}

0 commit comments

Comments
 (0)