Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 33aedfd

Browse files
yoshi-automationyoshi-automation
authored
fix: update retry settings from grpc_service_config (#155)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/c5c01110-ef56-4b64-a84e-3b1e01d2436d/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 316023196 Source-Link: googleapis/googleapis@cbaf1b6 PiperOrigin-RevId: 316023190 Source-Link: googleapis/googleapis@77e8ca7
1 parent 8545792 commit 33aedfd

3 files changed

Lines changed: 47 additions & 55 deletions

File tree

‎google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1/stub/RecaptchaEnterpriseServiceStubSettings.java‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,9 @@ public static class Builder
300300
static {
301301
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
302302
ImmutableMap.builder();
303+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
303304
definitions.put(
304-
"idempotent",
305-
ImmutableSet.copyOf(
306-
Lists.<StatusCode.Code>newArrayList(
307-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
308-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
305+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
309306
RETRYABLE_CODE_DEFINITIONS = definitions.build();
310307
}
311308

@@ -314,17 +311,16 @@ public static class Builder
314311
static {
315312
ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
316313
RetrySettings settings = null;
314+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
315+
definitions.put("no_retry_params", settings);
317316
settings =
318317
RetrySettings.newBuilder()
319-
.setInitialRetryDelay(Duration.ofMillis(100L))
320-
.setRetryDelayMultiplier(1.3)
321-
.setMaxRetryDelay(Duration.ofMillis(60000L))
322-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
318+
.setInitialRpcTimeout(Duration.ofMillis(600000L))
323319
.setRpcTimeoutMultiplier(1.0)
324-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
320+
.setMaxRpcTimeout(Duration.ofMillis(600000L))
325321
.setTotalTimeout(Duration.ofMillis(600000L))
326322
.build();
327-
definitions.put("default", settings);
323+
definitions.put("no_retry_1_params", settings);
328324
RETRY_PARAM_DEFINITIONS = definitions.build();
329325
}
330326

@@ -375,38 +371,38 @@ private static Builder initDefaults(Builder builder) {
375371

376372
builder
377373
.createAssessmentSettings()
378-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
379-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
374+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
375+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
380376

381377
builder
382378
.annotateAssessmentSettings()
383-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
384-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
379+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
380+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
385381

386382
builder
387383
.createKeySettings()
388-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
389-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
384+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
385+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
390386

391387
builder
392388
.listKeysSettings()
393-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
394-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
389+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
390+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
395391

396392
builder
397393
.getKeySettings()
398-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
399-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
394+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
395+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
400396

401397
builder
402398
.updateKeySettings()
403-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
404-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
399+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
400+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
405401

406402
builder
407403
.deleteKeySettings()
408-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
409-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
404+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
405+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
410406

411407
return builder;
412408
}

‎google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/stub/RecaptchaEnterpriseServiceV1Beta1StubSettings.java‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,9 @@ public static class Builder
302302
static {
303303
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
304304
ImmutableMap.builder();
305+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
305306
definitions.put(
306-
"idempotent",
307-
ImmutableSet.copyOf(
308-
Lists.<StatusCode.Code>newArrayList(
309-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
310-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
307+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
311308
RETRYABLE_CODE_DEFINITIONS = definitions.build();
312309
}
313310

@@ -316,17 +313,16 @@ public static class Builder
316313
static {
317314
ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
318315
RetrySettings settings = null;
316+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
317+
definitions.put("no_retry_params", settings);
319318
settings =
320319
RetrySettings.newBuilder()
321-
.setInitialRetryDelay(Duration.ofMillis(100L))
322-
.setRetryDelayMultiplier(1.3)
323-
.setMaxRetryDelay(Duration.ofMillis(60000L))
324-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
320+
.setInitialRpcTimeout(Duration.ofMillis(600000L))
325321
.setRpcTimeoutMultiplier(1.0)
326-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
322+
.setMaxRpcTimeout(Duration.ofMillis(600000L))
327323
.setTotalTimeout(Duration.ofMillis(600000L))
328324
.build();
329-
definitions.put("default", settings);
325+
definitions.put("no_retry_1_params", settings);
330326
RETRY_PARAM_DEFINITIONS = definitions.build();
331327
}
332328

@@ -377,38 +373,38 @@ private static Builder initDefaults(Builder builder) {
377373

378374
builder
379375
.createAssessmentSettings()
380-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
381-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
376+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
377+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
382378

383379
builder
384380
.annotateAssessmentSettings()
385-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
386-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
381+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
382+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
387383

388384
builder
389385
.createKeySettings()
390-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
391-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
386+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
387+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
392388

393389
builder
394390
.listKeysSettings()
395-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
396-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
391+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
392+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
397393

398394
builder
399395
.getKeySettings()
400-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
401-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
396+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
397+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
402398

403399
builder
404400
.updateKeySettings()
405-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
406-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
401+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
402+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
407403

408404
builder
409405
.deleteKeySettings()
410-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
411-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
406+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
407+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
412408

413409
return builder;
414410
}

‎synth.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-recaptchaenterprise.git",
7-
"sha": "f37391a262c90d418b8d9b0907454bae50201957"
7+
"sha": "8545792a40f98deb0ec187cd5702a785d88ffc51"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "c4e37010d74071851ff24121f522e802231ac86e",
15-
"internalRef": "313460921"
14+
"sha": "cbaf1b693943a074ce21797682bcc3ca75b3e7c5",
15+
"internalRef": "316023196"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "googleapis",
2121
"remote": "https://github.com/googleapis/googleapis.git",
22-
"sha": "c4e37010d74071851ff24121f522e802231ac86e",
23-
"internalRef": "313460921"
22+
"sha": "cbaf1b693943a074ce21797682bcc3ca75b3e7c5",
23+
"internalRef": "316023196"
2424
}
2525
},
2626
{

0 commit comments

Comments
 (0)