From 22dafed316a59561c3a9f82c02601f51e2453203 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 13:23:03 -0400
Subject: [PATCH 01/12] feat(bigquery): add gcp.resource.destination.id for
 span tracing

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 220 +++++++++++++++---
 .../telemetry/BigQueryTelemetryTracer.java    |   2 +-
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  |  41 +++-
 3 files changed, 224 insertions(+), 39 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 bd346d53c19b..ab63604a2682 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
@@ -183,7 +183,8 @@ public Dataset getDatasetSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getDataset",
             "DatasetService",
             "GetDataset",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/" + projectId + "/datasets/" + datasetId),
         span -> {
           Dataset dataset = bqGetRequest.execute();
           if (span != null) {
@@ -225,7 +226,8 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
             "DatasetService",
             "ListDatasets",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/" + projectId + "/datasets"),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", datasetsListRequest.getPageToken());
@@ -274,7 +276,11 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.createDataset",
             "DatasetService",
             "InsertDataset",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + dataset.getDatasetReference().getProjectId()
+                + "/datasets/"
+                + dataset.getDatasetReference().getDatasetId()),
         span -> {
           Dataset datasetResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -316,7 +322,13 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.createTable",
             "TableService",
             "InsertTable",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + reference.getProjectId()
+                + "/datasets/"
+                + reference.getDatasetId()
+                + "/tables/"
+                + reference.getTableId()),
         span -> {
           Table tableResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -356,7 +368,13 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.createRoutine",
             "RoutineService",
             "InsertRoutine",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + reference.getProjectId()
+                + "/datasets/"
+                + reference.getDatasetId()
+                + "/routines/"
+                + reference.getRoutineId()),
         span -> {
           Routine routineResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -481,7 +499,8 @@ public boolean deleteDatasetSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteDataset",
             "DatasetService",
             "DeleteDataset",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/" + projectId + "/datasets/" + datasetId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -523,7 +542,11 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
             "com.google.cloud.bigquery.BigQueryRpc.patchDataset",
             "DatasetService",
             "PatchDataset",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + reference.getProjectId()
+                + "/datasets/"
+                + reference.getDatasetId()),
         span -> {
           Dataset datasetResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -567,7 +590,13 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchTable",
             "TableService",
             "PatchTable",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + reference.getProjectId()
+                + "/datasets/"
+                + reference.getDatasetId()
+                + "/tables/"
+                + reference.getTableId()),
         span -> {
           Table tableResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -610,7 +639,16 @@ public Table getTableSkipExceptionTranslation(
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.getTable", "TableService", "GetTable", options),
+            "com.google.cloud.bigquery.BigQueryRpc.getTable",
+            "TableService",
+            "GetTable",
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/tables/"
+                + tableId),
         span -> {
           Table tableResponse = bqGetRequest.execute();
           if (span != null) {
@@ -658,7 +696,12 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTables",
             "TableService",
             "ListTables",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/tables"),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", tableListRequest.getPageToken());
@@ -721,7 +764,13 @@ public boolean deleteTableSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteTable",
             "TableService",
             "DeleteTable",
-            null),
+            null,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/tables/"
+                + tableId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -760,7 +809,13 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchModel",
             "ModelService",
             "PatchModel",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + reference.getProjectId()
+                + "/datasets/"
+                + reference.getDatasetId()
+                + "/models/"
+                + reference.getModelId()),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -803,7 +858,16 @@ public Model getModelSkipExceptionTranslation(
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.getModel", "ModelService", "GetModel", options),
+            "com.google.cloud.bigquery.BigQueryRpc.getModel",
+            "ModelService",
+            "GetModel",
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/models/"
+                + modelId),
         span -> {
           Model modelResponse = bqGetRequest.execute();
           if (span != null) {
@@ -845,7 +909,12 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listModels",
             "ModelService",
             "ListModels",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/models"),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", modelListRequest.getPageToken());
@@ -892,7 +961,13 @@ public boolean deleteModelSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteModel",
             "ModelService",
             "DeleteModel",
-            null),
+            null,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/models/"
+                + modelId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -933,7 +1008,13 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.updateRoutine",
             "RoutineService",
             "UpdateRoutine",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + reference.getProjectId()
+                + "/datasets/"
+                + reference.getDatasetId()
+                + "/routines/"
+                + reference.getRoutineId()),
         span -> {
           Routine routineResponse = bqUpdateRequest.execute();
           if (span != null) {
@@ -979,7 +1060,13 @@ public Routine getRoutineSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getRoutine",
             "RoutineService",
             "GetRoutine",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/routines/"
+                + routineId),
         span -> {
           Routine routineResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1021,7 +1108,12 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listRoutines",
             "RoutineService",
             "ListRoutines",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/routines"),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", routineListRequest.getPageToken());
@@ -1067,7 +1159,13 @@ public boolean deleteRoutineSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteRoutine",
             "RoutineService",
             "DeleteRoutine",
-            null),
+            null,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/routines/"
+                + routineId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1104,7 +1202,13 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.insertAll",
             "TableDataService",
             "InsertAll",
-            null),
+            null,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/tables/"
+                + tableId),
         span -> insertAllRequest.execute());
   }
 
@@ -1144,7 +1248,13 @@ public TableDataList listTableDataSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTableData",
             "TableDataService",
             "List",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/tables/"
+                + tableId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1194,7 +1304,13 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTableDataWithRowLimit",
             "TableDataService",
             "List",
-            null),
+            null,
+            "//bigquery.googleapis.com/projects/"
+                + projectId
+                + "/datasets/"
+                + datasetId
+                + "/tables/"
+                + tableId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1234,7 +1350,11 @@ public Job getJobSkipExceptionTranslation(
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.getJob", "JobService", "GetJob", options),
+            "com.google.cloud.bigquery.BigQueryRpc.getJob",
+            "JobService",
+            "GetJob",
+            options,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1272,7 +1392,11 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.getQueryJob", "JobService", "GetJob", null),
+            "com.google.cloud.bigquery.BigQueryRpc.getQueryJob",
+            "JobService",
+            "GetJob",
+            null,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1323,7 +1447,11 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.listJobs", "JobService", "ListJobs", options),
+            "com.google.cloud.bigquery.BigQueryRpc.listJobs",
+            "JobService",
+            "ListJobs",
+            options,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs"),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", listJobsRequest.getPageToken());
@@ -1388,7 +1516,11 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.cancelJob", "JobService", "CancelJob", null),
+            "com.google.cloud.bigquery.BigQueryRpc.cancelJob",
+            "JobService",
+            "CancelJob",
+            null,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
         span -> {
           bqCancelRequest.execute();
           return true;
@@ -1417,7 +1549,11 @@ public boolean deleteJobSkipExceptionTranslation(
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.deleteJob", "JobService", "DeleteJob", null),
+            "com.google.cloud.bigquery.BigQueryRpc.deleteJob",
+            "JobService",
+            "DeleteJob",
+            null,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobName),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1461,7 +1597,8 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResults",
             "JobService",
             "GetQueryResults",
-            options),
+            options,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1504,7 +1641,8 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResultsWithRowLimit",
             "JobService",
             "GetQueryResults",
-            null),
+            null,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1533,7 +1671,11 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
 
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.queryRpc", "JobService", "Query", null),
+            "com.google.cloud.bigquery.BigQueryRpc.queryRpc",
+            "JobService",
+            "Query",
+            null,
+            "//bigquery.googleapis.com/projects/" + projectId + "/jobs"),
         span -> {
           return queryRequest.execute();
         });
@@ -1660,7 +1802,8 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
             "com.google.cloud.bigquery.BigQueryRpc.getIamPolicy",
             "TableService",
             "GetIamPolicy",
-            options),
+            options,
+            "//bigquery.googleapis.com/" + resourceId),
         span -> {
           return bqGetRequest.execute();
         });
@@ -1692,7 +1835,8 @@ public Policy setIamPolicySkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.setIamPolicy",
             "TableService",
             "SetIamPolicy",
-            options),
+            options,
+            "//bigquery.googleapis.com/" + resourceId),
         span -> {
           return bqSetRequest.execute();
         });
@@ -1725,7 +1869,8 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.testIamPermissions",
             "TableService",
             "TestIamPermissions",
-            options),
+            options,
+            "//bigquery.googleapis.com/" + resourceId),
         span -> {
           return bqTestRequest.execute();
         });
@@ -1738,6 +1883,11 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
    */
   private Span createRpcTracingSpan(
       String spanName, String service, String method, Map<Option, ?> options) {
+    return createRpcTracingSpan(spanName, service, method, options, null);
+  }
+
+  private Span createRpcTracingSpan(
+      String spanName, String service, String method, Map<Option, ?> options, String resourceId) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
       return null;
@@ -1752,6 +1902,10 @@ private Span createRpcTracingSpan(
             .setAttribute("bq.rpc.method", method)
             .setAttribute("bq.rpc.system", "http");
 
+    if (resourceId != null) {
+      builder.setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, resourceId);
+    }
+
     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 6a0a4a8caca6..92433e416fd4 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
@@ -49,7 +49,7 @@ private BigQueryTelemetryTracer() {}
       AttributeKey.stringKey("gcp.client.artifact");
   public static final AttributeKey<String> GCP_CLIENT_LANGUAGE =
       AttributeKey.stringKey("gcp.client.language");
