Skip to content

Commit a104971

Browse files
committed
chore(bigquery): remove dev gate flag for tracing telemetry
1 parent 28eebf0 commit a104971

File tree

3 files changed

+486
-613
lines changed

3 files changed

+486
-613
lines changed

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ public class HttpBigQueryRpc implements BigQueryRpc {
8888

8989
public static final String DEFAULT_PROJECTION = "full";
9090
private static final String BASE_RESUMABLE_URI = "upload/bigquery/v2/projects/";
91-
static final String HTTP_TRACING_DEV_GATE_PROPERTY =
92-
"com.google.cloud.bigquery.http.tracing.dev.enabled";
9391
static final String RESOURCE_PROJECT_PREFIX = "//bigquery.googleapis.com/projects/";
9492
// see:
9593
// https://cloud.google.com/bigquery/loading-data-post-request#resume-upload
@@ -121,8 +119,7 @@ public HttpBigQueryRpc(BigQueryOptions options) {
121119
this.urlDomain = new GenericUrl(options.getResolvedApiaryHost("bigquery")).getHost();
122120

123121
if (options.isOpenTelemetryTracingEnabled()
124-
&& options.getOpenTelemetryTracer() != null
125-
&& isHttpTracingEnabled()) {
122+
&& options.getOpenTelemetryTracer() != null) {
126123
initializer =
127124
new HttpTracingRequestInitializer(initializer, options.getOpenTelemetryTracer());
128125
}
@@ -2146,14 +2143,11 @@ private Span createRpcTracingSpan(
21462143
.setSpanKind(SpanKind.CLIENT)
21472144
.setAttribute("bq.rpc.service", service)
21482145
.setAttribute("bq.rpc.method", method)
2149-
.setAttribute("bq.rpc.system", "http");
2150-
if (isHttpTracingEnabled()) {
2151-
builder
2152-
.setAttribute(
2153-
BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
2154-
.setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate)
2155-
.setAttribute(BigQueryTelemetryTracer.URL_DOMAIN, this.urlDomain);
2156-
}
2146+
.setAttribute("bq.rpc.system", "http")
2147+
.setAttribute(
2148+
BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
2149+
.setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate)
2150+
.setAttribute(BigQueryTelemetryTracer.URL_DOMAIN, this.urlDomain);
21572151

21582152
if (options != null) {
21592153
builder.setAllAttributes(otelAttributesFromOptions(options));
@@ -2175,13 +2169,11 @@ private <T> T executeWithSpan(Span span, SpanOperation<T> operation) throws IOEx
21752169
try (Scope scope = span.makeCurrent()) {
21762170
return operation.execute(span);
21772171
} catch (Exception e) {
2178-
if (isHttpTracingEnabled()) {
2179-
if (e instanceof GoogleJsonResponseException) {
2180-
BigQueryTelemetryTracer.addServerErrorResponseToSpan(
2181-
((GoogleJsonResponseException) e), span);
2182-
} else {
2183-
BigQueryTelemetryTracer.addExceptionToSpan(e, span);
2184-
}
2172+
if (e instanceof GoogleJsonResponseException) {
2173+
BigQueryTelemetryTracer.addServerErrorResponseToSpan(
2174+
((GoogleJsonResponseException) e), span);
2175+
} else {
2176+
BigQueryTelemetryTracer.addExceptionToSpan(e, span);
21852177
}
21862178
throw e;
21872179
} finally {
@@ -2203,12 +2195,4 @@ private static Attributes otelAttributesFromOptions(Map<Option, ?> options) {
22032195
return builder.build();
22042196
}
22052197

2206-
/**
2207-
* Temporary development gate for HttpTracingRequestInitializer rollout: must be explicitly
2208-
* enabled with the system property. tracking ticket for removal:
2209-
* https://github.com/googleapis/google-cloud-java/issues/12100
2210-
*/
2211-
static boolean isHttpTracingEnabled() {
2212-
return Boolean.parseBoolean(System.getProperty(HTTP_TRACING_DEV_GATE_PROPERTY));
2213-
}
22142198
}

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITOpenTelemetryTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public class ITOpenTelemetryTest {
5454

5555
@BeforeAll
5656
public static void setUpClass() throws IOException {
57-
System.setProperty("com.google.cloud.bigquery.http.tracing.dev.enabled", "true");
5857
bigqueryHelper = RemoteBigQueryHelper.create();
5958
}
6059

0 commit comments

Comments
 (0)