Skip to content

Commit d543779

Browse files
committed
rename to queryWithTimeout()
1 parent 997e3ba commit d543779

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818

1919
import static com.google.common.base.Preconditions.checkArgument;
2020

21+
import java.io.Serializable;
22+
import java.util.ArrayList;
23+
import java.util.List;
24+
25+
import org.checkerframework.checker.nullness.qual.NonNull;
26+
2127
import com.google.api.core.BetaApi;
2228
import com.google.api.core.InternalApi;
2329
import com.google.api.gax.paging.Page;
@@ -30,10 +36,6 @@
3036
import com.google.common.base.Function;
3137
import com.google.common.collect.ImmutableList;
3238
import com.google.common.collect.Lists;
33-
import java.io.Serializable;
34-
import java.util.ArrayList;
35-
import java.util.List;
36-
import org.checkerframework.checker.nullness.qual.NonNull;
3739

3840
/**
3941
* An interface for Google Cloud BigQuery.
@@ -49,7 +51,7 @@ public interface BigQuery extends Service<BigQueryOptions> {
4951
* Resource</a>
5052
*/
5153
enum DatasetField implements FieldSelector {
52-
ACCESS("access"),
54+
ACCESS("access"),testTableResultJobIdAndQueryId
5355
CREATION_TIME("creationTime"),
5456
DATASET_REFERENCE("datasetReference"),
5557
DEFAULT_TABLE_EXPIRATION_MS("defaultTableExpirationMsS"),

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ && getOptions().getOpenTelemetryTracer() != null) {
20512051
querySpan =
20522052
getOptions()
20532053
.getOpenTelemetryTracer()
2054-
.spanBuilder("com.google.cloud.bigquery.BigQuery.queryNoWait")
2054+
.spanBuilder("com.google.cloud.bigquery.BigQuery.queryWithTimeout")
20552055
.setAllAttributes(jobId != null ? jobId.getOtelAttributes() : null)
20562056
.setAllAttributes(otelAttributesFromOptions(options))
20572057
.startSpan();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7743,7 +7743,7 @@ public void testOpenTelemetryTracingQuery() throws InterruptedException {
77437743
assertNotNull(
77447744
OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQueryRetryHelper.runWithRetries"));
77457745
assertNotNull(OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQueryRpc.queryRpc"));
7746-
assertTrue(OTEL_ATTRIBUTES.containsKey("com.google.cloud.bigquery.BigQuery.query"));
7746+
assertTrue(OTEL_ATTRIBUTES.containsKey("com.google.cloud.bigquery.BigQuery.queryWithTimeout"));
77477747

77487748
// Query job
77497749
String query = "SELECT TimestampField, StringField, BooleanField FROM " + TABLE_ID.getTable();

0 commit comments

Comments
 (0)