Skip to content

Commit cc08308

Browse files
committed
added issue tracking and updated strings to use hardcoded vars
1 parent 8977110 commit cc08308

4 files changed

Lines changed: 15 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,8 +1788,10 @@ private static Attributes otelAttributesFromOptions(Map<Option, ?> options) {
17881788
return builder.build();
17891789
}
17901790

1791-
/* Temporary development gate for HttpTracingRequestInitializer rollout:
1792-
must be explicitly enabled with the system property
1791+
/**
1792+
* Temporary development gate for HttpTracingRequestInitializer rollout: must be explicitly
1793+
* enabled with the system property. tracking ticket for removal:
1794+
* https://github.com/googleapis/google-cloud-java/issues/12100
17931795
*/
17941796
static boolean isHttpTracingEnabled() {
17951797
return Boolean.parseBoolean(System.getProperty(HTTP_TRACING_DEV_GATE_PROPERTY));

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ private BigQueryTelemetryTracer() {}
3333
public static final String BQ_GCP_CLIENT_ARTIFACT = "google-cloud-bigquery";
3434
public static final String BQ_GCP_CLIENT_LANGUAGE = "java";
3535

36+
// TODO: migrate to use gax attributes keys
37+
// https://github.com/googleapis/google-cloud-java/issues/12099
3638
// Common GCP Attributes
3739
public static final AttributeKey<String> GCP_CLIENT_SERVICE =
3840
AttributeKey.stringKey("gcp.client.service");

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
@InternalApi
3434
public class HttpTracingRequestInitializer implements HttpRequestInitializer {
3535

36+
// TODO: migrate to use gax attributes keys
37+
// https://github.com/googleapis/google-cloud-java/issues/12099
3638
// HTTP Specific Telemetry Attributes
3739
public static final AttributeKey<String> HTTP_REQUEST_METHOD =
3840
AttributeKey.stringKey("http.request.method");

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static com.google.common.truth.Truth.assertThat;
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertNotNull;
21+
import static org.junit.jupiter.api.Assertions.assertNull;
2122
import static org.junit.jupiter.api.Assertions.assertThrows;
2223
import static org.junit.jupiter.api.Assertions.assertTrue;
2324

@@ -44,6 +45,8 @@
4445
import com.google.api.services.bigquery.model.TableReference;
4546
import com.google.cloud.NoCredentials;
4647
import com.google.cloud.bigquery.BigQueryOptions;
48+
import com.google.cloud.bigquery.telemetry.BigQueryTelemetryTracer;
49+
import com.google.cloud.bigquery.telemetry.HttpTracingRequestInitializer;
4750
import io.opentelemetry.api.common.AttributeKey;
4851
import io.opentelemetry.api.trace.Tracer;
4952
import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -943,9 +946,8 @@ public void testHttpTracingEnabledAddsAdditionalAttributes() throws Exception {
943946
.findFirst()
944947
.orElse(null);
945948
assertNotNull(rpcSpan);
946-
assertEquals(
947-
"http", rpcSpan.getAttributes().get(AttributeKey.stringKey("rpc.system.name")));
948-
assertNotNull(rpcSpan.getAttributes().get(AttributeKey.stringKey("server.address")));
949+
assertEquals("http", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.RPC_SYSTEM_NAME));
950+
assertNotNull(rpcSpan.getAttributes().get(HttpTracingRequestInitializer.URL_DOMAIN));
949951
} finally {
950952
System.clearProperty("com.google.cloud.bigquery.http.tracing.dev.enabled");
951953
}
@@ -987,8 +989,8 @@ public void testHttpTracingDisabledDoesNotAddAdditionalAttributes() throws Excep
987989
.findFirst()
988990
.orElse(null);
989991
assertNotNull(rpcSpan);
990-
assertThat(rpcSpan.getAttributes().get(AttributeKey.stringKey("rpc.system.name"))).isNull();
991-
assertThat(rpcSpan.getAttributes().get(AttributeKey.stringKey("server.address"))).isNull();
992+
assertNull(rpcSpan.getAttributes().get(BigQueryTelemetryTracer.RPC_SYSTEM_NAME));
993+
assertNull(rpcSpan.getAttributes().get(HttpTracingRequestInitializer.URL_DOMAIN));
992994
} finally {
993995
System.clearProperty("com.google.cloud.bigquery.http.tracing.dev.enabled");
994996
}

0 commit comments

Comments
 (0)