test: fix test failures due to behavior change and hardcoded project ID

Author: blakeli0

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITOpenTelemetryTest.java

@@ -99,10 +99,10 @@ public void testListDatasetsTraced() {
         assertEquals(200L, attrs.get(HttpTracingRequestInitializer.HTTP_RESPONSE_STATUS_CODE));
         assertEquals("bigquery.googleapis.com", attrs.get(BigQueryTelemetryTracer.URL_DOMAIN));
         assertEquals(
-            "https://bigquery.googleapis.com/bigquery/v2/projects/gcloud-devel/datasets?prettyPrint=false",
+            "https://bigquery.googleapis.com/bigquery/v2/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets?prettyPrint=false",
             attrs.get(HttpTracingRequestInitializer.URL_FULL));
         assertEquals(
-            "//bigquery.googleapis.com/projects/gcloud-devel/datasets",
+            "//bigquery.googleapis.com/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets",
             attrs.get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
         assertEquals(
             "projects/{+projectId}/datasets", attrs.get(BigQueryTelemetryTracer.URL_TEMPLATE));
@@ -146,19 +146,19 @@ public void testGetDatasetNotFoundTraced() {
             "projects/{+projectId}/datasets/{+datasetId}",
             attrs.get(BigQueryTelemetryTracer.URL_TEMPLATE));
         assertEquals(
-            "https://bigquery.googleapis.com/bigquery/v2/projects/gcloud-devel/datasets/non_existent_dataset?prettyPrint=false",
+            "https://bigquery.googleapis.com/bigquery/v2/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets/non_existent_dataset?prettyPrint=false",
             attrs.get(HttpTracingRequestInitializer.URL_FULL));
         assertEquals(
             "bigquery.googleapis.com", attrs.get(HttpTracingRequestInitializer.SERVER_ADDRESS));
         assertEquals("bigquery.googleapis.com", attrs.get(BigQueryTelemetryTracer.URL_DOMAIN));
         assertEquals(
-            "//bigquery.googleapis.com/projects/gcloud-devel/datasets/non_existent_dataset",
+            "//bigquery.googleapis.com/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets/non_existent_dataset",
             attrs.get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
 
         // Error attributes
         assertEquals("notFound", attrs.get(BigQueryTelemetryTracer.ERROR_TYPE));
         assertEquals(
-            "Not found: Dataset gcloud-devel:non_existent_dataset",
+            "Not found: Dataset " + bigqueryHelper.getOptions().getProjectId() + ":non_existent_dataset",
             attrs.get(BigQueryTelemetryTracer.STATUS_MESSAGE));
       }
     }
@@ -197,7 +197,7 @@ public void testClientErrorAndRetriesTraced() {
         Map<AttributeKey<?>, Object> attrs = span.getAttributes().asMap();
         checkGeneralAttributes(attrs);
         assertEquals(
-            "https://invalid-host-name-12345.com:8080/bigquery/v2/projects/gcloud-devel/datasets?prettyPrint=false",
+            "https://invalid-host-name-12345.com:8080/bigquery/v2/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets?prettyPrint=false",
             (String) attrs.get(HttpTracingRequestInitializer.URL_FULL));
         assertEquals(
             "invalid-host-name-12345.com", attrs.get(HttpTracingRequestInitializer.SERVER_ADDRESS));
@@ -206,7 +206,7 @@ public void testClientErrorAndRetriesTraced() {
         assertEquals(
             "projects/{+projectId}/datasets", attrs.get(BigQueryTelemetryTracer.URL_TEMPLATE));
         assertEquals(
-            "//bigquery.googleapis.com/projects/gcloud-devel/datasets",
+            "//bigquery.googleapis.com/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets",
             attrs.get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
         checkRetryAttribute(span, rpcSpanCount);
 

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

@@ -1080,7 +1080,7 @@ public void testHttpTracingEnabled_GenericException_SetsAttributes() throws Exce
           "java.io.IOException",
           rpcSpan.getAttributes().get(BigQueryTelemetryTracer.EXCEPTION_TYPE));
       assertEquals(
-          "CLIENT_UNKNOWN_ERROR", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.ERROR_TYPE));
+          "IOException", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.ERROR_TYPE));
     }
 
     @Test