Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ public class HttpBigQueryRpc implements BigQueryRpc {

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

if (options.isOpenTelemetryTracingEnabled()
&& options.getOpenTelemetryTracer() != null
&& isHttpTracingEnabled()) {
&& options.getOpenTelemetryTracer() != null) {
initializer =
new HttpTracingRequestInitializer(initializer, options.getOpenTelemetryTracer());
}
Expand Down Expand Up @@ -2146,14 +2143,11 @@ private Span createRpcTracingSpan(
.setSpanKind(SpanKind.CLIENT)
.setAttribute("bq.rpc.service", service)
.setAttribute("bq.rpc.method", method)
.setAttribute("bq.rpc.system", "http");
if (isHttpTracingEnabled()) {
builder
.setAttribute(
BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
.setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate)
.setAttribute(BigQueryTelemetryTracer.URL_DOMAIN, this.urlDomain);
}
.setAttribute("bq.rpc.system", "http")
.setAttribute(
BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
.setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate)
.setAttribute(BigQueryTelemetryTracer.URL_DOMAIN, this.urlDomain);

if (options != null) {
builder.setAllAttributes(otelAttributesFromOptions(options));
Expand All @@ -2175,13 +2169,11 @@ private <T> T executeWithSpan(Span span, SpanOperation<T> operation) throws IOEx
try (Scope scope = span.makeCurrent()) {
return operation.execute(span);
} catch (Exception e) {
if (isHttpTracingEnabled()) {
if (e instanceof GoogleJsonResponseException) {
BigQueryTelemetryTracer.addServerErrorResponseToSpan(
((GoogleJsonResponseException) e), span);
} else {
BigQueryTelemetryTracer.addExceptionToSpan(e, span);
}
if (e instanceof GoogleJsonResponseException) {
BigQueryTelemetryTracer.addServerErrorResponseToSpan(
((GoogleJsonResponseException) e), span);
} else {
BigQueryTelemetryTracer.addExceptionToSpan(e, span);
}
throw e;
} finally {
Expand All @@ -2203,12 +2195,4 @@ private static Attributes otelAttributesFromOptions(Map<Option, ?> options) {
return builder.build();
}

/**
* Temporary development gate for HttpTracingRequestInitializer rollout: must be explicitly
* enabled with the system property. tracking ticket for removal:
* https://github.com/googleapis/google-cloud-java/issues/12100
*/
static boolean isHttpTracingEnabled() {
return Boolean.parseBoolean(System.getProperty(HTTP_TRACING_DEV_GATE_PROPERTY));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public class ITOpenTelemetryTest {

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

Expand Down
Loading
Loading