-  public static final AttributeKey<String> GCP_RESOURCE_ID =
+  public static final AttributeKey<String> GCP_DESTINATION_ID =
       AttributeKey.stringKey("gcp.resource.destination.id");
   public static final AttributeKey<String> RPC_SYSTEM_NAME =
       AttributeKey.stringKey("rpc.system.name");
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 1386a0213b08..a22303ca9e24 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
@@ -149,6 +149,11 @@ 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")));
+    if (attributes != null && attributes.containsKey("gcp.resource.destination.id")) {
+      assertEquals(
+          attributes.get("gcp.resource.destination.id"),
+          rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_DESTINATION_ID));
+    }
 
     if (attributes != null) {
       for (Map.Entry<String, String> entry : attributes.entrySet()) {
@@ -234,11 +239,17 @@ public void testGetDatasetTelemetry() throws Exception {
       rpc.getDatasetSkipExceptionTranslation(PROJECT_ID, DATASET_ID, new HashMap<>());
 
       verifyRequest("GET", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+      Map<String, String> expectedAttributes = new HashMap<>();
+      expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
+      expectedAttributes.put(
+          "gcp.resource.destination.id",
+          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.getDataset",
           "DatasetService",
           "GetDataset",
-          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
+          expectedAttributes);
     }
 
     @Test
@@ -249,11 +260,17 @@ public void testListDatasetsTelemetry() throws Exception {
       rpc.listDatasetsSkipExceptionTranslation(PROJECT_ID, new HashMap<>());
 
       verifyRequest("GET", "/projects/" + PROJECT_ID + "/datasets");
+      Map<String, String> expectedAttributes = new HashMap<>();
+      expectedAttributes.put("bq.rpc.next_page_token", "next-page-token");
+      expectedAttributes.put(
+          "gcp.resource.destination.id",
+          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets");
+
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
           "DatasetService",
           "ListDatasets",
-          Collections.singletonMap("bq.rpc.next_page_token", "next-page-token"));
+          expectedAttributes);
     }
 
     @Test
@@ -267,11 +284,17 @@ public void testCreateDatasetTelemetry() throws Exception {
       rpc.createSkipExceptionTranslation(dataset, new HashMap<>());
 
       verifyRequest("POST", "/projects/" + PROJECT_ID + "/datasets");
+      Map<String, String> expectedAttributes = new HashMap<>();
+      expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
+      expectedAttributes.put(
+          "gcp.resource.destination.id",
+          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.createDataset",
           "DatasetService",
           "InsertDataset",
-          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
+          expectedAttributes);
     }
 
     @Test
@@ -286,7 +309,9 @@ public void testDeleteDatasetTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.deleteDataset",
           "DatasetService",
           "DeleteDataset",
-          null);
+          Collections.singletonMap(
+              "gcp.resource.destination.id",
+              "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID));
     }
 
     @Test
@@ -300,11 +325,17 @@ public void testPatchDatasetTelemetry() throws Exception {
       rpc.patchSkipExceptionTranslation(dataset, new HashMap<>());
 
       verifyRequest("PATCH", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+      Map<String, String> expectedAttributes = new HashMap<>();
+      expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
+      expectedAttributes.put(
+          "gcp.resource.destination.id",
+          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.patchDataset",
           "DatasetService",
           "PatchDataset",
-          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
+          expectedAttributes);
     }
 
     @Test

From cbf47f1bc11f78b2826c858debf584e6feaf8cdb Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 13:55:01 -0400
Subject: [PATCH 02/12] clean up variable inputs

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 234 ++++++++----------
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  |  12 +-
 2 files changed, 115 insertions(+), 131 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 ab63604a2682..aa1024ee766b 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
@@ -90,6 +90,7 @@ public class HttpBigQueryRpc implements BigQueryRpc {
   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";
+  private static final String RESOURCE_PROJECT_PREFIX = "//bigquery.googleapis.com/projects/";
   // see:
   // https://cloud.google.com/bigquery/loading-data-post-request#resume-upload
   private static final int HTTP_RESUME_INCOMPLETE = 308;
@@ -178,13 +179,15 @@ public Dataset getDatasetSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getDataset",
             "DatasetService",
             "GetDataset",
             options,
-            "//bigquery.googleapis.com/projects/" + projectId + "/datasets/" + datasetId),
+            destinationId),
         span -> {
           Dataset dataset = bqGetRequest.execute();
           if (span != null) {
@@ -221,13 +224,15 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
             "DatasetService",
             "ListDatasets",
             options,
-            "//bigquery.googleapis.com/projects/" + projectId + "/datasets"),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", datasetsListRequest.getPageToken());
@@ -271,16 +276,15 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + dataset.getDatasetReference().getProjectId() + "/datasets/" + dataset.getDatasetReference().getDatasetId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.createDataset",
             "DatasetService",
             "InsertDataset",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + dataset.getDatasetReference().getProjectId()
-                + "/datasets/"
-                + dataset.getDatasetReference().getDatasetId()),
+            destinationId),
         span -> {
           Dataset datasetResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -317,18 +321,21 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + reference.getProjectId()
+            + "/datasets/"
+            + reference.getDatasetId()
+            + "/tables/"
+            + reference.getTableId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.createTable",
             "TableService",
             "InsertTable",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + reference.getProjectId()
-                + "/datasets/"
-                + reference.getDatasetId()
-                + "/tables/"
-                + reference.getTableId()),
+            destinationId),
         span -> {
           Table tableResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -363,18 +370,15 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/routines/" + reference.getRoutineId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.createRoutine",
             "RoutineService",
             "InsertRoutine",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + reference.getProjectId()
-                + "/datasets/"
-                + reference.getDatasetId()
-                + "/routines/"
-                + reference.getRoutineId()),
+            destinationId),
         span -> {
           Routine routineResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -494,13 +498,15 @@ public boolean deleteDatasetSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.deleteDataset",
             "DatasetService",
             "DeleteDataset",
             options,
-            "//bigquery.googleapis.com/projects/" + projectId + "/datasets/" + datasetId),
+            destinationId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -537,16 +543,15 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.patchDataset",
             "DatasetService",
             "PatchDataset",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + reference.getProjectId()
-                + "/datasets/"
-                + reference.getDatasetId()),
+            destinationId),
         span -> {
           Dataset datasetResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -585,18 +590,15 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/tables/" + reference.getTableId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.patchTable",
             "TableService",
             "PatchTable",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + reference.getProjectId()
-                + "/datasets/"
-                + reference.getDatasetId()
-                + "/tables/"
-                + reference.getTableId()),
+            destinationId),
         span -> {
           Table tableResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -637,18 +639,15 @@ public Table getTableSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getTable",
             "TableService",
             "GetTable",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/tables/"
-                + tableId),
+            destinationId),
         span -> {
           Table tableResponse = bqGetRequest.execute();
           if (span != null) {
@@ -691,17 +690,15 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listTables",
             "TableService",
             "ListTables",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/tables"),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", tableListRequest.getPageToken());
@@ -759,18 +756,15 @@ public boolean deleteTableSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.deleteTable",
             "TableService",
             "DeleteTable",
             null,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/tables/"
-                + tableId),
+            destinationId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -804,18 +798,15 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/models/" + reference.getModelId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.patchModel",
             "ModelService",
             "PatchModel",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + reference.getProjectId()
-                + "/datasets/"
-                + reference.getDatasetId()
-                + "/models/"
-                + reference.getModelId()),
+            destinationId),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -856,18 +847,15 @@ public Model getModelSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getModel",
             "ModelService",
             "GetModel",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/models/"
-                + modelId),
+            destinationId),
         span -> {
           Model modelResponse = bqGetRequest.execute();
           if (span != null) {
@@ -904,17 +892,15 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listModels",
             "ModelService",
             "ListModels",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/models"),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", modelListRequest.getPageToken());
@@ -956,18 +942,15 @@ public boolean deleteModelSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.deleteModel",
             "ModelService",
             "DeleteModel",
             null,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/models/"
-                + modelId),
+            destinationId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1003,18 +986,15 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/routines/" + reference.getRoutineId();
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.updateRoutine",
             "RoutineService",
             "UpdateRoutine",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + reference.getProjectId()
-                + "/datasets/"
-                + reference.getDatasetId()
-                + "/routines/"
-                + reference.getRoutineId()),
+            destinationId),
         span -> {
           Routine routineResponse = bqUpdateRequest.execute();
           if (span != null) {
@@ -1055,18 +1035,15 @@ public Routine getRoutineSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getRoutine",
             "RoutineService",
             "GetRoutine",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/routines/"
-                + routineId),
+            destinationId),
         span -> {
           Routine routineResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1103,17 +1080,15 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listRoutines",
             "RoutineService",
             "ListRoutines",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/routines"),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", routineListRequest.getPageToken());
@@ -1154,18 +1129,15 @@ public boolean deleteRoutineSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.deleteRoutine",
             "RoutineService",
             "DeleteRoutine",
             null,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/routines/"
-                + routineId),
+            destinationId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1197,18 +1169,15 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.insertAll",
             "TableDataService",
             "InsertAll",
             null,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/tables/"
-                + tableId),
+            destinationId),
         span -> insertAllRequest.execute());
   }
 
@@ -1243,18 +1212,15 @@ public TableDataList listTableDataSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listTableData",
             "TableDataService",
             "List",
             options,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/tables/"
-                + tableId),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1299,18 +1265,15 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listTableDataWithRowLimit",
             "TableDataService",
             "List",
             null,
