From ab467305ca4948d0d0dee0f295d85bb4cd5a6d93 Mon Sep 17 00:00:00 2001 From: blakeli Date: Fri, 24 Apr 2026 17:06:04 -0400 Subject: [PATCH 1/4] test: fix testOpenTelemetryTracingDatasets by setting explicit location --- .../test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 3185354364d2..897843e667b9 100644 --- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -7818,6 +7818,7 @@ public void testOpenTelemetryTracingDatasets() { .setDescription(DESCRIPTION) .setMaxTimeTravelHours(72L) .setLabels(LABELS) + .setLocation("US") .build(); Dataset dataset = bigquery.create(info); @@ -7839,7 +7840,7 @@ public void testOpenTelemetryTracingDatasets() { parentSpan.end(); Map, Object> createMap = OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQuery.createDataset"); - assertEquals("null", createMap.get(AttributeKey.stringKey("bq.dataset.location"))); + assertEquals("US", createMap.get(AttributeKey.stringKey("bq.dataset.location"))); assertEquals( "DatasetService", OTEL_ATTRIBUTES From b9e91d623edf30b0b3f30cc5b0d913fd16bab02a Mon Sep 17 00:00:00 2001 From: blakeli Date: Fri, 24 Apr 2026 18:19:09 -0400 Subject: [PATCH 2/4] test: set location in BigQueryOptions to US in ITBigQueryTest --- .../test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 897843e667b9..62aa3c403aa3 100644 --- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -7801,6 +7801,7 @@ public void testOpenTelemetryTracingDatasets() { BigQueryOptions.newBuilder() .setEnableOpenTelemetryTracing(true) .setOpenTelemetryTracer(tracer) + .setLocation("US") .build(); BigQuery bigquery = otelOptions.getService(); From 9f785b4d19fe785eeb8c823c41ba9e12fd527abb Mon Sep 17 00:00:00 2001 From: blakeli Date: Fri, 24 Apr 2026 18:20:17 -0400 Subject: [PATCH 3/4] test: remove redundant setLocation on DatasetInfo in ITBigQueryTest --- .../test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 62aa3c403aa3..2d1e17044380 100644 --- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -7819,7 +7819,6 @@ public void testOpenTelemetryTracingDatasets() { .setDescription(DESCRIPTION) .setMaxTimeTravelHours(72L) .setLabels(LABELS) - .setLocation("US") .build(); Dataset dataset = bigquery.create(info); From d1ff4893d9c695cb9185d495bf945f2cb7682c69 Mon Sep 17 00:00:00 2001 From: blakeli Date: Fri, 24 Apr 2026 18:38:07 -0400 Subject: [PATCH 4/4] test: set location in both options and dataset info to fix flakiness --- .../test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 2d1e17044380..62aa3c403aa3 100644 --- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -7819,6 +7819,7 @@ public void testOpenTelemetryTracingDatasets() { .setDescription(DESCRIPTION) .setMaxTimeTravelHours(72L) .setLabels(LABELS) + .setLocation("US") .build(); Dataset dataset = bigquery.create(info);