Commit 0fc09e8
committed
chore: link OpenTelemetry instrumentation with underlying SDK
1 parent 95ea41b commit 0fc09e8
2 files changed
Lines changed: 30 additions & 2 deletions
File tree
- java-bigquery-jdbc
- src/main/java/com/google/cloud/bigquery/jdbc
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -324,6 +324,16 @@ | |||
| 324 | 324 | <groupId>io.grpc</groupId> | |
| 325 | 325 | <artifactId>grpc-netty-shaded</artifactId> | |
| 326 | 326 | </dependency> | |
| 327 | + <dependency> | ||
| 328 | + <groupId>io.grpc</groupId> | ||
| 329 | + <artifactId>grpc-opentelemetry</artifactId> | ||
| 330 | + <exclusions> | ||
| 331 | + <exclusion> | ||
| 332 | + <groupId>io.opentelemetry</groupId> | ||
| 333 | + <artifactId>opentelemetry-api</artifactId> | ||
| 334 | + </exclusion> | ||
| 335 | + </exclusions> | ||
| 336 | + </dependency> | ||
| 327 | 337 | ||
| 328 | 338 | <dependency> | |
| 329 | 339 | <groupId>org.apache.arrow</groupId> | |
Lines changed: 20 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,6 +44,7 @@ | |||
| 44 | 44 | import com.google.cloud.logging.Logging; | |
| 45 | 45 | import com.google.common.annotations.VisibleForTesting; | |
| 46 | 46 | import com.google.common.collect.ImmutableSortedSet; | |
| 47 | + import io.grpc.opentelemetry.GrpcOpenTelemetry; | ||
| 47 | 48 | import io.opentelemetry.api.OpenTelemetry; | |
| 48 | 49 | import io.opentelemetry.api.baggage.Baggage; | |
| 49 | 50 | import io.opentelemetry.api.trace.Tracer; | |
@@ -1139,6 +1140,7 @@ private BigQuery getBigQueryConnection() { | |||
| 1139 | 1140 | || this.useGlobalOpenTelemetry) { | |
| 1140 | 1141 | Tracer sdkTracer = this.openTelemetry.getTracer(BigQueryJdbcOpenTelemetry.BIGQUERY_NAMESPACE); | |
| 1141 | 1142 | bigQueryOptions.setOpenTelemetryTracer(sdkTracer); | |
| 1143 | + bigQueryOptions.setEnableOpenTelemetryTracing(true); | ||
| 1142 | 1144 | this.tracer = | |
| 1143 | 1145 | this.openTelemetry.getTracer(BigQueryJdbcOpenTelemetry.INSTRUMENTATION_SCOPE_NAME); | |
| 1144 | 1146 | } | |
@@ -1176,7 +1178,20 @@ private BigQueryReadClient getBigQueryReadClientConnection() throws IOException | |||
| 1176 | 1178 | } | |
| 1177 | 1179 | TransportChannelProvider activeProvider = this.transportChannelProvider; | |
| 1178 | 1180 | if (activeProvider == null) { | |
| 1179 | - activeProvider = BigQueryReadSettings.defaultGrpcTransportProviderBuilder().build(); | ||
| 1181 | + InstantiatingGrpcChannelProvider.Builder builder = | ||
| 1182 | + BigQueryReadSettings.defaultGrpcTransportProviderBuilder(); | ||
| 1183 | + if (this.enableGcpTraceExporter | ||
| 1184 | + || this.customOpenTelemetry != null | ||
| 1185 | + || this.useGlobalOpenTelemetry) { | ||
| 1186 | + GrpcOpenTelemetry grpcOpenTelemetry = | ||
| 1187 | + GrpcOpenTelemetry.newBuilder().sdk(this.openTelemetry).build(); | ||
| 1188 | + builder.setChannelConfigurator( | ||
| 1189 | + b -> { | ||
| 1190 | + grpcOpenTelemetry.configureChannelBuilder(b); | ||
| 1191 | + return b; | ||
| 1192 | + }); | ||
| 1193 | + } | ||
| 1194 | + activeProvider = builder.build(); | ||
| 1180 | 1195 | } | |
| 1181 | 1196 | ||
| 1182 | 1197 | if (activeProvider instanceof InstantiatingGrpcChannelProvider) { | |
@@ -1191,8 +1206,11 @@ private BigQueryReadClient getBigQueryReadClientConnection() throws IOException | |||
| 1191 | 1206 | ||
| 1192 | 1207 | bigQueryReadSettings.setTransportChannelProvider(activeProvider); | |
| 1193 | 1208 | ||
| 1194 | - if (this.enableGcpTraceExporter || this.customOpenTelemetry != null) { | ||
| 1209 | + if (this.enableGcpTraceExporter | ||
| 1210 | + || this.customOpenTelemetry != null | ||
| 1211 | + || this.useGlobalOpenTelemetry) { | ||
| 1195 | 1212 | bigQueryReadSettings.setOpenTelemetryTracerProvider(this.openTelemetry.getTracerProvider()); | |
| 1213 | + bigQueryReadSettings.setEnableOpenTelemetryTracing(true); | ||
| 1196 | 1214 | } | |
| 1197 | 1215 | ||
| 1198 | 1216 | return BigQueryReadClient.create(bigQueryReadSettings.build()); | |
0 commit comments