-            "//bigquery.googleapis.com/projects/"
-                + projectId
-                + "/datasets/"
-                + datasetId
-                + "/tables/"
-                + tableId),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1348,13 +1311,15 @@ public Job getJobSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getJob",
             "JobService",
             "GetJob",
             options,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
+            destinationId),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1390,13 +1355,15 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getQueryJob",
             "JobService",
             "GetJob",
             null,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
+            destinationId),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1445,13 +1412,15 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listJobs",
             "JobService",
             "ListJobs",
             options,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs"),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", listJobsRequest.getPageToken());
@@ -1514,13 +1483,15 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.cancelJob",
             "JobService",
             "CancelJob",
             null,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
+            destinationId),
         span -> {
           bqCancelRequest.execute();
           return true;
@@ -1547,13 +1518,15 @@ public boolean deleteJobSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobName;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.deleteJob",
             "JobService",
             "DeleteJob",
             null,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobName),
+            destinationId),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1592,13 +1565,15 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResults",
             "JobService",
             "GetQueryResults",
             options,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1636,13 +1611,15 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResultsWithRowLimit",
             "JobService",
             "GetQueryResults",
             null,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs/" + jobId),
+            destinationId),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1669,13 +1646,15 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.queryRpc",
             "JobService",
             "Query",
             null,
-            "//bigquery.googleapis.com/projects/" + projectId + "/jobs"),
+            destinationId),
         span -> {
           return queryRequest.execute();
         });
@@ -1797,13 +1776,15 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = "//bigquery.googleapis.com/" + resourceId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getIamPolicy",
             "TableService",
             "GetIamPolicy",
             options,
-            "//bigquery.googleapis.com/" + resourceId),
+            destinationId),
         span -> {
           return bqGetRequest.execute();
         });
@@ -1830,13 +1811,15 @@ public Policy setIamPolicySkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = "//bigquery.googleapis.com/" + resourceId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.setIamPolicy",
             "TableService",
             "SetIamPolicy",
             options,
-            "//bigquery.googleapis.com/" + resourceId),
+            destinationId),
         span -> {
           return bqSetRequest.execute();
         });
@@ -1864,13 +1847,15 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = "//bigquery.googleapis.com/" + resourceId;
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.testIamPermissions",
             "TableService",
             "TestIamPermissions",
             options,
-            "//bigquery.googleapis.com/" + resourceId),
+            destinationId),
         span -> {
           return bqTestRequest.execute();
         });
@@ -1887,7 +1872,7 @@ private Span createRpcTracingSpan(
   }
 
   private Span createRpcTracingSpan(
-      String spanName, String service, String method, Map<Option, ?> options, String resourceId) {
+      String spanName, String service, String method, Map<Option, ?> options, String destinationId) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
       return null;
@@ -1902,10 +1887,9 @@ private Span createRpcTracingSpan(
             .setAttribute("bq.rpc.method", method)
             .setAttribute("bq.rpc.system", "http");
 
-    if (resourceId != null) {
-      builder.setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, resourceId);
+    if (destinationId != null) {
+      builder.setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, destinationId);
     }
-
     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 a22303ca9e24..8b7e4266346c 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
@@ -78,6 +78,7 @@ public class HttpBigQueryRpcTest {
   private static final String JOB_ID = "test-job";
   private static final String LOCATION = "test-location";
 
+  private static final String RESOURCE_PROJECT_PREFIX = "//bigquery.googleapis.com/projects/";
   private InMemorySpanExporter spanExporter;
   private MockLowLevelHttpResponse mockResponse;
   private String lastRequestMethod;
@@ -243,7 +244,7 @@ public void testGetDatasetTelemetry() throws Exception {
       expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
       expectedAttributes.put(
           "gcp.resource.destination.id",
-          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID);
 
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.getDataset",
@@ -263,8 +264,7 @@ public void testListDatasetsTelemetry() throws Exception {
       Map<String, String> expectedAttributes = new HashMap<>();
       expectedAttributes.put("bq.rpc.next_page_token", "next-page-token");
       expectedAttributes.put(
-          "gcp.resource.destination.id",
-          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets");
+          "gcp.resource.destination.id", RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets");
 
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
@@ -288,7 +288,7 @@ public void testCreateDatasetTelemetry() throws Exception {
       expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
       expectedAttributes.put(
           "gcp.resource.destination.id",
-          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID);
 
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.createDataset",
@@ -311,7 +311,7 @@ public void testDeleteDatasetTelemetry() throws Exception {
           "DeleteDataset",
           Collections.singletonMap(
               "gcp.resource.destination.id",
-              "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID));
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID));
     }
 
     @Test
@@ -329,7 +329,7 @@ public void testPatchDatasetTelemetry() throws Exception {
       expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
       expectedAttributes.put(
           "gcp.resource.destination.id",
-          "//bigquery.googleapis.com/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID);
 
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.patchDataset",

From c0c0da85ad9c509e93b92511b5c69dbebbd80335 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 13:59:12 -0400
Subject: [PATCH 03/12] update tests to use RESOURCE_PROJECT_PREFIX defined in
 HttpBigQueryRpc

---
 .../java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java  | 2 +-
 .../com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java   | 2 +-
 2 files changed, 2 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 aa1024ee766b..3c51687b01d4 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
@@ -90,7 +90,7 @@ public class HttpBigQueryRpc implements BigQueryRpc {
   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";
-  private static final String RESOURCE_PROJECT_PREFIX = "//bigquery.googleapis.com/projects/";
+  static final String RESOURCE_PROJECT_PREFIX = "//bigquery.googleapis.com/projects/";
   // see:
   // https://cloud.google.com/bigquery/loading-data-post-request#resume-upload
   private static final int HTTP_RESUME_INCOMPLETE = 308;
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 8b7e4266346c..69b8fd0ce5c1 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
@@ -15,6 +15,7 @@
  */
 package com.google.cloud.bigquery.spi.v2;
 
+import static com.google.cloud.bigquery.spi.v2.HttpBigQueryRpc.RESOURCE_PROJECT_PREFIX;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -78,7 +79,6 @@ public class HttpBigQueryRpcTest {
   private static final String JOB_ID = "test-job";
   private static final String LOCATION = "test-location";
 
-  private static final String RESOURCE_PROJECT_PREFIX = "//bigquery.googleapis.com/projects/";
   private InMemorySpanExporter spanExporter;
   private MockLowLevelHttpResponse mockResponse;
   private String lastRequestMethod;

From 6263d73e42771204cef6bcdea77970dd997d51be Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 14:19:11 -0400
Subject: [PATCH 04/12] update order of input params to createSpan + add
 additional unit tests

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 130 +++++++++-----
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  | 165 +++++++++++++-----
 2 files changed, 205 insertions(+), 90 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 3c51687b01d4..afb6621c8367 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
@@ -276,7 +276,11 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + dataset.getDatasetReference().getProjectId() + "/datasets/" + dataset.getDatasetReference().getDatasetId();
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + dataset.getDatasetReference().getProjectId()
+            + "/datasets/"
+            + dataset.getDatasetReference().getDatasetId();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -334,8 +338,8 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.createTable",
             "TableService",
             "InsertTable",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Table tableResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -370,7 +374,13 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/routines/" + reference.getRoutineId();
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + reference.getProjectId()
+            + "/datasets/"
+            + reference.getDatasetId()
+            + "/routines/"
+            + reference.getRoutineId();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -543,7 +553,11 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId();
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + reference.getProjectId()
+            + "/datasets/"
+            + reference.getDatasetId();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -590,7 +604,13 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/tables/" + reference.getTableId();
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + reference.getProjectId()
+            + "/datasets/"
+            + reference.getDatasetId()
+            + "/tables/"
+            + reference.getTableId();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -639,7 +659,8 @@ public Table getTableSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -690,7 +711,8 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables";
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables";
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -756,7 +778,8 @@ public boolean deleteTableSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -798,7 +821,13 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/models/" + reference.getModelId();
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + reference.getProjectId()
+            + "/datasets/"
+            + reference.getDatasetId()
+            + "/models/"
+            + reference.getModelId();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -847,7 +876,8 @@ public Model getModelSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -892,7 +922,8 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models";
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models";
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -942,7 +973,8 @@ public boolean deleteModelSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -986,7 +1018,13 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + reference.getProjectId() + "/datasets/" + reference.getDatasetId() + "/routines/" + reference.getRoutineId();
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX
+            + reference.getProjectId()
+            + "/datasets/"
+            + reference.getDatasetId()
+            + "/routines/"
+            + reference.getRoutineId();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1035,7 +1073,8 @@ public Routine getRoutineSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1080,7 +1119,8 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines";
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines";
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1129,7 +1169,8 @@ public boolean deleteRoutineSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1169,7 +1210,8 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1212,7 +1254,8 @@ public TableDataList listTableDataSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1265,7 +1308,8 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+    String destinationId =
+        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1490,8 +1534,8 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
             "com.google.cloud.bigquery.BigQueryRpc.cancelJob",
             "JobService",
             "CancelJob",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           bqCancelRequest.execute();
           return true;
@@ -1525,8 +1569,8 @@ public boolean deleteJobSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteJob",
             "JobService",
             "DeleteJob",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1572,8 +1616,8 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResults",
             "JobService",
             "GetQueryResults",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1618,8 +1662,8 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResultsWithRowLimit",
             "JobService",
             "GetQueryResults",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1653,8 +1697,8 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
             "com.google.cloud.bigquery.BigQueryRpc.queryRpc",
             "JobService",
             "Query",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           return queryRequest.execute();
         });
@@ -1783,8 +1827,8 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
             "com.google.cloud.bigquery.BigQueryRpc.getIamPolicy",
             "TableService",
             "GetIamPolicy",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           return bqGetRequest.execute();
         });
@@ -1818,8 +1862,8 @@ public Policy setIamPolicySkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.setIamPolicy",
             "TableService",
             "SetIamPolicy",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           return bqSetRequest.execute();
         });
@@ -1854,8 +1898,8 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.testIamPermissions",
             "TableService",
             "TestIamPermissions",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           return bqTestRequest.execute();
         });
