Skip to content

Commit 77870f4

Browse files
lqiu96lqiu96
committed
chore(bigquery): pass ApiTracerFactory to all runWithRetries calls
1 parent 35978a8 commit 77870f4

3 files changed

Lines changed: 78 additions & 39 deletions

File tree

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

Lines changed: 62 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException
317317
getOptions().getClock(),
318318
EMPTY_RETRY_CONFIG,
319319
getOptions().isOpenTelemetryTracingEnabled(),
320-
getOptions().getOpenTelemetryTracer()));
320+
getOptions().getOpenTelemetryTracer(),
321+
getOptions().getApiTracerFactory()));
321322
} catch (BigQueryRetryHelperException e) {
322323
throw BigQueryException.translateAndThrow(e);
323324
} finally {
@@ -365,7 +366,8 @@ public Tuple<String, Iterable<ProjectList.Projects>> call() {
365366
serviceOptions.getClock(),
366367
EMPTY_RETRY_CONFIG,
367368
serviceOptions.isOpenTelemetryTracingEnabled(),
368-
serviceOptions.getOpenTelemetryTracer());
369+
serviceOptions.getOpenTelemetryTracer(),
370+
serviceOptions.getApiTracerFactory());
369371
String nextPageToken = result.x();
370372
Iterable<Project> projects =
371373
Iterables.transform(
@@ -430,7 +432,8 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {
430432
getOptions().getClock(),
431433
EMPTY_RETRY_CONFIG,
432434
getOptions().isOpenTelemetryTracingEnabled(),
433-
getOptions().getOpenTelemetryTracer()));
435+
getOptions().getOpenTelemetryTracer(),
436+
getOptions().getApiTracerFactory()));
434437
} catch (BigQueryRetryHelperException e) {
435438
throw BigQueryException.translateAndThrow(e);
436439
} finally {
@@ -486,7 +489,8 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException
486489
getOptions().getClock(),
487490
EMPTY_RETRY_CONFIG,
488491
getOptions().isOpenTelemetryTracingEnabled(),
489-
getOptions().getOpenTelemetryTracer()));
492+
getOptions().getOpenTelemetryTracer(),
493+
getOptions().getApiTracerFactory()));
490494
} catch (BigQueryRetryHelperException e) {
491495
throw BigQueryException.translateAndThrow(e);
492496
} finally {
@@ -683,7 +687,8 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException
683687
getOptions().getClock(),
684688
EMPTY_RETRY_CONFIG,
685689
getOptions().isOpenTelemetryTracingEnabled(),
686-
getOptions().getOpenTelemetryTracer());
690+
getOptions().getOpenTelemetryTracer(),
691+
getOptions().getApiTracerFactory());
687692
return Dataset.fromPb(this, answer);
688693
} catch (BigQueryRetryHelperException e) {
689694
if (isRetryErrorCodeHttpNotFound(e)) {
@@ -749,7 +754,8 @@ private static Page<Dataset> listDatasets(
749754
serviceOptions.getClock(),
750755
EMPTY_RETRY_CONFIG,
751756
serviceOptions.isOpenTelemetryTracingEnabled(),
752-
serviceOptions.getOpenTelemetryTracer());
757+
serviceOptions.getOpenTelemetryTracer(),
758+
serviceOptions.getApiTracerFactory());
753759
String cursor = result.x();
754760
return new PageImpl<>(
755761
new DatasetPageFetcher(projectId, serviceOptions, cursor, optionsMap),
@@ -801,7 +807,8 @@ public Boolean call() throws IOException {
801807
getOptions().getClock(),
802808
EMPTY_RETRY_CONFIG,
803809
getOptions().isOpenTelemetryTracingEnabled(),
804-
getOptions().getOpenTelemetryTracer());
810+
getOptions().getOpenTelemetryTracer(),
811+
getOptions().getApiTracerFactory());
805812
} catch (BigQueryRetryHelperException e) {
806813
if (isRetryErrorCodeHttpNotFound(e)) {
807814
return false;
@@ -852,7 +859,8 @@ public Boolean call() throws IOException {
852859
getOptions().getClock(),
853860
EMPTY_RETRY_CONFIG,
854861
getOptions().isOpenTelemetryTracingEnabled(),
855-
getOptions().getOpenTelemetryTracer());
862+
getOptions().getOpenTelemetryTracer(),
863+
getOptions().getApiTracerFactory());
856864
} catch (BigQueryRetryHelperException e) {
857865
if (isRetryErrorCodeHttpNotFound(e)) {
858866
return false;
@@ -898,7 +906,8 @@ public Boolean call() throws IOException {
898906
getOptions().getClock(),
899907
EMPTY_RETRY_CONFIG,
900908
getOptions().isOpenTelemetryTracingEnabled(),
901-
getOptions().getOpenTelemetryTracer());
909+
getOptions().getOpenTelemetryTracer(),
910+
getOptions().getApiTracerFactory());
902911
} catch (BigQueryRetryHelperException e) {
903912
if (isRetryErrorCodeHttpNotFound(e)) {
904913
return false;
@@ -944,7 +953,8 @@ public Boolean call() throws IOException {
944953
getOptions().getClock(),
945954
EMPTY_RETRY_CONFIG,
946955
getOptions().isOpenTelemetryTracingEnabled(),
947-
getOptions().getOpenTelemetryTracer());
956+
getOptions().getOpenTelemetryTracer(),
957+
getOptions().getApiTracerFactory());
948958
} catch (BigQueryRetryHelperException e) {
949959
if (isRetryErrorCodeHttpNotFound(e)) {
950960
return false;
@@ -988,7 +998,8 @@ public Boolean call() throws IOException {
988998
getOptions().getClock(),
989999
EMPTY_RETRY_CONFIG,
9901000
getOptions().isOpenTelemetryTracingEnabled(),
991-
getOptions().getOpenTelemetryTracer());
1001+
getOptions().getOpenTelemetryTracer(),
1002+
getOptions().getApiTracerFactory());
9921003
} catch (BigQueryRetryHelperException e) {
9931004
throw BigQueryException.translateAndThrow(e);
9941005
} finally {
@@ -1029,7 +1040,8 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException
10291040
getOptions().getClock(),
10301041
EMPTY_RETRY_CONFIG,
10311042
getOptions().isOpenTelemetryTracingEnabled(),
1032-
getOptions().getOpenTelemetryTracer()));
1043+
getOptions().getOpenTelemetryTracer(),
1044+
getOptions().getApiTracerFactory()));
10331045
} catch (BigQueryRetryHelperException e) {
10341046
throw BigQueryException.translateAndThrow(e);
10351047
} finally {
@@ -1076,7 +1088,8 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {
10761088
getOptions().getClock(),
10771089
EMPTY_RETRY_CONFIG,
10781090
getOptions().isOpenTelemetryTracingEnabled(),
1079-
getOptions().getOpenTelemetryTracer()));
1091+
getOptions().getOpenTelemetryTracer(),
1092+
getOptions().getApiTracerFactory()));
10801093
} catch (BigQueryRetryHelperException e) {
10811094
throw BigQueryException.translateAndThrow(e);
10821095
} finally {
@@ -1122,7 +1135,8 @@ public com.google.api.services.bigquery.model.Model call() throws IOException {
11221135
getOptions().getClock(),
11231136
EMPTY_RETRY_CONFIG,
11241137
getOptions().isOpenTelemetryTracingEnabled(),
1125-
getOptions().getOpenTelemetryTracer()));
1138+
getOptions().getOpenTelemetryTracer(),
1139+
getOptions().getApiTracerFactory()));
11261140
} catch (BigQueryRetryHelperException e) {
11271141
throw BigQueryException.translateAndThrow(e);
11281142
} finally {
@@ -1168,7 +1182,8 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException
11681182
getOptions().getClock(),
11691183
EMPTY_RETRY_CONFIG,
11701184
getOptions().isOpenTelemetryTracingEnabled(),
1171-
getOptions().getOpenTelemetryTracer()));
1185+
getOptions().getOpenTelemetryTracer(),
1186+
getOptions().getApiTracerFactory()));
11721187
} catch (BigQueryRetryHelperException e) {
11731188
throw BigQueryException.translateAndThrow(e);
11741189
} finally {
@@ -1222,7 +1237,8 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {
12221237
getOptions().getClock(),
12231238
EMPTY_RETRY_CONFIG,
12241239
getOptions().isOpenTelemetryTracingEnabled(),
1225-
getOptions().getOpenTelemetryTracer());
1240+
getOptions().getOpenTelemetryTracer(),
1241+
getOptions().getApiTracerFactory());
12261242
return Table.fromPb(this, answer);
12271243
} catch (BigQueryRetryHelperException e) {
12281244
if (isRetryErrorCodeHttpNotFound(e)) {
@@ -1281,7 +1297,8 @@ public com.google.api.services.bigquery.model.Model call() throws IOException {
12811297
getOptions().getClock(),
12821298
EMPTY_RETRY_CONFIG,
12831299
getOptions().isOpenTelemetryTracingEnabled(),
1284-
getOptions().getOpenTelemetryTracer());
1300+
getOptions().getOpenTelemetryTracer(),
1301+
getOptions().getApiTracerFactory());
12851302
return Model.fromPb(this, answer);
12861303
} catch (BigQueryRetryHelperException e) {
12871304
if (isRetryErrorCodeHttpNotFound(e)) {
@@ -1340,7 +1357,8 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException
13401357
getOptions().getClock(),
13411358
EMPTY_RETRY_CONFIG,
13421359
getOptions().isOpenTelemetryTracingEnabled(),
1343-
getOptions().getOpenTelemetryTracer());
1360+
getOptions().getOpenTelemetryTracer(),
1361+
getOptions().getApiTracerFactory());
13441362
return Routine.fromPb(this, answer);
13451363
} catch (BigQueryRetryHelperException e) {
13461364
if (isRetryErrorCodeHttpNotFound(e)) {
@@ -1558,7 +1576,8 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>> cal
15581576
serviceOptions.getClock(),
15591577
EMPTY_RETRY_CONFIG,
15601578
serviceOptions.isOpenTelemetryTracingEnabled(),
1561-
serviceOptions.getOpenTelemetryTracer());
1579+
serviceOptions.getOpenTelemetryTracer(),
1580+
serviceOptions.getApiTracerFactory());
15621581
String cursor = result.x();
15631582
Iterable<Table> tables =
15641583
Iterables.transform(
@@ -1599,7 +1618,8 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Model>> cal
15991618
serviceOptions.getClock(),
16001619
EMPTY_RETRY_CONFIG,
16011620
serviceOptions.isOpenTelemetryTracingEnabled(),
1602-
serviceOptions.getOpenTelemetryTracer());
1621+
serviceOptions.getOpenTelemetryTracer(),
1622+
serviceOptions.getApiTracerFactory());
16031623
String cursor = result.x();
16041624
Iterable<Model> models =
16051625
Iterables.transform(
@@ -1640,7 +1660,8 @@ private static Page<Routine> listRoutines(
16401660
serviceOptions.getClock(),
16411661
EMPTY_RETRY_CONFIG,
16421662
serviceOptions.isOpenTelemetryTracingEnabled(),
1643-
serviceOptions.getOpenTelemetryTracer());
1663+
serviceOptions.getOpenTelemetryTracer(),
1664+
serviceOptions.getApiTracerFactory());
16441665
String cursor = result.x();
16451666
Iterable<Routine> routines =
16461667
Iterables.transform(
@@ -1726,7 +1747,8 @@ public TableDataInsertAllResponse call() throws Exception {
17261747
getOptions().getClock(),
17271748
EMPTY_RETRY_CONFIG,
17281749
getOptions().isOpenTelemetryTracingEnabled(),
1729-
getOptions().getOpenTelemetryTracer());
1750+
getOptions().getOpenTelemetryTracer(),
1751+
getOptions().getApiTracerFactory());
17301752
} catch (BigQueryRetryHelperException e) {
17311753
throw BigQueryException.translateAndThrow(e);
17321754
}
@@ -1821,7 +1843,8 @@ public TableDataList call() throws IOException {
18211843
serviceOptions.getClock(),
18221844
EMPTY_RETRY_CONFIG,
18231845
serviceOptions.isOpenTelemetryTracingEnabled(),
1824-
serviceOptions.getOpenTelemetryTracer());
1846+
serviceOptions.getOpenTelemetryTracer(),
1847+
serviceOptions.getApiTracerFactory());
18251848
String cursor = result.getPageToken();
18261849
Map<BigQueryRpc.Option, ?> pageOptionMap =
18271850
Strings.isNullOrEmpty(cursor) ? optionsMap : optionMap(TableDataListOption.startIndex(0));
@@ -1898,7 +1921,8 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {
18981921
getOptions().getClock(),
18991922
EMPTY_RETRY_CONFIG,
19001923
getOptions().isOpenTelemetryTracingEnabled(),
1901-
getOptions().getOpenTelemetryTracer());
1924+
getOptions().getOpenTelemetryTracer(),
1925+
getOptions().getApiTracerFactory());
19021926
return Job.fromPb(this, answer);
19031927
} catch (BigQueryRetryHelperException e) {
19041928
if (isRetryErrorCodeHttpNotFound(e)) {
@@ -1955,7 +1979,8 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>> call(
19551979
serviceOptions.getClock(),
19561980
EMPTY_RETRY_CONFIG,
19571981
serviceOptions.isOpenTelemetryTracingEnabled(),
1958-
serviceOptions.getOpenTelemetryTracer());
1982+
serviceOptions.getOpenTelemetryTracer(),
1983+
serviceOptions.getApiTracerFactory());
19591984
String cursor = result.x();
19601985
Iterable<Job> jobs =
19611986
Iterables.transform(
@@ -2010,7 +2035,8 @@ public Boolean call() throws IOException {
20102035
getOptions().getClock(),
20112036
EMPTY_RETRY_CONFIG,
20122037
getOptions().isOpenTelemetryTracingEnabled(),
2013-
getOptions().getOpenTelemetryTracer());
2038+
getOptions().getOpenTelemetryTracer(),
2039+
getOptions().getApiTracerFactory());
20142040
} catch (BigQueryRetryHelperException e) {
20152041
if (isRetryErrorCodeHttpNotFound(e)) {
20162042
return false;
@@ -2059,7 +2085,8 @@ public com.google.api.services.bigquery.model.QueryResponse call()
20592085
getOptions().getClock(),
20602086
DEFAULT_RETRY_CONFIG,
20612087
getOptions().isOpenTelemetryTracingEnabled(),
2062-
getOptions().getOpenTelemetryTracer());
2088+
getOptions().getOpenTelemetryTracer(),
2089+
getOptions().getApiTracerFactory());
20632090
} catch (BigQueryRetryHelper.BigQueryRetryHelperException e) {
20642091
throw BigQueryException.translateAndThrow(e);
20652092
} finally {
@@ -2271,7 +2298,8 @@ public GetQueryResultsResponse call() throws IOException {
22712298
serviceOptions.getClock(),
22722299
DEFAULT_RETRY_CONFIG,
22732300
serviceOptions.isOpenTelemetryTracingEnabled(),
2274-
serviceOptions.getOpenTelemetryTracer());
2301+
serviceOptions.getOpenTelemetryTracer(),
2302+
serviceOptions.getApiTracerFactory());
22752303

