Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions java-bigquery-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,16 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-opentelemetry</artifactId>
<exclusions>
<exclusion>
Comment thread
keshavdandeva marked this conversation as resolved.
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
import com.google.cloud.logging.Logging;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSortedSet;
import io.grpc.ManagedChannelBuilder;
import io.grpc.opentelemetry.GrpcOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.baggage.Baggage;
import io.opentelemetry.api.trace.Tracer;
Expand Down Expand Up @@ -1139,6 +1141,7 @@ private BigQuery getBigQueryConnection() {
|| this.useGlobalOpenTelemetry) {
Tracer sdkTracer = this.openTelemetry.getTracer(BigQueryJdbcOpenTelemetry.BIGQUERY_NAMESPACE);
bigQueryOptions.setOpenTelemetryTracer(sdkTracer);
bigQueryOptions.setEnableOpenTelemetryTracing(true);
this.tracer =
this.openTelemetry.getTracer(BigQueryJdbcOpenTelemetry.INSTRUMENTATION_SCOPE_NAME);
}
Expand Down Expand Up @@ -1176,7 +1179,20 @@ private BigQueryReadClient getBigQueryReadClientConnection() throws IOException
}
TransportChannelProvider activeProvider = this.transportChannelProvider;
if (activeProvider == null) {
activeProvider = BigQueryReadSettings.defaultGrpcTransportProviderBuilder().build();
InstantiatingGrpcChannelProvider.Builder builder =
BigQueryReadSettings.defaultGrpcTransportProviderBuilder();
if (this.enableGcpTraceExporter
|| this.customOpenTelemetry != null
|| this.useGlobalOpenTelemetry) {
GrpcOpenTelemetry grpcOpenTelemetry =
GrpcOpenTelemetry.newBuilder().sdk(this.openTelemetry).build();
builder.setChannelConfigurator(
b -> {
grpcOpenTelemetry.configureChannelBuilder((ManagedChannelBuilder) b);
return b;
});
Comment thread
keshavdandeva marked this conversation as resolved.
Comment thread
keshavdandeva marked this conversation as resolved.
}
activeProvider = builder.build();
}

if (activeProvider instanceof InstantiatingGrpcChannelProvider) {
Expand All @@ -1191,8 +1207,11 @@ private BigQueryReadClient getBigQueryReadClientConnection() throws IOException

bigQueryReadSettings.setTransportChannelProvider(activeProvider);

if (this.enableGcpTraceExporter || this.customOpenTelemetry != null) {
if (this.enableGcpTraceExporter
|| this.customOpenTelemetry != null
|| this.useGlobalOpenTelemetry) {
bigQueryReadSettings.setOpenTelemetryTracerProvider(this.openTelemetry.getTracerProvider());
bigQueryReadSettings.setEnableOpenTelemetryTracing(true);
}

return BigQueryReadClient.create(bigQueryReadSettings.build());
Expand Down
Loading