@@ -1868,11 +1912,15 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
    */
   private Span createRpcTracingSpan(
       String spanName, String service, String method, Map<Option, ?> options) {
-    return createRpcTracingSpan(spanName, service, method, options, null);
+    return createRpcTracingSpan(spanName, service, method, null, options);
   }
 
   private Span createRpcTracingSpan(
-      String spanName, String service, String method, Map<Option, ?> options, String destinationId) {
+      String spanName,
+      String service,
+      String method,
+      String destinationId,
+      Map<Option, ?> options) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
       return null;
@@ -1885,11 +1933,9 @@ private Span createRpcTracingSpan(
             .setSpanKind(SpanKind.CLIENT)
             .setAttribute("bq.rpc.service", service)
             .setAttribute("bq.rpc.method", method)
-            .setAttribute("bq.rpc.system", "http");
+            .setAttribute("bq.rpc.system", "http")
+            .setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, destinationId);
 
-    if (destinationId != null) {
-      builder.setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, destinationId);
-    }
     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 69b8fd0ce5c1..acc675d42d46 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
@@ -141,7 +141,11 @@ private void setMockResponse(String content) {
   }
 
   private void verifySpan(
-      String spanName, String service, String method, Map<String, String> attributes) {
+      String spanName,
+      String service,
+      String method,
+      String destinationId,
+      Map<String, String> attributes) {
     List<SpanData> spans = spanExporter.getFinishedSpanItems();
     assertThat(spans).isNotEmpty();
     SpanData rpcSpan =
@@ -150,11 +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")));
-    if (attributes != null && attributes.containsKey("gcp.resource.destination.id")) {
-      assertEquals(
-          attributes.get("gcp.resource.destination.id"),
-          rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_DESTINATION_ID));
-    }
+
+    assertEquals(
+        destinationId, rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_DESTINATION_ID));
 
     if (attributes != null) {
       for (Map.Entry<String, String> entry : attributes.entrySet()) {
@@ -221,7 +223,11 @@ public void testSpanEndOnError() {
 
       // Verify that span was ended (collected) despite the error
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.getDataset", "DatasetService", "GetDataset", null);
+          "com.google.cloud.bigquery.BigQueryRpc.getDataset",
+          "DatasetService",
+          "GetDataset",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
+          null);
     }
 
     @Test
@@ -239,18 +245,12 @@ public void testGetDatasetTelemetry() throws Exception {
 
       rpc.getDatasetSkipExceptionTranslation(PROJECT_ID, DATASET_ID, new HashMap<>());
 
-      verifyRequest("GET", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
-      Map<String, String> expectedAttributes = new HashMap<>();
-      expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
-      expectedAttributes.put(
-          "gcp.resource.destination.id",
-          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID);
-
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.getDataset",
           "DatasetService",
           "GetDataset",
-          expectedAttributes);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
+          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
     }
 
     @Test
@@ -261,16 +261,12 @@ public void testListDatasetsTelemetry() throws Exception {
       rpc.listDatasetsSkipExceptionTranslation(PROJECT_ID, new HashMap<>());
 
       verifyRequest("GET", "/projects/" + PROJECT_ID + "/datasets");
-      Map<String, String> expectedAttributes = new HashMap<>();
-      expectedAttributes.put("bq.rpc.next_page_token", "next-page-token");
-      expectedAttributes.put(
-          "gcp.resource.destination.id", RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets");
-
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
           "DatasetService",
           "ListDatasets",
-          expectedAttributes);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets",
+          Collections.singletonMap("bq.rpc.next_page_token", "next-page-token"));
     }
 
     @Test
@@ -284,17 +280,12 @@ public void testCreateDatasetTelemetry() throws Exception {
       rpc.createSkipExceptionTranslation(dataset, new HashMap<>());
 
       verifyRequest("POST", "/projects/" + PROJECT_ID + "/datasets");
-      Map<String, String> expectedAttributes = new HashMap<>();
-      expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
-      expectedAttributes.put(
-          "gcp.resource.destination.id",
-          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID);
-
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.createDataset",
           "DatasetService",
           "InsertDataset",
-          expectedAttributes);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
+          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
     }
 
     @Test
@@ -309,9 +300,8 @@ public void testDeleteDatasetTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.deleteDataset",
           "DatasetService",
           "DeleteDataset",
-          Collections.singletonMap(
-              "gcp.resource.destination.id",
-          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID));
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
+          null);
     }
 
     @Test
@@ -325,17 +315,12 @@ public void testPatchDatasetTelemetry() throws Exception {
       rpc.patchSkipExceptionTranslation(dataset, new HashMap<>());
 
       verifyRequest("PATCH", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID);
-      Map<String, String> expectedAttributes = new HashMap<>();
-      expectedAttributes.put("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID);
-      expectedAttributes.put(
-          "gcp.resource.destination.id",
-          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID);
-
       verifySpan(
           "com.google.cloud.bigquery.BigQueryRpc.patchDataset",
           "DatasetService",
           "PatchDataset",
-          expectedAttributes);
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
+          Collections.singletonMap("bq.rpc.response.dataset.id", PROJECT_ID + ":" + DATASET_ID));
     }
 
     @Test
@@ -357,6 +342,7 @@ public void testGetTableTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getTable",
           "TableService",
           "GetTable",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           Collections.singletonMap(
               "bq.rpc.response.table.id", PROJECT_ID + ":" + DATASET_ID + "." + TABLE_ID));
     }
@@ -373,6 +359,7 @@ public void testListTablesTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.listTables",
           "TableService",
           "ListTables",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables",
           Collections.singletonMap("bq.rpc.next_page_token", "next-page-token"));
     }
 
@@ -400,6 +387,7 @@ public void testCreateTableTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.createTable",
           "TableService",
           "InsertTable",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           Collections.singletonMap(
               "bq.rpc.response.table.id", PROJECT_ID + ":" + DATASET_ID + "." + TABLE_ID));
     }
@@ -414,7 +402,11 @@ public void testDeleteTableTelemetry() throws Exception {
       verifyRequest(
           "DELETE", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID);
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.deleteTable", "TableService", "DeleteTable", null);
+          "com.google.cloud.bigquery.BigQueryRpc.deleteTable",
+          "TableService",
+          "DeleteTable",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
+          null);
     }
 
     @Test
@@ -442,6 +434,7 @@ public void testPatchTableTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.patchTable",
           "TableService",
           "PatchTable",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           Collections.singletonMap(
               "bq.rpc.response.table.id", PROJECT_ID + ":" + DATASET_ID + "." + TABLE_ID));
     }
@@ -465,6 +458,7 @@ public void testGetModelTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getModel",
           "ModelService",
           "GetModel",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/models/" + MODEL_ID,
           Collections.singletonMap("bq.rpc.response.model.id", MODEL_ID));
     }
 
@@ -480,6 +474,7 @@ public void testListModelsTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.listModels",
           "ModelService",
           "ListModels",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/models",
           Collections.singletonMap("bq.rpc.next_page_token", "next-page-token"));
     }
 
@@ -508,6 +503,7 @@ public void testPatchModelTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.patchModel",
           "ModelService",
           "PatchModel",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/models/" + MODEL_ID,
           Collections.singletonMap("bq.rpc.response.model.id", MODEL_ID));
     }
 
@@ -521,7 +517,11 @@ public void testDeleteModelTelemetry() throws Exception {
       verifyRequest(
           "DELETE", "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID + "/models/" + MODEL_ID);
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.deleteModel", "ModelService", "DeleteModel", null);
+          "com.google.cloud.bigquery.BigQueryRpc.deleteModel",
+          "ModelService",
+          "DeleteModel",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/models/" + MODEL_ID,
+          null);
     }
 
     @Test
@@ -543,6 +543,12 @@ public void testGetRoutineTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getRoutine",
           "RoutineService",
           "GetRoutine",
+          RESOURCE_PROJECT_PREFIX
+              + PROJECT_ID
+              + "/datasets/"
+              + DATASET_ID
+              + "/routines/"
+              + ROUTINE_ID,
           Collections.singletonMap("bq.rpc.response.routine.id", ROUTINE_ID));
     }
 
@@ -558,6 +564,7 @@ public void testListRoutinesTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.listRoutines",
           "RoutineService",
           "ListRoutines",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/routines",
           Collections.singletonMap("bq.rpc.next_page_token", "next-page-token"));
     }
 
@@ -585,6 +592,12 @@ public void testCreateRoutineTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.createRoutine",
           "RoutineService",
           "InsertRoutine",
+          RESOURCE_PROJECT_PREFIX
+              + PROJECT_ID
+              + "/datasets/"
+              + DATASET_ID
+              + "/routines/"
+              + ROUTINE_ID,
           Collections.singletonMap("bq.rpc.response.routine.id", ROUTINE_ID));
     }
 
