add new attributes behind dev gate

Author: ldetmer

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

@@ -2144,10 +2144,13 @@ private Span createRpcTracingSpan(
             .setSpanKind(SpanKind.CLIENT)
             .setAttribute("bq.rpc.service", service)
             .setAttribute("bq.rpc.method", method)
-            .setAttribute("bq.rpc.system", "http")
-            .setAttribute(
-                BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
-            .setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate);
+            .setAttribute("bq.rpc.system", "http");
+    if (isHttpTracingEnabled()) {
+      builder
+          .setAttribute(
+              BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
+          .setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate);
+    }
 
     if (options != null) {
       builder.setAllAttributes(otelAttributesFromOptions(options));

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

@@ -150,17 +150,24 @@ private void verifySpan(
     assertThat(spans).isNotEmpty();
     SpanData rpcSpan =
         spans.stream().filter(span -> span.getName().equals(spanName)).findFirst().orElse(null);
-    assertNotNull(rpcSpan);
-    assertEquals(service, rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.service")));
-    assertEquals(method, rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.method")));
-    assertEquals("http", rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.system")));
+
+    verifySpanProductionAttributes(service, method, attributes, rpcSpan);
+
     assertNotNull(
-        rpcSpan.getAttributes().get(BigQueryTelemetryTracer.URL_TEMPLATE),
+        rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")),
         "url.template attribute should be set");
 
     assertEquals(
         gcpResourceDestinationId,
         rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
+  }
+
+  private void verifySpanProductionAttributes(
+      String service, String method, Map<String, String> attributes, SpanData rpcSpan) {
+    assertNotNull(rpcSpan);
+    assertEquals(service, rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.service")));
+    assertEquals(method, rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.method")));
+    assertEquals("http", rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.system")));
 
     if (attributes != null) {
       for (Map.Entry<String, String> entry : attributes.entrySet()) {
@@ -1162,12 +1169,6 @@ public void testHttpTracingDisabledDoesNotAddAdditionalAttributes() throws Excep
       rpc.getDatasetSkipExceptionTranslation(PROJECT_ID, DATASET_ID, new HashMap<>());
 
       verifyRequest("GET", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
-      verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.getDataset",
-          "DatasetService",
-          "GetDataset",
-          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
-          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
 
       List<SpanData> spans = spanExporter.getFinishedSpanItems();
       assertThat(spans).isNotEmpty();
@@ -1178,8 +1179,19 @@ public void testHttpTracingDisabledDoesNotAddAdditionalAttributes() throws Excep
               .findFirst()
               .orElse(null);
       assertNotNull(rpcSpan);
+      verifySpanProductionAttributes(
+          "DatasetService",
+          "GetDataset",
+          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID),
+          rpcSpan);
+
       assertNull(rpcSpan.getAttributes().get(BigQueryTelemetryTracer.RPC_SYSTEM_NAME));
       assertNull(rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_CLIENT_SERVICE));
+      assertNull(
+          rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")),
+          "url.template attribute should not be set");
+
+      assertNull(rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
     }
 
     @Test