22762304
TableSchema schemaPb = results.getSchema();
22772305

@@ -2342,7 +2370,8 @@ public com.google.api.services.bigquery.model.Policy call() throws IOException {
23422370
getOptions().getClock(),
23432371
EMPTY_RETRY_CONFIG,
23442372
getOptions().isOpenTelemetryTracingEnabled(),
2345-
getOptions().getOpenTelemetryTracer()));
2373+
getOptions().getOpenTelemetryTracer(),
2374+
getOptions().getApiTracerFactory()));
23462375
} catch (BigQueryRetryHelperException e) {
23472376
throw BigQueryException.translateAndThrow(e);
23482377
} finally {
@@ -2388,7 +2417,8 @@ public com.google.api.services.bigquery.model.Policy call() throws IOException {
23882417
getOptions().getClock(),
23892418
EMPTY_RETRY_CONFIG,
23902419
getOptions().isOpenTelemetryTracingEnabled(),
2391-
getOptions().getOpenTelemetryTracer()));
2420+
getOptions().getOpenTelemetryTracer(),
2421+
getOptions().getApiTracerFactory()));
23922422
} catch (BigQueryRetryHelperException e) {
23932423
throw BigQueryException.translateAndThrow(e);
23942424
} finally {
@@ -2436,7 +2466,8 @@ public com.google.api.services.bigquery.model.TestIamPermissionsResponse call()
24362466
getOptions().getClock(),
24372467
EMPTY_RETRY_CONFIG,
24382468
getOptions().isOpenTelemetryTracingEnabled(),
2439-
getOptions().getOpenTelemetryTracer());
2469+
getOptions().getOpenTelemetryTracer(),
2470+
getOptions().getApiTracerFactory());
24402471
return response.getPermissions() == null
24412472
? ImmutableList.of()
24422473
: ImmutableList.copyOf(response.getPermissions());