@@ -602,6 +615,12 @@ public void testDeleteRoutineTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.deleteRoutine",
           "RoutineService",
           "DeleteRoutine",
+          RESOURCE_PROJECT_PREFIX
+              + PROJECT_ID
+              + "/datasets/"
+              + DATASET_ID
+              + "/routines/"
+              + ROUTINE_ID,
           null);
     }
 
@@ -630,6 +649,12 @@ public void testUpdateRoutineTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.updateRoutine",
           "RoutineService",
           "UpdateRoutine",
+          RESOURCE_PROJECT_PREFIX
+              + PROJECT_ID
+              + "/datasets/"
+              + DATASET_ID
+              + "/routines/"
+              + ROUTINE_ID,
           Collections.singletonMap("bq.rpc.response.routine.id", ROUTINE_ID));
     }
 
@@ -650,7 +675,11 @@ public void testInsertAllTelemetry() throws Exception {
               + TABLE_ID
               + "/insertAll");
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.insertAll", "TableDataService", "InsertAll", null);
+          "com.google.cloud.bigquery.BigQueryRpc.insertAll",
+          "TableDataService",
+          "InsertAll",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
+          null);
     }
 
     @Test
@@ -663,7 +692,11 @@ public void testListTableDataTelemetry() throws Exception {
           "GET",
           "/projects/" + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID + "/data");
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.listTableData", "TableDataService", "List", null);
+          "com.google.cloud.bigquery.BigQueryRpc.listTableData",
+          "TableDataService",
+          "List",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
+          null);
     }
 
     @Test
@@ -680,6 +713,7 @@ public void testListTableDataWithRowLimitTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.listTableDataWithRowLimit",
           "TableDataService",
           "List",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           null);
     }
 
@@ -699,7 +733,11 @@ public void testGetJobTelemetry() throws Exception {
       attributes.put("bq.rpc.response.job.id", PROJECT_ID + ":" + JOB_ID);
       attributes.put("bq.rpc.response.job.status.state", "DONE");
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.getJob", "JobService", "GetJob", attributes);
+          "com.google.cloud.bigquery.BigQueryRpc.getJob",
+          "JobService",
+          "GetJob",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs/" + JOB_ID,
+          attributes);
     }
 
     @Test
@@ -718,7 +756,11 @@ public void testGetQueryJobTelemetry() throws Exception {
       attributes.put("bq.rpc.response.job.id", PROJECT_ID + ":" + JOB_ID);
       attributes.put("bq.rpc.response.job.status.state", "DONE");
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.getQueryJob", "JobService", "GetJob", attributes);
+          "com.google.cloud.bigquery.BigQueryRpc.getQueryJob",
+          "JobService",
+          "GetJob",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs/" + JOB_ID,
+          attributes);
     }
 
     @Test
@@ -733,6 +775,7 @@ public void testListJobsTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.listJobs",
           "JobService",
           "ListJobs",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs",
           Collections.singletonMap("bq.rpc.next_page_token", "next-page-token"));
     }
 
@@ -754,7 +797,11 @@ public void testCreateJobTelemetry() throws Exception {
       attributes.put("bq.rpc.response.job.id", PROJECT_ID + ":" + JOB_ID);
       attributes.put("bq.rpc.response.job.status.state", "DONE");
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.createJob", "JobService", "InsertJob", attributes);
+          "com.google.cloud.bigquery.BigQueryRpc.createJob",
+          "JobService",
+          "InsertJob",
+          null,
+          attributes);
     }
 
     @Test
@@ -778,6 +825,7 @@ public void testCreateJobForQueryTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.createJobForQuery",
           "JobService",
           "InsertJob",
+          null,
           attributes);
     }
 
@@ -789,7 +837,11 @@ public void testCancelJobTelemetry() throws Exception {
 
       verifyRequest("POST", "/projects/" + PROJECT_ID + "/jobs/" + JOB_ID + "/cancel");
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.cancelJob", "JobService", "CancelJob", null);
+          "com.google.cloud.bigquery.BigQueryRpc.cancelJob",
+          "JobService",
+          "CancelJob",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs/" + JOB_ID,
+          null);
     }
 
     @Test
@@ -801,7 +853,11 @@ public void testDeleteJobTelemetry() throws Exception {
 
       verifyRequest("DELETE", "/projects/" + PROJECT_ID + "/jobs/" + JOB_ID);
       verifySpan(
-          "com.google.cloud.bigquery.BigQueryRpc.deleteJob", "JobService", "DeleteJob", null);
+          "com.google.cloud.bigquery.BigQueryRpc.deleteJob",
+          "JobService",
+          "DeleteJob",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs/" + JOB_ID,
+          null);
     }
 
     @Test
@@ -815,6 +871,7 @@ public void testGetQueryResultsTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getQueryResults",
           "JobService",
           "GetQueryResults",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs/" + JOB_ID,
           null);
     }
 
@@ -830,6 +887,7 @@ public void testGetQueryResultsWithRowLimitTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getQueryResultsWithRowLimit",
           "JobService",
           "GetQueryResults",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs/" + JOB_ID,
           null);
     }
 
@@ -840,7 +898,12 @@ public void testQueryRpcTelemetry() throws Exception {
       rpc.queryRpcSkipExceptionTranslation(PROJECT_ID, new QueryRequest());
 
       verifyRequest("POST", "/projects/" + PROJECT_ID + "/queries");
-      verifySpan("com.google.cloud.bigquery.BigQueryRpc.queryRpc", "JobService", "Query", null);
+      verifySpan(
+          "com.google.cloud.bigquery.BigQueryRpc.queryRpc",
+          "JobService",
+          "Query",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs",
+          null);
     }
 
     @Test
@@ -864,6 +927,7 @@ public void testGetIamPolicyTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getIamPolicy",
           "TableService",
           "GetIamPolicy",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           null);
     }
 
@@ -889,6 +953,7 @@ public void testSetIamPolicyTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.setIamPolicy",
           "TableService",
           "SetIamPolicy",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           null);
     }
 
@@ -914,6 +979,7 @@ public void testTestIamPermissionsTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.testIamPermissions",
           "TableService",
           "TestIamPermissions",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID + "/tables/" + TABLE_ID,
           null);
     }
 
@@ -943,6 +1009,7 @@ public void testOtelAttributesFromOptionsGetAddedtoSpan() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.getDataset",
           "DatasetService",
           "GetDataset",
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/datasets/" + DATASET_ID,
           expectedAttributes);
     }
 
@@ -966,6 +1033,7 @@ public void testHttpTracingEnabledAddsAdditionalAttributes() throws Exception {
           "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();
@@ -1065,6 +1133,7 @@ public void testHttpTracingDisabledDoesNotAddAdditionalAttributes() throws Excep
           "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();

From 6b05a5098e2fb4a4aed5dbcff83ab6c2ede40890 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 14:36:42 -0400
Subject: [PATCH 05/12] update order of input params to createSpan + add
 additional unit tests

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

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 acc675d42d46..a3bb134be3ac 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
@@ -800,7 +800,7 @@ public void testCreateJobTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.createJob",
           "JobService",
           "InsertJob",
-          null,
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs",
           attributes);
     }
 
@@ -825,7 +825,7 @@ public void testCreateJobForQueryTelemetry() throws Exception {
           "com.google.cloud.bigquery.BigQueryRpc.createJobForQuery",
           "JobService",
           "InsertJob",
-          null,
+          RESOURCE_PROJECT_PREFIX + PROJECT_ID + "/jobs",
           attributes);
     }
 

From 03f9e98c125bc6f9cac17aa1dcde9450f579403a Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 14:43:05 -0400
Subject: [PATCH 06/12] fixed incorrect param order

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 112 +++++++++---------
 1 file changed, 58 insertions(+), 54 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 afb6621c8367..e37206a06fbb 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
@@ -186,8 +186,8 @@ public Dataset getDatasetSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getDataset",
             "DatasetService",
             "GetDataset",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Dataset dataset = bqGetRequest.execute();
           if (span != null) {
@@ -231,8 +231,8 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
             "DatasetService",
             "ListDatasets",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", datasetsListRequest.getPageToken());
@@ -287,8 +287,8 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.createDataset",
             "DatasetService",
             "InsertDataset",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Dataset datasetResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -387,8 +387,8 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.createRoutine",
             "RoutineService",
             "InsertRoutine",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Routine routineResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -426,9 +426,15 @@ public Job createSkipExceptionTranslation(Job job, Map<Option, ?> options) throw
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+
     return executeWithSpan(
         createRpcTracingSpan(
-            "com.google.cloud.bigquery.BigQueryRpc.createJob", "JobService", "InsertJob", options),
+            "com.google.cloud.bigquery.BigQueryRpc.createJob",
+            "JobService",
+            "InsertJob",
+            destinationId,
+            options),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -463,11 +469,14 @@ public Job createJobForQuerySkipExceptionTranslation(Job job) throws IOException
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
+    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.createJobForQuery",
             "JobService",
             "InsertJob",
+            destinationId,
             null),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
