From f0b7b3720da9076a46cae8d27dea7def1666e221 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Tue, 24 Mar 2026 11:29:05 -0400
Subject: [PATCH 1/5] feat(bigquery): add url.template to span tracing

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 39 ++++++++++++++++++-
 .../telemetry/BigQueryTelemetryTracer.java    |  1 +
 .../HttpTracingRequestInitializer.java        |  1 -
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  |  3 ++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
index d4ef3832f8c2..8eccc74fe8b1 100644
--- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
+++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
@@ -193,6 +193,7 @@ public Dataset getDatasetSkipExceptionTranslation(
             "DatasetService",
             "GetDataset",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             options),
         span -> {
           Dataset dataset = bqGetRequest.execute();
@@ -243,6 +244,7 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
             "DatasetService",
             "ListDatasets",
             gcpResourceDestinationId,
+            datasetsListRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -301,6 +303,7 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
             "DatasetService",
             "InsertDataset",
             gcpResourceDestinationId,
+            bqCreateRequest.getUriTemplate(),
             options),
         span -> {
           Dataset datasetResponse = bqCreateRequest.execute();
@@ -354,6 +357,7 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "TableService",
             "InsertTable",
             gcpResourceDestinationId,
+            bqCreateRequest.getUriTemplate(),
             options),
         span -> {
           Table tableResponse = bqCreateRequest.execute();
@@ -405,6 +409,7 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "RoutineService",
             "InsertRoutine",
             gcpResourceDestinationId,
+            bqCreateRequest.getUriTemplate(),
             options),
         span -> {
           Routine routineResponse = bqCreateRequest.execute();
@@ -456,6 +461,7 @@ public Job createSkipExceptionTranslation(Job job, Map<Option, ?> options) throw
             "JobService",
             "InsertJob",
             gcpResourceDestinationId,
+            bqCreateRequest.getUriTemplate(),
             options),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
@@ -504,6 +510,7 @@ public Job createJobForQuerySkipExceptionTranslation(Job job) throws IOException
             "JobService",
             "InsertJob",
             gcpResourceDestinationId,
+            bqCreateRequest.getUriTemplate(),
             null),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
