feat(bigquery): Integrate Otel into retries, jobs, and more (#3842) · googleapis/java-bigquery@4b28c47 (original) (raw)

`@@ -295,7 +295,9 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException

`

295

295

`getOptions().getRetrySettings(),

`

296

296

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

297

297

`getOptions().getClock(),

`

298

``

`-

EMPTY_RETRY_CONFIG));

`

``

298

`+

EMPTY_RETRY_CONFIG,

`

``

299

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

300

`+

getOptions().getOpenTelemetryTracer()));

`

299

301

` } catch (BigQueryRetryHelperException e) {

`

300

302

`throw BigQueryException.translateAndThrow(e);

`

301

303

` } finally {

`

`@@ -340,7 +342,9 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {

`

340

342

`getOptions().getRetrySettings(),

`

341

343

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

342

344

`getOptions().getClock(),

`

343

``

`-

EMPTY_RETRY_CONFIG));

`

``

345

`+

EMPTY_RETRY_CONFIG,

`

``

346

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

347

`+

getOptions().getOpenTelemetryTracer()));

`

344

348

` } catch (BigQueryRetryHelperException e) {

`

345

349

`throw BigQueryException.translateAndThrow(e);

`

346

350

` } finally {

`

`@@ -394,7 +398,9 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException

`

394

398

`getOptions().getRetrySettings(),

`

395

399

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

396

400

`getOptions().getClock(),

`

397

``

`-

EMPTY_RETRY_CONFIG));

`

``

401

`+

EMPTY_RETRY_CONFIG,

`

``

402

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

403

`+

getOptions().getOpenTelemetryTracer()));

`

398

404

` } catch (BigQueryRetryHelperException e) {

`

399

405

`throw BigQueryException.translateAndThrow(e);

`

400

406

` } finally {

`

`@@ -488,7 +494,9 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {

`

488

494

`getOptions().getClock(),

`

489

495

`getBigQueryRetryConfig(optionsMap) != null

`

490

496

` ? getBigQueryRetryConfig(optionsMap)

`

491

``

`-

: DEFAULT_RETRY_CONFIG));

`

``

497

`+

: DEFAULT_RETRY_CONFIG,

`

``

498

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

499

`+

getOptions().getOpenTelemetryTracer()));

`

492

500

` } catch (BigQueryRetryHelperException e) {

`

493

501

`throw BigQueryException.translateAndThrow(e);

`

494

502

` }

`

`@@ -580,7 +588,9 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException

`

580

588

`getOptions().getRetrySettings(),

`

581

589

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

582

590

`getOptions().getClock(),

`

583

``

`-

EMPTY_RETRY_CONFIG);

`

``

591

`+

EMPTY_RETRY_CONFIG,

`

``

592

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

593

`+

getOptions().getOpenTelemetryTracer());

`

584

594

`return Dataset.fromPb(this, answer);

`

585

595

` } catch (BigQueryRetryHelperException e) {

`

586

596

`if (isRetryErrorCodeHttpNotFound(e)) {

`

`@@ -644,7 +654,9 @@ private static Page listDatasets(

`

644

654

`serviceOptions.getRetrySettings(),

`

645

655

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

646

656

`serviceOptions.getClock(),

`

647

``

`-

EMPTY_RETRY_CONFIG);

`

``

657

`+

EMPTY_RETRY_CONFIG,

`

``

658

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

659

`+

serviceOptions.getOpenTelemetryTracer());

`

648

660

`String cursor = result.x();

`

649

661

`return new PageImpl<>(

`

650

662

`new DatasetPageFetcher(projectId, serviceOptions, cursor, optionsMap),

`

`@@ -694,7 +706,9 @@ public Boolean call() throws IOException {

`

694

706

`getOptions().getRetrySettings(),

`

695

707

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

696

708

`getOptions().getClock(),

`

697

``

`-

EMPTY_RETRY_CONFIG);

`

``

709

`+

EMPTY_RETRY_CONFIG,

`

``

710

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

711

`+

getOptions().getOpenTelemetryTracer());

`

698

712

` } catch (BigQueryRetryHelperException e) {

`

699

713

`if (isRetryErrorCodeHttpNotFound(e)) {

`

700

714

`return false;

`

`@@ -743,7 +757,9 @@ public Boolean call() throws IOException {

`

743

757

`getOptions().getRetrySettings(),

`

744

758

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

745

759

`getOptions().getClock(),

`

746

``

`-

EMPTY_RETRY_CONFIG);

`

``

760

`+

EMPTY_RETRY_CONFIG,

`

``

761

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

762

`+

getOptions().getOpenTelemetryTracer());

`

747

763

` } catch (BigQueryRetryHelperException e) {

`

748

764

`if (isRetryErrorCodeHttpNotFound(e)) {

`

749

765

`return false;

`

`@@ -787,7 +803,9 @@ public Boolean call() throws IOException {

`

787

803

`getOptions().getRetrySettings(),

`

788

804

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

789

805

`getOptions().getClock(),

`

790

``

`-

EMPTY_RETRY_CONFIG);

`

``

806

`+

EMPTY_RETRY_CONFIG,

`

``

807

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

808

`+

getOptions().getOpenTelemetryTracer());

`

791

809

` } catch (BigQueryRetryHelperException e) {

`

792

810

`if (isRetryErrorCodeHttpNotFound(e)) {

`

793

811

`return false;

`

`@@ -831,7 +849,9 @@ public Boolean call() throws IOException {

`

831

849

`getOptions().getRetrySettings(),

`

832

850

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

833

851

`getOptions().getClock(),

`

834

``

`-

EMPTY_RETRY_CONFIG);

`

``

852

`+

EMPTY_RETRY_CONFIG,

`

``

853

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

854

`+

getOptions().getOpenTelemetryTracer());

`

835

855

` } catch (BigQueryRetryHelperException e) {

`

836

856

`if (isRetryErrorCodeHttpNotFound(e)) {

`

837

857

`return false;

`

`@@ -873,7 +893,9 @@ public Boolean call() throws IOException {

`

873

893

`getOptions().getRetrySettings(),

`

874

894

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

875

895

`getOptions().getClock(),

`

876

``

`-

EMPTY_RETRY_CONFIG);

`

``

896

`+

EMPTY_RETRY_CONFIG,

`

``

897

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

898

`+

getOptions().getOpenTelemetryTracer());

`

877

899

` } catch (BigQueryRetryHelperException e) {

`

878

900

`throw BigQueryException.translateAndThrow(e);

`

879

901

` } finally {

`

`@@ -912,7 +934,9 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException

`

912

934

`getOptions().getRetrySettings(),

`

913

935

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

914

936

`getOptions().getClock(),

`

915

``

`-

EMPTY_RETRY_CONFIG));

`

``

937

`+

EMPTY_RETRY_CONFIG,

`

``

938

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

939

`+

getOptions().getOpenTelemetryTracer()));

`

916

940

` } catch (BigQueryRetryHelperException e) {

`

917

941

`throw BigQueryException.translateAndThrow(e);

`

918

942

` } finally {

`

`@@ -957,7 +981,9 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {

`

957

981

`getOptions().getRetrySettings(),

`

958

982

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

959

983

`getOptions().getClock(),

`

960

``

`-

EMPTY_RETRY_CONFIG));

`

``

984

`+

EMPTY_RETRY_CONFIG,

`

``

985

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

986

`+

getOptions().getOpenTelemetryTracer()));

`

961

987

` } catch (BigQueryRetryHelperException e) {

`

962

988

`throw BigQueryException.translateAndThrow(e);

`

963

989

` } finally {

`

`@@ -1001,7 +1027,9 @@ public com.google.api.services.bigquery.model.Model call() throws IOException {

`

1001

1027

`getOptions().getRetrySettings(),

`

1002

1028

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1003

1029

`getOptions().getClock(),

`

1004

``

`-

EMPTY_RETRY_CONFIG));

`

``

1030

`+

EMPTY_RETRY_CONFIG,

`

``

1031

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1032

`+

getOptions().getOpenTelemetryTracer()));

`

1005

1033

` } catch (BigQueryRetryHelperException e) {

`

1006

1034

`throw BigQueryException.translateAndThrow(e);

`

1007

1035

` } finally {

`

`@@ -1045,7 +1073,9 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException

`

1045

1073

`getOptions().getRetrySettings(),

`

1046

1074

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1047

1075

`getOptions().getClock(),

`

1048

``

`-

EMPTY_RETRY_CONFIG));

`

``

1076

`+

EMPTY_RETRY_CONFIG,

`

``

1077

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1078

`+

getOptions().getOpenTelemetryTracer()));

`

1049

1079

` } catch (BigQueryRetryHelperException e) {

`

1050

1080

`throw BigQueryException.translateAndThrow(e);

`

1051

1081

` } finally {

`

`@@ -1097,7 +1127,9 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {

`

1097

1127

`getOptions().getRetrySettings(),

`

1098

1128

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1099

1129

`getOptions().getClock(),

`

1100

``

`-

EMPTY_RETRY_CONFIG);

`

``

1130

`+

EMPTY_RETRY_CONFIG,

`

``

1131

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1132

`+

getOptions().getOpenTelemetryTracer());

`

1101

1133

`return Table.fromPb(this, answer);

`

1102

1134

` } catch (BigQueryRetryHelperException e) {

`

1103

1135

`if (isRetryErrorCodeHttpNotFound(e)) {

`

`@@ -1154,7 +1186,9 @@ public com.google.api.services.bigquery.model.Model call() throws IOException {

`

1154

1186

`getOptions().getRetrySettings(),

`

1155

1187

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1156

1188

`getOptions().getClock(),

`

1157

``

`-

EMPTY_RETRY_CONFIG);

`

``

1189

`+

EMPTY_RETRY_CONFIG,

`

``

1190

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1191

`+

getOptions().getOpenTelemetryTracer());

`

1158

1192

`return Model.fromPb(this, answer);

`

1159

1193

` } catch (BigQueryRetryHelperException e) {

`

1160

1194

`if (isRetryErrorCodeHttpNotFound(e)) {

`

`@@ -1211,7 +1245,9 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException

`

1211

1245

`getOptions().getRetrySettings(),

`

1212

1246

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1213

1247

`getOptions().getClock(),

`

1214

``

`-

EMPTY_RETRY_CONFIG);

`

``

1248

`+

EMPTY_RETRY_CONFIG,

`

``

1249

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1250

`+

getOptions().getOpenTelemetryTracer());

`

1215

1251

`return Routine.fromPb(this, answer);

`

1216

1252

` } catch (BigQueryRetryHelperException e) {

`

1217

1253

`if (isRetryErrorCodeHttpNotFound(e)) {

`

`@@ -1427,7 +1463,9 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>> cal

`

1427

1463

`serviceOptions.getRetrySettings(),

`

1428

1464

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1429

1465

`serviceOptions.getClock(),

`

1430

``

`-

EMPTY_RETRY_CONFIG);

`

``

1466

`+

EMPTY_RETRY_CONFIG,

`

``

1467

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

1468

`+

serviceOptions.getOpenTelemetryTracer());

`

1431

1469

`String cursor = result.x();

`

1432

1470

`Iterable

tables =

`

1433

1471

`Iterables.transform(

`

`@@ -1466,7 +1504,9 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Model>> cal

`

1466

1504

`serviceOptions.getRetrySettings(),

`

1467

1505

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1468

1506

`serviceOptions.getClock(),

`

1469

``

`-

EMPTY_RETRY_CONFIG);

`

``

1507

`+

EMPTY_RETRY_CONFIG,

`

``

1508

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

1509

`+

serviceOptions.getOpenTelemetryTracer());

`

1470

1510

`String cursor = result.x();

`

1471

1511

`Iterable models =

`

1472

1512

`Iterables.transform(

`

`@@ -1505,7 +1545,9 @@ private static Page listRoutines(

`

1505

1545

`serviceOptions.getRetrySettings(),

`

1506

1546

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1507

1547

`serviceOptions.getClock(),

`

1508

``

`-

EMPTY_RETRY_CONFIG);

`

``

1548

`+

EMPTY_RETRY_CONFIG,

`

``

1549

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

1550

`+

serviceOptions.getOpenTelemetryTracer());

`

1509

1551

`String cursor = result.x();

`

1510

1552

`Iterable routines =

`

1511

1553

`Iterables.transform(

`

`@@ -1585,7 +1627,9 @@ public TableDataInsertAllResponse call() throws Exception {

`

1585

1627

`getOptions().getRetrySettings(),

`

1586

1628

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1587

1629

`getOptions().getClock(),

`

1588

``

`-

EMPTY_RETRY_CONFIG);

`

``

1630

`+

EMPTY_RETRY_CONFIG,

`

``

1631

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1632

`+

getOptions().getOpenTelemetryTracer());

`

1589

1633

` } catch (BigQueryRetryHelperException e) {

`

1590

1634

`throw BigQueryException.translateAndThrow(e);

`

1591

1635

` }

`

`@@ -1677,7 +1721,9 @@ public TableDataList call() throws IOException {

`

1677

1721

`serviceOptions.getRetrySettings(),

`

1678

1722

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1679

1723

`serviceOptions.getClock(),

`

1680

``

`-

EMPTY_RETRY_CONFIG);

`

``

1724

`+

EMPTY_RETRY_CONFIG,

`

``

1725

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

1726

`+

serviceOptions.getOpenTelemetryTracer());

`

1681

1727

`String cursor = result.getPageToken();

`

1682

1728

`Map<BigQueryRpc.Option, ?> pageOptionMap =

`

1683

1729

`Strings.isNullOrEmpty(cursor) ? optionsMap : optionMap(TableDataListOption.startIndex(0));

`

`@@ -1749,7 +1795,9 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {

`

1749

1795

`getOptions().getRetrySettings(),

`

1750

1796

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1751

1797

`getOptions().getClock(),

`

1752

``

`-

EMPTY_RETRY_CONFIG);

`

``

1798

`+

EMPTY_RETRY_CONFIG,

`

``

1799

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1800

`+

getOptions().getOpenTelemetryTracer());

`

1753

1801

`return Job.fromPb(this, answer);

`

1754

1802

` } catch (BigQueryRetryHelperException e) {

`

1755

1803

`if (isRetryErrorCodeHttpNotFound(e)) {

`

`@@ -1804,7 +1852,9 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>> call(

`

1804

1852

`serviceOptions.getRetrySettings(),

`

1805

1853

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1806

1854

`serviceOptions.getClock(),

`

1807

``

`-

EMPTY_RETRY_CONFIG);

`

``

1855

`+

EMPTY_RETRY_CONFIG,

`

``

1856

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

1857

`+

serviceOptions.getOpenTelemetryTracer());

`

1808

1858

`String cursor = result.x();

`

1809

1859

`Iterable jobs =

`

1810

1860

`Iterables.transform(

`

`@@ -1857,7 +1907,9 @@ public Boolean call() throws IOException {

`

1857

1907

`getOptions().getRetrySettings(),

`

1858

1908

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1859

1909

`getOptions().getClock(),

`

1860

``

`-

EMPTY_RETRY_CONFIG);

`

``

1910

`+

EMPTY_RETRY_CONFIG,

`

``

1911

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1912

`+

getOptions().getOpenTelemetryTracer());

`

1861

1913

` } catch (BigQueryRetryHelperException e) {

`

1862

1914

`if (isRetryErrorCodeHttpNotFound(e)) {

`

1863

1915

`return false;

`

`@@ -1942,7 +1994,9 @@ public com.google.api.services.bigquery.model.QueryResponse call()

`

1942

1994

`getOptions().getRetrySettings(),

`

1943

1995

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

1944

1996

`getOptions().getClock(),

`

1945

``

`-

DEFAULT_RETRY_CONFIG);

`

``

1997

`+

DEFAULT_RETRY_CONFIG,

`

``

1998

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

1999

`+

getOptions().getOpenTelemetryTracer());

`

1946

2000

` } catch (BigQueryRetryHelper.BigQueryRetryHelperException e) {

`

1947

2001

`throw BigQueryException.translateAndThrow(e);

`

1948

2002

` } finally {

`

`@@ -2117,7 +2171,9 @@ public GetQueryResultsResponse call() throws IOException {

`

2117

2171

`serviceOptions.getRetrySettings(),

`

2118

2172

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

2119

2173

`serviceOptions.getClock(),

`

2120

``

`-

DEFAULT_RETRY_CONFIG);

`

``

2174

`+

DEFAULT_RETRY_CONFIG,

`

``

2175

`+

serviceOptions.isOpenTelemetryTracingEnabled(),

`

``

2176

`+

serviceOptions.getOpenTelemetryTracer());

`

2121

2177

``

2122

2178

`TableSchema schemaPb = results.getSchema();

`

2123

2179

``

`@@ -2186,7 +2242,9 @@ public com.google.api.services.bigquery.model.Policy call() throws IOException {

`

2186

2242

`getOptions().getRetrySettings(),

`

2187

2243

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

2188

2244

`getOptions().getClock(),

`

2189

``

`-

EMPTY_RETRY_CONFIG));

`

``

2245

`+

EMPTY_RETRY_CONFIG,

`

``

2246

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

2247

`+

getOptions().getOpenTelemetryTracer()));

`

2190

2248

` } catch (BigQueryRetryHelperException e) {

`

2191

2249

`throw BigQueryException.translateAndThrow(e);

`

2192

2250

` } finally {

`

`@@ -2230,7 +2288,9 @@ public com.google.api.services.bigquery.model.Policy call() throws IOException {

`

2230

2288

`getOptions().getRetrySettings(),

`

2231

2289

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

2232

2290

`getOptions().getClock(),

`

2233

``

`-

EMPTY_RETRY_CONFIG));

`

``

2291

`+

EMPTY_RETRY_CONFIG,

`

``

2292

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

2293

`+

getOptions().getOpenTelemetryTracer()));

`

2234

2294

` } catch (BigQueryRetryHelperException e) {

`

2235

2295

`throw BigQueryException.translateAndThrow(e);

`

2236

2296

` } finally {

`

`@@ -2276,7 +2336,9 @@ public com.google.api.services.bigquery.model.TestIamPermissionsResponse call()

`

2276

2336

`getOptions().getRetrySettings(),

`

2277

2337

`BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,

`

2278

2338

`getOptions().getClock(),

`

2279

``

`-

EMPTY_RETRY_CONFIG);

`

``

2339

`+

EMPTY_RETRY_CONFIG,

`

``

2340

`+

getOptions().isOpenTelemetryTracingEnabled(),

`

``

2341

`+

getOptions().getOpenTelemetryTracer());

`

2280

2342

`return response.getPermissions() == null

`

2281

2343

` ? ImmutableList.of()

`

2282

2344

` : ImmutableList.copyOf(response.getPermissions());

`