@@ -515,8 +524,8 @@ public boolean deleteDatasetSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteDataset",
             "DatasetService",
             "DeleteDataset",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -564,8 +573,8 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
             "com.google.cloud.bigquery.BigQueryRpc.patchDataset",
             "DatasetService",
             "PatchDataset",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Dataset datasetResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -617,8 +626,8 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchTable",
             "TableService",
             "PatchTable",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Table tableResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -667,8 +676,8 @@ public Table getTableSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getTable",
             "TableService",
             "GetTable",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Table tableResponse = bqGetRequest.execute();
           if (span != null) {
@@ -719,8 +728,8 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTables",
             "TableService",
             "ListTables",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", tableListRequest.getPageToken());
@@ -786,8 +795,8 @@ public boolean deleteTableSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteTable",
             "TableService",
             "DeleteTable",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -834,8 +843,8 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchModel",
             "ModelService",
             "PatchModel",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -884,8 +893,8 @@ public Model getModelSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getModel",
             "ModelService",
             "GetModel",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Model modelResponse = bqGetRequest.execute();
           if (span != null) {
@@ -930,8 +939,8 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listModels",
             "ModelService",
             "ListModels",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", modelListRequest.getPageToken());
@@ -981,8 +990,8 @@ public boolean deleteModelSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteModel",
             "ModelService",
             "DeleteModel",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1031,8 +1040,8 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.updateRoutine",
             "RoutineService",
             "UpdateRoutine",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Routine routineResponse = bqUpdateRequest.execute();
           if (span != null) {
@@ -1081,8 +1090,8 @@ public Routine getRoutineSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getRoutine",
             "RoutineService",
             "GetRoutine",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Routine routineResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1127,8 +1136,8 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listRoutines",
             "RoutineService",
             "ListRoutines",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", routineListRequest.getPageToken());
@@ -1177,8 +1186,8 @@ public boolean deleteRoutineSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteRoutine",
             "RoutineService",
             "DeleteRoutine",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1218,8 +1227,8 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.insertAll",
             "TableDataService",
             "InsertAll",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> insertAllRequest.execute());
   }
 
@@ -1262,8 +1271,8 @@ public TableDataList listTableDataSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTableData",
             "TableDataService",
             "List",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1316,8 +1325,8 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTableDataWithRowLimit",
             "TableDataService",
             "List",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1362,8 +1371,8 @@ public Job getJobSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getJob",
             "JobService",
             "GetJob",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1406,8 +1415,8 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
             "com.google.cloud.bigquery.BigQueryRpc.getQueryJob",
             "JobService",
             "GetJob",
-            null,
-            destinationId),
+            destinationId,
+            null),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1463,8 +1472,8 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listJobs",
             "JobService",
             "ListJobs",
-            options,
-            destinationId),
+            destinationId,
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", listJobsRequest.getPageToken());
@@ -1910,11 +1919,6 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
    *
    * <p>If isOpenTelemetryTracingEnabled == true creates and returns span, otherwise returns null.
    */