@@ -558,6 +565,7 @@ public boolean deleteDatasetSkipExceptionTranslation(
             "DatasetService",
             "DeleteDataset",
             gcpResourceDestinationId,
+            bqDeleteRequest.getUriTemplate(),
             options),
         span -> {
           bqDeleteRequest.execute();
@@ -609,6 +617,7 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
             "DatasetService",
             "PatchDataset",
             gcpResourceDestinationId,
+            bqPatchRequest.getUriTemplate(),
             options),
         span -> {
           Dataset datasetResponse = bqPatchRequest.execute();
@@ -664,6 +673,7 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "TableService",
             "PatchTable",
             gcpResourceDestinationId,
+            bqPatchRequest.getUriTemplate(),
             options),
         span -> {
           Table tableResponse = bqPatchRequest.execute();
@@ -721,6 +731,7 @@ public Table getTableSkipExceptionTranslation(
             "TableService",
             "GetTable",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             options),
         span -> {
           Table tableResponse = bqGetRequest.execute();
@@ -779,6 +790,7 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
             "TableService",
             "ListTables",
             gcpResourceDestinationId,
+            tableListRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -853,6 +865,7 @@ public boolean deleteTableSkipExceptionTranslation(
             "TableService",
             "DeleteTable",
             gcpResourceDestinationId,
+            bqDeleteRequest.getUriTemplate(),
             null),
         span -> {
           bqDeleteRequest.execute();
@@ -903,6 +916,7 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
             "ModelService",
             "PatchModel",
             gcpResourceDestinationId,
+            bqPatchRequest.getUriTemplate(),
             options),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
@@ -960,6 +974,7 @@ public Model getModelSkipExceptionTranslation(
             "ModelService",
             "GetModel",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             options),
         span -> {
           Model modelResponse = bqGetRequest.execute();
@@ -1012,6 +1027,7 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
             "ModelService",
             "ListModels",
             gcpResourceDestinationId,
+            modelListRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -1070,6 +1086,7 @@ public boolean deleteModelSkipExceptionTranslation(
             "ModelService",
             "DeleteModel",
             gcpResourceDestinationId,
+            bqDeleteRequest.getUriTemplate(),
             null),
         span -> {
           bqDeleteRequest.execute();
@@ -1122,6 +1139,7 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "RoutineService",
             "UpdateRoutine",
             gcpResourceDestinationId,
+            bqUpdateRequest.getUriTemplate(),
             options),
         span -> {
           Routine routineResponse = bqUpdateRequest.execute();
@@ -1179,6 +1197,7 @@ public Routine getRoutineSkipExceptionTranslation(
             "RoutineService",
             "GetRoutine",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             options),
         span -> {
           Routine routineResponse = bqGetRequest.execute();
@@ -1231,6 +1250,7 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
             "RoutineService",
             "ListRoutines",
             gcpResourceDestinationId,
+            routineListRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -1288,6 +1308,7 @@ public boolean deleteRoutineSkipExceptionTranslation(
             "RoutineService",
             "DeleteRoutine",
             gcpResourceDestinationId,
+            bqDeleteRequest.getUriTemplate(),
             null),
         span -> {
           bqDeleteRequest.execute();
@@ -1336,6 +1357,7 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
             "TableDataService",
             "InsertAll",
             gcpResourceDestinationId,
+            insertAllRequest.getUriTemplate(),
             null),
         span -> insertAllRequest.execute());
   }
@@ -1387,6 +1409,7 @@ public TableDataList listTableDataSkipExceptionTranslation(
             "TableDataService",
             "List",
             gcpResourceDestinationId,
+            bqListRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -1448,6 +1471,7 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
             "TableDataService",
             "List",
             gcpResourceDestinationId,
+            bqListRequest.getUriTemplate(),
             null),
         span -> {
           if (span != null) {
@@ -1500,6 +1524,7 @@ public Job getJobSkipExceptionTranslation(
             "JobService",
             "GetJob",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             options),
         span -> {
           Job jobResponse = bqGetRequest.execute();
@@ -1550,6 +1575,7 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
             "JobService",
             "GetJob",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             null),
         span -> {
           Job jobResponse = bqGetRequest.execute();
@@ -1612,6 +1638,7 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
             "JobService",
             "ListJobs",
             gcpResourceDestinationId,
+            listJobsRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -1689,6 +1716,7 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
             "JobService",
             "CancelJob",
             gcpResourceDestinationId,
+            bqCancelRequest.getUriTemplate(),
             null),
         span -> {
           bqCancelRequest.execute();
@@ -1730,6 +1758,7 @@ public boolean deleteJobSkipExceptionTranslation(
             "JobService",
             "DeleteJob",
             gcpResourceDestinationId,
+            bqDeleteRequest.getUriTemplate(),
             null),
         span -> {
           bqDeleteRequest.execute();
@@ -1783,6 +1812,7 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
             "JobService",
             "GetQueryResults",
             gcpResourceDestinationId,
+            queryRequest.getUriTemplate(),
             options),
         span -> {
           if (span != null) {
@@ -1835,6 +1865,7 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
             "JobService",
             "GetQueryResults",
             gcpResourceDestinationId,
+            queryRequest.getUriTemplate(),
             null),
         span -> {
           if (span != null) {
@@ -1875,6 +1906,7 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
             "JobService",
             "Query",
             gcpResourceDestinationId,
+            queryRequest.getUriTemplate(),
             null),
         span -> {
           return queryRequest.execute();
@@ -2006,6 +2038,7 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
             "TableService",
             "GetIamPolicy",
             gcpResourceDestinationId,
+            bqGetRequest.getUriTemplate(),
             options),
         span -> {
           return bqGetRequest.execute();
@@ -2042,6 +2075,7 @@ public Policy setIamPolicySkipExceptionTranslation(
             "TableService",
             "SetIamPolicy",
             gcpResourceDestinationId,
+            bqSetRequest.getUriTemplate(),
             options),
         span -> {
           return bqSetRequest.execute();
@@ -2079,6 +2113,7 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
             "TableService",
             "TestIamPermissions",
             gcpResourceDestinationId,
+            bqTestRequest.getUriTemplate(),
             options),
         span -> {
           return bqTestRequest.execute();
@@ -2095,6 +2130,7 @@ private Span createRpcTracingSpan(
       String service,
       String method,
       String gcpResourceDestinationId,
+      String urlTemplate,
       Map<Option, ?> options) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
@@ -2110,7 +2146,8 @@ private Span createRpcTracingSpan(
             .setAttribute("bq.rpc.method", method)
             .setAttribute("bq.rpc.system", "http")
             .setAttribute(
-                BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId);
+                BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId)
+            .setAttribute(BigQueryTelemetryTracer.URL_TEMPLATE, urlTemplate);
 
     if (options != null) {
       builder.setAllAttributes(otelAttributesFromOptions(options));
diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java
index 225c05b1421c..82c354ef5446 100644
--- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java
+++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java
@@ -65,6 +65,7 @@ private BigQueryTelemetryTracer() {}
   public static final AttributeKey<String> SERVER_ADDRESS =
       AttributeKey.stringKey("server.address");
   public static final AttributeKey<Long> SERVER_PORT = AttributeKey.longKey("server.port");
+  public static final AttributeKey<String> URL_TEMPLATE = AttributeKey.stringKey("url.template");
 
   public static void addCommonAttributeToSpan(Span span) {
     span.setAttribute(GCP_CLIENT_SERVICE, BQ_GCP_CLIENT_SERVICE)
diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java
index 0bc60efdbef9..273fff6b334a 100644
--- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java
+++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java
@@ -39,7 +39,6 @@ public class HttpTracingRequestInitializer implements HttpRequestInitializer {
   public static final AttributeKey<String> HTTP_REQUEST_METHOD =
       AttributeKey.stringKey("http.request.method");
   public static final AttributeKey<String> URL_FULL = AttributeKey.stringKey("url.full");
-  public static final AttributeKey<String> URL_TEMPLATE = AttributeKey.stringKey("url.template");
   public static final AttributeKey<String> URL_DOMAIN = AttributeKey.stringKey("url.domain");
   public static final AttributeKey<Long> HTTP_RESPONSE_STATUS_CODE =
       AttributeKey.longKey("http.response.status_code");
diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
index bafc92b63e99..cd7c24205bee 100644
--- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
+++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
@@ -154,6 +154,9 @@ private void verifySpan(
     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")));
+    assertNotNull(
+        rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")),
+        "url.template attribute should be set");
 
     assertEquals(
         gcpResourceDestinationId,

From 18f16c87cedd3f4efa4105cdcd3f839fbe324e14 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Tue, 24 Mar 2026 11:43:04 -0400
Subject: [PATCH 2/5] add url.template specific test

---
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
index cd7c24205bee..e4dbcc3ee2a2 100644
--- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
+++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
@@ -1104,6 +1104,35 @@ public void testHttpTracingEnabled_JsonResponseException_SetsAttributes() throws
           "Invalid request", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.STATUS_MESSAGE));
       assertNull(rpcSpan.getAttributes().get(BigQueryTelemetryTracer.EXCEPTION_TYPE));
     }
+
+    @Test
+    public void testGetUriTemplateValueTelemetry() throws Exception {
+      setMockResponse(
+          "{\"kind\":\"bigquery#dataset\",\"id\":\""
+              + PROJECT_ID
+              + ":"
+              + DATASET_ID
+              + "\",\"datasetReference\":{\"projectId\":\""
+              + PROJECT_ID
+              + "\",\"datasetId\":\""
+              + DATASET_ID
+              + "\"}}");
+
+      rpc.getDatasetSkipExceptionTranslation(PROJECT_ID, DATASET_ID, new HashMap<>());
+
+      List<SpanData> spans = spanExporter.getFinishedSpanItems();
+      assertThat(spans).isNotEmpty();
+      SpanData rpcSpan =
+          spans.stream()
+              .filter(
+                  span -> span.getName().equals("com.google.cloud.bigquery.BigQueryRpc.getDataset"))
+              .findFirst()
+              .orElse(null);
+      assertNotNull(rpcSpan);
+      assertEquals(
+          "projects/{+projectId}/datasets/{+datasetId}",
+          rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")));
+    }
   }
 
   @Nested

From 2d32e6d2bd7345c2cb72d15aeddb329fa9e7e712 Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Tue, 24 Mar 2026 11:43:38 -0400
Subject: [PATCH 3/5] use constant

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 .../com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
index e4dbcc3ee2a2..1a9160650ae0 100644
--- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
+++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
@@ -155,7 +155,7 @@ private void verifySpan(
     assertEquals(method, rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.method")));
     assertEquals("http", rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.system")));
     assertNotNull(
-        rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")),
+        rpcSpan.getAttributes().get(BigQueryTelemetryTracer.URL_TEMPLATE),
         "url.template attribute should be set");
 
     assertEquals(

From 61269786bec93a215600a850dcaaa47f63b16ab0 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Tue, 24 Mar 2026 11:44:45 -0400
Subject: [PATCH 4/5] fix constant reference

---
 .../com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
index 1a9160650ae0..dc7bfc3f4a94 100644
--- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
+++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
@@ -1131,7 +1131,7 @@ public void testGetUriTemplateValueTelemetry() throws Exception {
       assertNotNull(rpcSpan);
       assertEquals(
           "projects/{+projectId}/datasets/{+datasetId}",
-          rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")));
+          rpcSpan.getAttributes().get(BigQueryTelemetryTracer.URL_TEMPLATE));
     }
   }
 

From d599d042682c9ba7df86b7cfca57cc18233ff3b8 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Tue, 24 Mar 2026 12:16:38 -0400
Subject: [PATCH 5/5] add new attributes behind dev gate

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 11 +++---
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  | 34 +++++++++++++------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
index 8eccc74fe8b1..8eede5a0937b 100644
--- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
+++ b/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));
diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
index dc7bfc3f4a94..acb33d2a1104 100644
--- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
+++ b/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