url.template cleanup

Author: ldetmer

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

@@ -463,7 +463,7 @@ public Job createSkipExceptionTranslation(Job job, Map<Option, ?> options) throw
             "InsertJob",
             gcpResourceDestinationId,
             options,
-                bqCreateRequest.getUriTemplate()),
+            bqCreateRequest.getUriTemplate()),
         span -> {
           Job jobResponse = bqCreateRequest.execute();
           if (span != null) {
@@ -916,9 +916,9 @@ public Model patchSkipExceptionTranslation(Model model, Map<Option, ?> options)
             "com.google.cloud.bigquery.BigQueryRpc.patchModel",
             "ModelService",
             "PatchModel",
+            gcpResourceDestinationId,
             options,
             bqPatchRequest.getUriTemplate()),
-            options),
         span -> {
           Model modelResponse = bqPatchRequest.execute();
           if (span != null) {
@@ -975,7 +975,8 @@ public Model getModelSkipExceptionTranslation(
             "ModelService",
             "GetModel",
             gcpResourceDestinationId,
-            options, bqGetRequest.getUriTemplate()),
+            options,
+            bqGetRequest.getUriTemplate()),
         span -> {
           Model modelResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1524,7 +1525,8 @@ public Job getJobSkipExceptionTranslation(
             "JobService",
             "GetJob",
             gcpResourceDestinationId,
-            options, bqGetRequest.getUriTemplate()),
+            options,
+            bqGetRequest.getUriTemplate()),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1574,7 +1576,8 @@ public Job getQueryJobSkipExceptionTranslation(String projectId, String jobId, S
             "JobService",
             "GetJob",
             gcpResourceDestinationId,
-            null, bqGetRequest.getUriTemplate()),
+            null,
+            bqGetRequest.getUriTemplate()),
         span -> {
           Job jobResponse = bqGetRequest.execute();
           if (span != null) {
@@ -1636,7 +1639,8 @@ public Tuple<String, Iterable<Job>> listJobsSkipExceptionTranslation(
             "JobService",
             "ListJobs",
             gcpResourceDestinationId,
-            options, listJobsRequest.getUriTemplate()),
+            options,
+            listJobsRequest.getUriTemplate()),
         span -> {
           if (span != null) {
             span.setAttribute("bq.rpc.page_token", listJobsRequest.getPageToken());
@@ -1713,7 +1717,8 @@ public boolean cancelSkipExceptionTranslation(String projectId, String jobId, St
             "JobService",
             "CancelJob",
             gcpResourceDestinationId,
-            null, bqCancelRequest.getUriTemplate()),
+            null,
+            bqCancelRequest.getUriTemplate()),
         span -> {
           bqCancelRequest.execute();
           return true;
@@ -1754,7 +1759,8 @@ public boolean deleteJobSkipExceptionTranslation(
             "JobService",
             "DeleteJob",
             gcpResourceDestinationId,
-            null,bqDeleteRequest.getUriTemplate()),
+            null,
+            bqDeleteRequest.getUriTemplate()),
         span -> {
           bqDeleteRequest.execute();
           return true;
@@ -1901,7 +1907,8 @@ public QueryResponse queryRpcSkipExceptionTranslation(String projectId, QueryReq
             "JobService",
             "Query",
             gcpResourceDestinationId,
-            null,queryRequest.getUriTemplate()),
+            null,
+            queryRequest.getUriTemplate()),
         span -> {
           return queryRequest.execute();
         });
@@ -2126,7 +2133,8 @@ private Span createRpcTracingSpan(
       String service,
       String method,
       String gcpResourceDestinationId,
-      Map<Option, ?> options, String urlTemplate) {
+      Map<Option, ?> options,
+      String urlTemplate) {
     if (!this.options.isOpenTelemetryTracingEnabled()
         || this.options.getOpenTelemetryTracer() == null) {
       return null;

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

@@ -67,7 +67,6 @@ private BigQueryTelemetryTracer() {}
   public static final AttributeKey<Long> SERVER_PORT = AttributeKey.longKey("server.port");
   public static final AttributeKey<String> URL_TEMPLATE = AttributeKey.stringKey("url.template");
 
-
   public static void addCommonAttributeToSpan(Span span) {
     span.setAttribute(GCP_CLIENT_SERVICE, BQ_GCP_CLIENT_SERVICE)
         .setAttribute(GCP_CLIENT_REPO, BQ_GCP_CLIENT_REPO)

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

@@ -154,13 +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")));
-
-    // Verify url.template attribute is present
-    String urlTemplate = rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template"));
-    assertNotNull(urlTemplate, "url.template attribute should be set");
-    assertTrue(
-        urlTemplate.contains("projects/"),
-        "url.template should contain 'projects/' but was: " + urlTemplate);
+    assertNotNull(
+        rpcSpan.getAttributes().get(AttributeKey.stringKey("url.template")),
+        "url.template attribute should be set");
 
     assertEquals(
         gcpResourceDestinationId,