-  private Span createRpcTracingSpan(
-      String spanName, String service, String method, Map<Option, ?> options) {
-    return createRpcTracingSpan(spanName, service, method, null, options);
-  }
-
   private Span createRpcTracingSpan(
       String spanName,
       String service,

From 2e694461ab526ca0acd8a729ca6441e8a85edf87 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 14:52:33 -0400
Subject: [PATCH 07/12] updated to use stringbuilder

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 96 +++++++++++++------
 1 file changed, 66 insertions(+), 30 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 e37206a06fbb..02c74bde5a76 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
@@ -179,7 +179,13 @@ public Dataset getDatasetSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -277,10 +283,12 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + dataset.getDatasetReference().getProjectId()
-            + "/datasets/"
-            + dataset.getDatasetReference().getDatasetId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(dataset.getDatasetReference().getProjectId())
+            .append("/datasets/")
+            .append(dataset.getDatasetReference().getDatasetId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -326,12 +334,14 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + reference.getProjectId()
-            + "/datasets/"
-            + reference.getDatasetId()
-            + "/tables/"
-            + reference.getTableId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(reference.getProjectId())
+            .append("/datasets/")
+            .append(reference.getDatasetId())
+            .append("/tables/")
+            .append(reference.getTableId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -375,12 +385,14 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + reference.getProjectId()
-            + "/datasets/"
-            + reference.getDatasetId()
-            + "/routines/"
-            + reference.getRoutineId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(reference.getProjectId())
+            .append("/datasets/")
+            .append(reference.getDatasetId())
+            .append("/routines/")
+            .append(reference.getRoutineId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -517,7 +529,13 @@ public boolean deleteDatasetSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -563,10 +581,12 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + reference.getProjectId()
-            + "/datasets/"
-            + reference.getDatasetId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(reference.getProjectId())
+            .append("/datasets/")
+            .append(reference.getDatasetId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -614,12 +634,14 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + reference.getProjectId()
-            + "/datasets/"
-            + reference.getDatasetId()
-            + "/tables/"
-            + reference.getTableId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(reference.getProjectId())
+            .append("/datasets/")
+            .append(reference.getDatasetId())
+            .append("/tables/")
+            .append(reference.getTableId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -669,7 +691,14 @@ public Table getTableSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/tables/")
+            .append(tableId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -788,7 +817,14 @@ public boolean deleteTableSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/tables/")
+            .append(tableId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(

From 54f4169011ca55369021c946cde32dff81e085d9 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 15:23:02 -0400
Subject: [PATCH 08/12] missed some updates to use stringbuilder

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 137 ++++++++++++++----
 1 file changed, 112 insertions(+), 25 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 02c74bde5a76..bfc27e8096ef 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
@@ -867,12 +867,14 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + reference.getProjectId()
-            + "/datasets/"
-            + reference.getDatasetId()
-            + "/models/"
-            + reference.getModelId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(reference.getProjectId())
+            .append("/datasets/")
+            .append(reference.getDatasetId())
+            .append("/models/")
+            .append(reference.getModelId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -922,7 +924,14 @@ public Model getModelSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/models/")
+            .append(modelId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -968,7 +977,13 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models";
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/models")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1064,12 +1079,14 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX
-            + reference.getProjectId()
-            + "/datasets/"
-            + reference.getDatasetId()
-            + "/routines/"
-            + reference.getRoutineId();
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(reference.getProjectId())
+            .append("/datasets/")
+            .append(reference.getDatasetId())
+            .append("/routines/")
+            .append(reference.getRoutineId())
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1119,7 +1136,14 @@ public Routine getRoutineSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/routines/")
+            .append(routineId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1165,7 +1189,13 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines";
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/routines")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1256,7 +1286,14 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/tables/")
+            .append(tableId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1300,7 +1337,14 @@ public TableDataList listTableDataSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/tables/")
+            .append(tableId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1354,7 +1398,14 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String destinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables/" + tableId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/tables/")
+            .append(tableId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1400,7 +1451,13 @@ public Job getJobSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs/")
+            .append(jobId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1444,7 +1501,13 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs/")
+            .append(jobId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1572,7 +1635,13 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs/")
+            .append(jobId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1607,7 +1676,13 @@ public boolean deleteJobSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobName;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs/")
+            .append(jobName)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1654,7 +1729,13 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs/")
+            .append(jobId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1700,7 +1781,13 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs/" + jobId;
+    String destinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs/")
+            .append(jobId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(

From bc84c49dc87104c340835c5cdc86b6d4e8d91185 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 18:34:19 -0400
Subject: [PATCH 09/12] renamed destinationId to be more specific
 gcpResourcegcpResourceDestinationId

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 216 +++++++++---------
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  |   6 +-
 2 files changed, 111 insertions(+), 111 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 bfc27e8096ef..b66ef397b70c 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
@@ -179,7 +179,7 @@ public Dataset getDatasetSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -192,8 +192,8 @@ public Dataset getDatasetSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getDataset",
             "DatasetService",
             "GetDataset",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Dataset dataset = bqGetRequest.execute();
           if (span != null) {
@@ -230,15 +230,15 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets";
+    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets";
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listDatasets",
             "DatasetService",
             "ListDatasets",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", datasetsListRequest.getPageToken());
@@ -282,7 +282,7 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(dataset.getDatasetReference().getProjectId())
@@ -295,8 +295,8 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.createDataset",
             "DatasetService",
             "InsertDataset",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Dataset datasetResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -333,7 +333,7 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(reference.getProjectId())
@@ -348,8 +348,8 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.createTable",
             "TableService",
             "InsertTable",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Table tableResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -384,7 +384,7 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(reference.getProjectId())
@@ -399,8 +399,8 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.createRoutine",
             "RoutineService",
             "InsertRoutine",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Routine routineResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -438,15 +438,15 @@ public Job createSkipExceptionTranslation(Job job, Map<Option, ?> options) throw
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.createJob",
             "JobService",
             "InsertJob",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -481,15 +481,15 @@ public Job createJobForQuerySkipExceptionTranslation(Job job) throws IOException
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.createJobForQuery",
             "JobService",
             "InsertJob",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -529,7 +529,7 @@ public boolean deleteDatasetSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -542,8 +542,8 @@ public boolean deleteDatasetSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteDataset",
             "DatasetService",
             "DeleteDataset",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -580,7 +580,7 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(reference.getProjectId())
@@ -593,8 +593,8 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
             "com.google.cloud.bigquery.BigQueryRpc.patchDataset",
             "DatasetService",
             "PatchDataset",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Dataset datasetResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -633,7 +633,7 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(reference.getProjectId())
@@ -648,8 +648,8 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchTable",
             "TableService",
             "PatchTable",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Table tableResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -690,7 +690,7 @@ public Table getTableSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -705,8 +705,8 @@ public Table getTableSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getTable",
             "TableService",
             "GetTable",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Table tableResponse = bqGetRequest.execute();
           if (span != null) {
@@ -749,7 +749,7 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables";
 
     return executeWithSpan(
@@ -757,8 +757,8 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTables",
             "TableService",
             "ListTables",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", tableListRequest.getPageToken());
@@ -816,7 +816,7 @@ public boolean deleteTableSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -831,8 +831,8 @@ public boolean deleteTableSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteTable",
             "TableService",
             "DeleteTable",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -866,7 +866,7 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(reference.getProjectId())
@@ -881,8 +881,8 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchModel",
             "ModelService",
             "PatchModel",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -923,7 +923,7 @@ public Model getModelSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -938,8 +938,8 @@ public Model getModelSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getModel",
             "ModelService",
             "GetModel",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Model modelResponse = bqGetRequest.execute();
           if (span != null) {
@@ -976,7 +976,7 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -990,8 +990,8 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listModels",
             "ModelService",
             "ListModels",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", modelListRequest.getPageToken());
@@ -1033,7 +1033,7 @@ public boolean deleteModelSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
 
     return executeWithSpan(
@@ -1041,8 +1041,8 @@ public boolean deleteModelSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteModel",
             "ModelService",
             "DeleteModel",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1078,7 +1078,7 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(reference.getProjectId())
@@ -1093,8 +1093,8 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "com.google.cloud.bigquery.BigQueryRpc.updateRoutine",
             "RoutineService",
             "UpdateRoutine",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Routine routineResponse = bqUpdateRequest.execute();
           if (span != null) {
@@ -1135,7 +1135,7 @@ public Routine getRoutineSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1150,8 +1150,8 @@ public Routine getRoutineSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getRoutine",
             "RoutineService",
             "GetRoutine",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Routine routineResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1188,7 +1188,7 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1202,8 +1202,8 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listRoutines",
             "RoutineService",
             "ListRoutines",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", routineListRequest.getPageToken());
@@ -1244,7 +1244,7 @@ public boolean deleteRoutineSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
 
     return executeWithSpan(
@@ -1252,8 +1252,8 @@ public boolean deleteRoutineSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteRoutine",
             "RoutineService",
             "DeleteRoutine",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1285,7 +1285,7 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1300,8 +1300,8 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.insertAll",
             "TableDataService",
             "InsertAll",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> insertAllRequest.execute());
   }
 
@@ -1336,7 +1336,7 @@ public TableDataList listTableDataSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1351,8 +1351,8 @@ public TableDataList listTableDataSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTableData",
             "TableDataService",
             "List",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1397,7 +1397,7 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1412,8 +1412,8 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.listTableDataWithRowLimit",
             "TableDataService",
             "List",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1451,7 +1451,7 @@ public Job getJobSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1464,8 +1464,8 @@ public Job getJobSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getJob",
             "JobService",
             "GetJob",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1501,7 +1501,7 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1514,8 +1514,8 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
             "com.google.cloud.bigquery.BigQueryRpc.getQueryJob",
             "JobService",
             "GetJob",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1564,15 +1564,15 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.listJobs",
             "JobService",
             "ListJobs",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", listJobsRequest.getPageToken());
@@ -1635,7 +1635,7 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1648,8 +1648,8 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
             "com.google.cloud.bigquery.BigQueryRpc.cancelJob",
             "JobService",
             "CancelJob",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           bqCancelRequest.execute();
           return true;
@@ -1676,7 +1676,7 @@ public boolean deleteJobSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1689,8 +1689,8 @@ public boolean deleteJobSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.deleteJob",
             "JobService",
             "DeleteJob",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1729,7 +1729,7 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1742,8 +1742,8 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResults",
             "JobService",
             "GetQueryResults",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1781,7 +1781,7 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId =
+    String gcpResourceDestinationId =
         new StringBuilder()
             .append(RESOURCE_PROJECT_PREFIX)
             .append(projectId)
@@ -1794,8 +1794,8 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
             "com.google.cloud.bigquery.BigQueryRpc.getQueryResultsWithRowLimit",
             "JobService",
             "GetQueryResults",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1822,15 +1822,15 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.queryRpc",
             "JobService",
             "Query",
-            destinationId,
-            null),
+            gcpResourceDestinationId,
+                null),
         span -> {
           return queryRequest.execute();
         });
@@ -1952,15 +1952,15 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = "//bigquery.googleapis.com/" + resourceId;
+    String gcpResourceDestinationId = "//bigquery.googleapis.com/" + resourceId;
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.getIamPolicy",
             "TableService",
             "GetIamPolicy",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           return bqGetRequest.execute();
         });
@@ -1987,15 +1987,15 @@ public Policy setIamPolicySkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = "//bigquery.googleapis.com/" + resourceId;
+    String gcpResourceDestinationId = "//bigquery.googleapis.com/" + resourceId;
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.setIamPolicy",
             "TableService",
             "SetIamPolicy",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           return bqSetRequest.execute();
         });
@@ -2023,15 +2023,15 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String destinationId = "//bigquery.googleapis.com/" + resourceId;
+    String gcpResourceDestinationId = "//bigquery.googleapis.com/" + resourceId;
 
     return executeWithSpan(
         createRpcTracingSpan(
             "com.google.cloud.bigquery.BigQueryRpc.testIamPermissions",
             "TableService",
             "TestIamPermissions",
-            destinationId,
-            options),
+            gcpResourceDestinationId,
+                options),
         span -> {
           return bqTestRequest.execute();
         });
@@ -2046,8 +2046,8 @@ private Span createRpcTracingSpan(
       String spanName,
       String service,
       String method,
-      String destinationId,
-      Map<Option, ?> options) {
+      String gcpResourceDestinationId,
+          Map<Option, ?> options) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
       return null;
@@ -2061,7 +2061,7 @@ private Span createRpcTracingSpan(
             .setAttribute("bq.rpc.service", service)
             .setAttribute("bq.rpc.method", method)
             .setAttribute("bq.rpc.system", "http")
-            .setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, destinationId);
+            .setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, gcpResourceDestinationId);
 
     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 a3bb134be3ac..a4f6725cfff7 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
@@ -144,8 +144,8 @@ private void verifySpan(
       String spanName,
       String service,
       String method,
-      String destinationId,
-      Map<String, String> attributes) {
+      String gcpResourceDestinationId,
+          Map<String, String> attributes) {
     List<SpanData> spans = spanExporter.getFinishedSpanItems();
     assertThat(spans).isNotEmpty();
     SpanData rpcSpan =
@@ -156,7 +156,7 @@ private void verifySpan(
     assertEquals("http", rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.system")));
 
     assertEquals(
-        destinationId, rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_DESTINATION_ID));
+        gcpResourceDestinationId, rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_DESTINATION_ID));
 
     if (attributes != null) {
       for (Map.Entry<String, String> entry : attributes.entrySet()) {

From dbb05b3a12fb5d50eeea548f04003e8afef3edff Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 18:35:17 -0400
Subject: [PATCH 10/12] renamed GCP_DESTINATION_ID to more explicit
 GCP_RESOURCE_DESTINATION_ID

---
 .../java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java  | 2 +-
 .../cloud/bigquery/telemetry/BigQueryTelemetryTracer.java       | 2 +-
 .../com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java   | 2 +-
 3 files changed, 3 insertions(+), 3 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 b66ef397b70c..e2cf337752a7 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
@@ -2061,7 +2061,7 @@ private Span createRpcTracingSpan(
             .setAttribute("bq.rpc.service", service)
             .setAttribute("bq.rpc.method", method)
             .setAttribute("bq.rpc.system", "http")
-            .setAttribute(BigQueryTelemetryTracer.GCP_DESTINATION_ID, gcpResourceDestinationId);
+            .setAttribute(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId);
 
     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 92433e416fd4..9a42a68afba8 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
@@ -49,7 +49,7 @@ private BigQueryTelemetryTracer() {}
       AttributeKey.stringKey("gcp.client.artifact");
   public static final AttributeKey<String> GCP_CLIENT_LANGUAGE =
       AttributeKey.stringKey("gcp.client.language");
-  public static final AttributeKey<String> GCP_DESTINATION_ID =
+  public static final AttributeKey<String> GCP_RESOURCE_DESTINATION_ID =
       AttributeKey.stringKey("gcp.resource.destination.id");
   public static final AttributeKey<String> RPC_SYSTEM_NAME =
       AttributeKey.stringKey("rpc.system.name");
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 a4f6725cfff7..5d35450f08a4 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
@@ -156,7 +156,7 @@ private void verifySpan(
     assertEquals("http", rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.system")));
 
     assertEquals(
-        gcpResourceDestinationId, rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_DESTINATION_ID));
+        gcpResourceDestinationId, rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
 
     if (attributes != null) {
       for (Map.Entry<String, String> entry : attributes.entrySet()) {

From e9b4453ad7e0cedffd2bc34fcf6b2cce914e0b70 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Mon, 23 Mar 2026 18:36:41 -0400
Subject: [PATCH 11/12] ran formatter

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 75 ++++++++++---------
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  |  5 +-
 2 files changed, 41 insertions(+), 39 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 e2cf337752a7..177d9afb929d 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,7 +193,7 @@ public Dataset getDatasetSkipExceptionTranslation(
             "DatasetService",
             "GetDataset",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Dataset dataset = bqGetRequest.execute();
           if (span != null) {
@@ -238,7 +238,7 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
             "DatasetService",
             "ListDatasets",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", datasetsListRequest.getPageToken());
@@ -296,7 +296,7 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
             "DatasetService",
             "InsertDataset",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Dataset datasetResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -349,7 +349,7 @@ public Table createSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "TableService",
             "InsertTable",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Table tableResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -400,7 +400,7 @@ public Routine createSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "RoutineService",
             "InsertRoutine",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Routine routineResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -446,7 +446,7 @@ public Job createSkipExceptionTranslation(Job job, Map<Option, ?> options) throw
             "JobService",
             "InsertJob",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -489,7 +489,7 @@ public Job createJobForQuerySkipExceptionTranslation(Job job) throws IOException
             "JobService",
             "InsertJob",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -543,7 +543,7 @@ public boolean deleteDatasetSkipExceptionTranslation(
             "DatasetService",
             "DeleteDataset",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -594,7 +594,7 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
             "DatasetService",
             "PatchDataset",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Dataset datasetResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -649,7 +649,7 @@ public Table patchSkipExceptionTranslation(Table table, Map<Option, ?> options)
             "TableService",
             "PatchTable",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Table tableResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -706,7 +706,7 @@ public Table getTableSkipExceptionTranslation(
             "TableService",
             "GetTable",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Table tableResponse = bqGetRequest.execute();
           if (span != null) {
@@ -758,7 +758,7 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
             "TableService",
             "ListTables",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", tableListRequest.getPageToken());
@@ -832,7 +832,7 @@ public boolean deleteTableSkipExceptionTranslation(
             "TableService",
             "DeleteTable",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -882,7 +882,7 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
             "ModelService",
             "PatchModel",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -939,7 +939,7 @@ public Model getModelSkipExceptionTranslation(
             "ModelService",
             "GetModel",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Model modelResponse = bqGetRequest.execute();
           if (span != null) {
@@ -991,7 +991,7 @@ public Tuple<String, Iterable<Model>> listModelsSkipExceptionTranslation(
             "ModelService",
             "ListModels",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", modelListRequest.getPageToken());
@@ -1042,7 +1042,7 @@ public boolean deleteModelSkipExceptionTranslation(
             "ModelService",
             "DeleteModel",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1094,7 +1094,7 @@ public Routine updateSkipExceptionTranslation(Routine routine, Map<Option, ?> op
             "RoutineService",
             "UpdateRoutine",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Routine routineResponse = bqUpdateRequest.execute();
           if (span != null) {
@@ -1151,7 +1151,7 @@ public Routine getRoutineSkipExceptionTranslation(
             "RoutineService",
             "GetRoutine",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Routine routineResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1203,7 +1203,7 @@ public Tuple<String, Iterable<Routine>> listRoutinesSkipExceptionTranslation(
             "RoutineService",
             "ListRoutines",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", routineListRequest.getPageToken());
@@ -1253,7 +1253,7 @@ public boolean deleteRoutineSkipExceptionTranslation(
             "RoutineService",
             "DeleteRoutine",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1301,7 +1301,7 @@ public TableDataInsertAllResponse insertAllSkipExceptionTranslation(
             "TableDataService",
             "InsertAll",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> insertAllRequest.execute());
   }
 
@@ -1352,7 +1352,7 @@ public TableDataList listTableDataSkipExceptionTranslation(
             "TableDataService",
             "List",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1413,7 +1413,7 @@ public TableDataList listTableDataWithRowLimitSkipExceptionTranslation(
             "TableDataService",
             "List",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", bqListRequest.getPageToken());
@@ -1465,7 +1465,7 @@ public Job getJobSkipExceptionTranslation(
             "JobService",
             "GetJob",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1515,7 +1515,7 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
             "JobService",
             "GetJob",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1572,7 +1572,7 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
             "JobService",
             "ListJobs",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", listJobsRequest.getPageToken());
@@ -1649,7 +1649,7 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
             "JobService",
             "CancelJob",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           bqCancelRequest.execute();
           return true;
@@ -1690,7 +1690,7 @@ public boolean deleteJobSkipExceptionTranslation(
             "JobService",
             "DeleteJob",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1743,7 +1743,7 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation(
             "JobService",
             "GetQueryResults",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1795,7 +1795,7 @@ public GetQueryResultsResponse getQueryResultsWithRowLimitSkipExceptionTranslati
             "JobService",
             "GetQueryResults",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", queryRequest.getPageToken());
@@ -1830,7 +1830,7 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
             "JobService",
             "Query",
             gcpResourceDestinationId,
-                null),
+            null),
         span -> {
           return queryRequest.execute();
         });
@@ -1960,7 +1960,7 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
             "TableService",
             "GetIamPolicy",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           return bqGetRequest.execute();
         });
@@ -1995,7 +1995,7 @@ public Policy setIamPolicySkipExceptionTranslation(
             "TableService",
             "SetIamPolicy",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           return bqSetRequest.execute();
         });
@@ -2031,7 +2031,7 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
             "TableService",
             "TestIamPermissions",
             gcpResourceDestinationId,
-                options),
+            options),
         span -> {
           return bqTestRequest.execute();
         });
@@ -2047,7 +2047,7 @@ private Span createRpcTracingSpan(
       String service,
       String method,
       String gcpResourceDestinationId,
-          Map<Option, ?> options) {
+      Map<Option, ?> options) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
       return null;
@@ -2061,7 +2061,8 @@ private Span createRpcTracingSpan(
             .setAttribute("bq.rpc.service", service)
             .setAttribute("bq.rpc.method", method)
             .setAttribute("bq.rpc.system", "http")
-            .setAttribute(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId);
+            .setAttribute(
+                BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID, gcpResourceDestinationId);
 
     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 5d35450f08a4..bafc92b63e99 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
@@ -145,7 +145,7 @@ private void verifySpan(
       String service,
       String method,
       String gcpResourceDestinationId,
-          Map<String, String> attributes) {
+      Map<String, String> attributes) {
     List<SpanData> spans = spanExporter.getFinishedSpanItems();
     assertThat(spans).isNotEmpty();
     SpanData rpcSpan =
@@ -156,7 +156,8 @@ private void verifySpan(
     assertEquals("http", rpcSpan.getAttributes().get(AttributeKey.stringKey("bq.rpc.system")));
 
     assertEquals(
-        gcpResourceDestinationId, rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
+        gcpResourceDestinationId,
+        rpcSpan.getAttributes().get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
 
     if (attributes != null) {
       for (Map.Entry<String, String> entry : attributes.entrySet()) {

From 4e94b6631eab6e8a84d1abac41564ec7198e0014 Mon Sep 17 00:00:00 2001
From: ldetmer <laura.detmer@gmail.com>
Date: Tue, 24 Mar 2026 08:13:02 -0400
Subject: [PATCH 12/12] replaced all string concat with StringBuilder

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      | 70 ++++++++++++++++---
 1 file changed, 59 insertions(+), 11 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 177d9afb929d..d4ef3832f8c2 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
@@ -230,7 +230,12 @@ public Tuple<String, Iterable<Dataset>> listDatasetsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/datasets";
+    String gcpResourceDestinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -438,7 +443,12 @@ public Job createSkipExceptionTranslation(Job job, Map<Option, ?> options) throw
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -481,7 +491,12 @@ public Job createJobForQuerySkipExceptionTranslation(Job job) throws IOException
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -750,7 +765,13 @@ public Tuple<String, Iterable<Table>> listTablesSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String gcpResourceDestinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/tables";
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/tables")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1034,7 +1055,14 @@ public boolean deleteModelSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String gcpResourceDestinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/models/" + modelId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/models/")
+            .append(modelId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1245,7 +1273,14 @@ public boolean deleteRoutineSkipExceptionTranslation(
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
     String gcpResourceDestinationId =
-        RESOURCE_PROJECT_PREFIX + projectId + "/datasets/" + datasetId + "/routines/" + routineId;
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/datasets/")
+            .append(datasetId)
+            .append("/routines/")
+            .append(routineId)
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1564,7 +1599,12 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1822,7 +1862,12 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = RESOURCE_PROJECT_PREFIX + projectId + "/jobs";
+    String gcpResourceDestinationId =
+        new StringBuilder()
+            .append(RESOURCE_PROJECT_PREFIX)
+            .append(projectId)
+            .append("/jobs")
+            .toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1952,7 +1997,8 @@ public Policy getIamPolicySkipExceptionTranslation(String resourceId, Map<Option
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = "//bigquery.googleapis.com/" + resourceId;
+    String gcpResourceDestinationId =
+        new StringBuilder().append("//bigquery.googleapis.com/").append(resourceId).toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -1987,7 +2033,8 @@ public Policy setIamPolicySkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = "//bigquery.googleapis.com/" + resourceId;
+    String gcpResourceDestinationId =
+        new StringBuilder().append("//bigquery.googleapis.com/").append(resourceId).toString();
 
     return executeWithSpan(
         createRpcTracingSpan(
@@ -2023,7 +2070,8 @@ public TestIamPermissionsResponse testIamPermissionsSkipExceptionTranslation(
         .getRequestHeaders()
         .set("x-goog-otel-enabled", this.options.isOpenTelemetryTracingEnabled());
 
-    String gcpResourceDestinationId = "//bigquery.googleapis.com/" + resourceId;
+    String gcpResourceDestinationId =
+        new StringBuilder().append("//bigquery.googleapis.com/").append(resourceId).toString();
 
     return executeWithSpan(
         createRpcTracingSpan(