‎java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ConnectionImpl.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,8 @@ private BigQueryResult queryRpc(
479479
bigQueryOptions.getClock(),
480480
retryConfig,
481481
false,
482-
null);
482+
null,
483+
bigQueryOptions.getApiTracerFactory());
483484
} catch (BigQueryRetryHelperException e) {
484485
throw BigQueryException.translateAndThrow(e);
485486
}
@@ -938,7 +939,8 @@ private Job getQueryJobRpc(JobId jobId) {
938939
bigQueryOptions.getClock(),
939940
EMPTY_RETRY_CONFIG,
940941
false,
941-
null);
942+
null,
943+
bigQueryOptions.getApiTracerFactory());
942944
} catch (BigQueryRetryHelperException e) {
943945
if (e.getCause() instanceof BigQueryException) {
944946
if (((BigQueryException) e.getCause()).getCode() == HTTP_NOT_FOUND) {
@@ -985,7 +987,8 @@ TableDataList tableDataListRpc(TableId destinationTable, String pageToken) {
985987
bigQueryOptions.getClock(),
986988
EMPTY_RETRY_CONFIG,
987989
false,
988-
null);
990+
null,
991+
bigQueryOptions.getApiTracerFactory());
989992

990993
return results;
991994
} catch (BigQueryRetryHelperException e) {
@@ -1226,7 +1229,8 @@ GetQueryResultsResponse getQueryResultsFirstPage(JobId jobId) {
12261229
bigQueryOptions.getClock(),
12271230
retryConfig,
12281231
false,
1229-
null);
1232+
null,
1233+
bigQueryOptions.getApiTracerFactory());
12301234

12311235
if (results.getErrors() != null) {
12321236
List<BigQueryError> bigQueryErrors =
@@ -1493,7 +1497,8 @@ com.google.api.services.bigquery.model.Job createQueryJob(
14931497
bigQueryOptions.getClock(),
14941498
retryConfig,
14951499
false,
1496-
null);
1500+
null,
1501+
bigQueryOptions.getApiTracerFactory());
14971502
} catch (BigQueryRetryHelper.BigQueryRetryHelperException e) {
14981503
logger.log(Level.WARNING, "\n Error occurred while calling createJobForQuery", e);
14991504
throw BigQueryException.translateAndThrow(e);
@@ -1538,7 +1543,8 @@ com.google.api.services.bigquery.model.Job createDryRunJob(String sql) {
15381543
bigQueryOptions.getClock(),
15391544
retryConfig,
15401545
false,
1541-
null);
1546+
null,
1547+
bigQueryOptions.getApiTracerFactory());
15421548
} catch (BigQueryRetryHelper.BigQueryRetryHelperException e) {
15431549
throw BigQueryException.translateAndThrow(e);
15441550
}

‎java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {
8181
getOptions().getClock(),
8282
EMPTY_RETRY_CONFIG,
8383
getOptions().isOpenTelemetryTracingEnabled(),
84-
getOptions().getOpenTelemetryTracer());
84+
getOptions().getOpenTelemetryTracer(),
85+
getOptions().getApiTracerFactory());
8586
job = jobPb != null ? Job.fromPb(getOptions().getService(), jobPb) : null;
8687
} catch (BigQueryRetryHelperException e) {
8788
throw BigQueryException.translateAndThrow(e);
@@ -130,7 +131,8 @@ public String call() throws IOException {
130131
options.getClock(),
131132
EMPTY_RETRY_CONFIG,
132133
options.isOpenTelemetryTracingEnabled(),
133-
options.getOpenTelemetryTracer());
134+
options.getOpenTelemetryTracer(),
135+
options.getApiTracerFactory());
134136
} catch (BigQueryRetryHelperException e) {
135137
throw BigQueryException.translateAndThrow(e);
136138
} finally {

0 commit comments

Comments
 (0)