Skip to content

Commit 250fecc

Browse files
rmehta19rmehta19
committed
Merge branch 'main' into grpc-channel-using-s2a
2 parents 6d98115 + 4d4c798 commit 250fecc

File tree

82 files changed

+804
-802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+804
-802
lines changed

‎.cloudbuild/library_generation/library_generation.Dockerfile‎

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,44 @@
1414

1515
# install gapic-generator-java in a separate layer so we don't overload the image
1616
# with the transferred source code and jars
17-
FROM gcr.io/cloud-devrel-public-resources/java21@sha256:2ceff5eeea72260258df56d42e44ed413e52ee421c1b77393c5f2c9c4d7c41da AS ggj-build
17+
18+
# 3.9.9-eclipse-temurin-11-alpine
19+
FROM docker.io/library/maven@sha256:006d25558f9d5244ed55b5d2bd8eaf34d883e447d0c4b940e67b9f44d21167bf AS ggj-build
1820

1921
WORKDIR /sdk-platform-java
2022
COPY . .
2123
# {x-version-update-start:gapic-generator-java:current}
22-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.49.1-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.49.1-SNAPSHOT"
2325
# {x-version-update-end}
2426

2527
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
2628
RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
2729
"./gapic-generator-java.jar"
2830

29-
# build from the root of this repo:
30-
FROM gcr.io/cloud-devrel-public-resources/python@sha256:9c5ea427632f195ad164054831968389d86fdde4a15abca651f3fcb2a71268cb
31+
# alpine:3.20.3
32+
FROM docker.io/library/alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as glibc-compat
33+
34+
RUN apk add git sudo
35+
# This SHA is the latest known-to-work version of this binary compatibility tool
36+
ARG GLIB_MUS_SHA=7717dd4dc26377dd9cedcc92b72ebf35f9e68a2d
37+
WORKDIR /home
38+
39+
# Install compatibility layer to run glibc-based programs (such as the
40+
# grpc plugin).
41+
# Alpine, by default, only supports musl-based binaries, and there is no public
42+
# downloadable distribution of the grpc plugin that is Alpine (musl) compatible.
43+
# This is one of the recommended approaches to ensure glibc-compatibility
44+
# as per https://wiki.alpinelinux.org/wiki/Running_glibc_programs
45+
RUN git clone https://gitlab.com/manoel-linux1/GlibMus-HQ.git
46+
WORKDIR /home/GlibMus-HQ
47+
# We lock the tool to the latest known-to-work version
48+
RUN git checkout "${GLIB_MUS_SHA}"
49+
RUN chmod a+x compile-x86_64-alpine-linux.sh
50+
RUN sh compile-x86_64-alpine-linux.sh
51+
52+
# python:3.12.7-alpine3.20
53+
FROM docker.io/library/python@sha256:38e179a0f0436c97ecc76bcd378d7293ab3ee79e4b8c440fdc7113670cb6e204 as final
3154

32-
SHELL [ "/bin/bash", "-c" ]
3355

3456

3557
ARG OWLBOT_CLI_COMMITTISH=38fe6f89a2339ee75c77739b31b371f601b01bb3
@@ -40,9 +62,24 @@ ENV HOME=/home
4062
ENV OS_ARCHITECTURE="linux-x86_64"
4163

4264
# install OS tools
43-
RUN apt-get update && apt-get install -y \
44-
unzip openjdk-17-jdk rsync maven jq \
45-
&& apt-get clean
65+
RUN apk update && apk add unzip curl rsync openjdk11 jq bash nodejs npm git
66+
67+
SHELL [ "/bin/bash", "-c" ]
68+
69+
# Copy glibc shared objects to enable execution of the grpc plugin.
70+
# This list was obtained via `libtree -pvvv /grpc/*` in the final container as
71+
# well as inspecting the modifications done by compile-x86_64-alpine-linux.sh
72+
# in the glibc-compat stage using the `dive` command.
73+
COPY --from=glibc-compat /etc/libgcc* /etc/
74+
COPY --from=glibc-compat /lib64/ld-linux-x86-64.so.2 /lib64/
75+
COPY --from=glibc-compat /lib/GLIBCFAKE.so.0 /lib/
76+
COPY --from=glibc-compat /lib/ld-linux-x86-64.so.2 /lib/
77+
COPY --from=glibc-compat /lib/libpthread* /lib/
78+
COPY --from=glibc-compat /lib/libucontext* /lib/
79+
COPY --from=glibc-compat /lib/libc.* /lib/
80+
COPY --from=glibc-compat /usr/lib/libgcc* /usr/lib/
81+
COPY --from=glibc-compat /usr/lib/libstdc* /usr/lib/
82+
COPY --from=glibc-compat /usr/lib/libobstack* /usr/lib/
4683

4784
# copy source code
4885
COPY hermetic_build/common /src/common
@@ -72,10 +109,6 @@ ENV DOCKER_GRPC_VERSION="${GRPC_VERSION}"
72109
COPY --from=ggj-build "/sdk-platform-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
73110
RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar"
74111

75-
# use python 3.12 (the base image has several python versions; here we define the default one)
76-
RUN rm $(which python3)
77-
RUN ln -s $(which python3.12) /usr/local/bin/python
78-
RUN ln -s $(which python3.12) /usr/local/bin/python3
79112
RUN python -m pip install --upgrade pip
80113

81114
# install main scripts as a python package
@@ -85,25 +118,14 @@ RUN python -m pip install src/common
85118
RUN python -m pip install --require-hashes -r src/library_generation/requirements.txt
86119
RUN python -m pip install src/library_generation
87120

88-
# Install nvm with node and npm
89-
ENV NODE_VERSION 20.12.0
90-
WORKDIR /home
91-
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
92-
RUN chmod o+rx /home/.nvm
93-
ENV NODE_PATH=/home/.nvm/versions/node/v${NODE_VERSION}/bin
94-
ENV PATH=${PATH}:${NODE_PATH}
95-
RUN node --version
96-
RUN npm --version
97-
98121
# install the owl-bot CLI
99122
WORKDIR /tools
100123
RUN git clone https://github.com/googleapis/repo-automation-bots
101124
WORKDIR /tools/repo-automation-bots/packages/owl-bot
102125
RUN git checkout "${OWLBOT_CLI_COMMITTISH}"
103126
RUN npm i && npm run compile && npm link
104127
RUN owl-bot copy-code --version
105-
RUN chmod -R o+rx ${NODE_PATH}
106-
RUN ln -sf ${NODE_PATH}/* /usr/local/bin
128+
RUN chmod o+rx $(which owl-bot)
107129

108130
# download the Java formatter
109131
ADD https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${JAVA_FORMAT_VERSION}/google-java-format-${JAVA_FORMAT_VERSION}-all-deps.jar \
@@ -120,7 +142,6 @@ RUN git config --system user.name "Cloud Java Bot"
120142

121143
# allow read-write for /home and execution for binaries in /home/.nvm
122144
RUN chmod -R a+rw /home
123-
RUN chmod -R a+rx /home/.nvm
124145

125146
WORKDIR /workspace
126147
ENTRYPOINT [ "python", "/src/library_generation/cli/entry_point.py", "generate" ]

‎.github/scripts/action.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ runs:
6060
cd "${GITHUB_WORKSPACE}"
6161
pip install --require-hashes -r hermetic_build/common/requirements.txt
6262
pip install hermetic_build/common
63-
pip install --require-hashes -r hermetic_build/library_generation/requirements.txt
64-
pip install hermetic_build/library_generation
6563
pip install --require-hashes -r hermetic_build/release_note_generation/requirements.txt
6664
pip install hermetic_build/release_note_generation
6765
- name: Generate changed libraries

‎.github/scripts/hermetic_library_generation.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,23 @@ pushd "${api_def_dir}"
9292
git checkout "${googleapis_commitish}"
9393
popd
9494

95+
# get changed library list.
96+
changed_libraries=$(python hermetic_build/common/cli/get_changed_libraries.py create \
97+
--baseline-generation-config-path="${baseline_generation_config}" \
98+
--current-generation-config-path="${generation_config}")
99+
echo "Changed libraries are: ${changed_libraries:-"No changed library"}."
100+
95101
# run hermetic code generation docker image.
96102
docker run \
97103
--rm \
98104
--quiet \
99105
-u "$(id -u):$(id -g)" \
100106
-v "$(pwd):${workspace_name}" \
101-
-v "${m2_folder}":/home/.m2 \
102107
-v "${api_def_dir}:${workspace_name}/googleapis" \
103108
-e GENERATOR_VERSION="${image_tag}" \
104109
gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \
105-
--baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
106-
--current-generation-config-path="${workspace_name}/${generation_config}" \
110+
--generation-config-path="${workspace_name}/${generation_config}" \
111+
--library-names="${changed_libraries}" \
107112
--api-definitions-path="${workspace_name}/googleapis"
108113

109114
python hermetic_build/release_note_generation/cli/generate_release_note.py generate \

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ target/
2525
**/build/
2626
**/dist/
2727
library_generation/**/*.jar
28-
28+
**/google-java-format.jar

‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
import com.google.longrunning.Operation;
105105
import com.google.protobuf.Empty;
106106
import java.io.IOException;
107+
import java.time.Duration;
107108
import java.util.ArrayList;
108109
import java.util.Arrays;
109110
import java.util.Collections;
@@ -120,7 +121,6 @@
120121
import java.util.stream.Collectors;
121122
import javax.annotation.Generated;
122123
import javax.annotation.Nullable;
123-
import org.threeten.bp.Duration;
124124

125125
public abstract class AbstractServiceStubSettingsClassComposer implements ClassComposer {
126126
private static final Statement EMPTY_LINE_STATEMENT = EmptyLineStatement.create();

‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public static Expr createBatchingBuilderSettingsExpr(
390390
batchingSettingsBuilderExpr =
391391
MethodInvocationExpr.builder()
392392
.setExprReferenceExpr(batchingSettingsBuilderExpr)
393-
.setMethodName("setDelayThreshold")
393+
.setMethodName("setDelayThresholdDuration")
394394
.setArguments(
395395
createDurationOfMillisExpr(toValExpr(batchingSettings.delayThresholdMillis())))
396396
.build();
@@ -511,7 +511,7 @@ private static List<Expr> createRetrySettingsExprs(
511511
settingsBuilderExpr =
512512
MethodInvocationExpr.builder()
513513
.setExprReferenceExpr(settingsBuilderExpr)
514-
.setMethodName("setInitialRetryDelay")
514+
.setMethodName("setInitialRetryDelayDuration")
515515
.setArguments(createDurationOfMillisExpr(toValExpr(retryPolicy.getInitialBackoff())))
516516
.build();
517517

@@ -528,7 +528,7 @@ private static List<Expr> createRetrySettingsExprs(
528528
settingsBuilderExpr =
529529
MethodInvocationExpr.builder()
530530
.setExprReferenceExpr(settingsBuilderExpr)
531-
.setMethodName("setMaxRetryDelay")
531+
.setMethodName("setMaxRetryDelayDuration")
532532
.setArguments(createDurationOfMillisExpr(toValExpr(retryPolicy.getMaxBackoff())))
533533
.build();
534534
}
@@ -537,7 +537,7 @@ private static List<Expr> createRetrySettingsExprs(
537537
settingsBuilderExpr =
538538
MethodInvocationExpr.builder()
539539
.setExprReferenceExpr(settingsBuilderExpr)
540-
.setMethodName("setInitialRpcTimeout")
540+
.setMethodName("setInitialRpcTimeoutDuration")
541541
.setArguments(createDurationOfMillisExpr(toValExpr(settings.timeout())))
542542
.build();
543543
}
@@ -553,7 +553,8 @@ private static List<Expr> createRetrySettingsExprs(
553553
.build();
554554

555555
if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) {
556-
for (String setterMethodName : Arrays.asList("setMaxRpcTimeout", "setTotalTimeout")) {
556+
for (String setterMethodName :
557+
Arrays.asList("setMaxRpcTimeoutDuration", "setTotalTimeoutDuration")) {
557558
settingsBuilderExpr =
558559
MethodInvocationExpr.builder()
559560
.setExprReferenceExpr(settingsBuilderExpr)
@@ -614,7 +615,7 @@ private static Expr createLroRetrySettingsExpr(
614615
lroRetrySettingsExpr =
615616
MethodInvocationExpr.builder()
616617
.setExprReferenceExpr(lroRetrySettingsExpr)
617-
.setMethodName("setInitialRetryDelay")
618+
.setMethodName("setInitialRetryDelayDuration")
618619
.setArguments(createDurationOfMillisExpr(toValExpr(initialPollDelayMillis)))
619620
.build();
620621

@@ -628,7 +629,7 @@ private static Expr createLroRetrySettingsExpr(
628629
lroRetrySettingsExpr =
629630
MethodInvocationExpr.builder()
630631
.setExprReferenceExpr(lroRetrySettingsExpr)
631-
.setMethodName("setMaxRetryDelay")
632+
.setMethodName("setMaxRetryDelayDuration")
632633
.setArguments(createDurationOfMillisExpr(toValExpr(maxPollDelayMillis)))
633634
.build();
634635

@@ -638,7 +639,7 @@ private static Expr createLroRetrySettingsExpr(
638639
lroRetrySettingsExpr =
639640
MethodInvocationExpr.builder()
640641
.setExprReferenceExpr(lroRetrySettingsExpr)
641-
.setMethodName("setInitialRpcTimeout")
642+
.setMethodName("setInitialRpcTimeoutDuration")
642643
.setArguments(zeroDurationExpr)
643644
.build();
644645

@@ -654,14 +655,14 @@ private static Expr createLroRetrySettingsExpr(
654655
lroRetrySettingsExpr =
655656
MethodInvocationExpr.builder()
656657
.setExprReferenceExpr(lroRetrySettingsExpr)
657-
.setMethodName("setMaxRpcTimeout")
658+
.setMethodName("setMaxRpcTimeoutDuration")
658659
.setArguments(zeroDurationExpr)
659660
.build();
660661

661662
lroRetrySettingsExpr =
662663
MethodInvocationExpr.builder()
663664
.setExprReferenceExpr(lroRetrySettingsExpr)
664-
.setMethodName("setTotalTimeout")
665+
.setMethodName("setTotalTimeoutDuration")
665666
.setArguments(createDurationOfMillisExpr(toValExpr(totalPollTimeoutMillis)))
666667
.build();
667668

@@ -714,7 +715,7 @@ private static TypeStore createStaticTypes() {
714715
List<Class<?>> concreteClazzes =
715716
Arrays.asList(
716717
BatchingSettings.class,
717-
org.threeten.bp.Duration.class,
718+
java.time.Duration.class,
718719
FlowControlSettings.class,
719720
FlowController.LimitExceededBehavior.class,
720721
ImmutableMap.class,

‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ public static Optional<Sample> composeSettingsSample(
7070
.build();
7171

7272
// Builder with set value method
73-
// e.g foobarSettingBuilder.fooSetting().setRetrySettings(
74-
// echoSettingsBuilder.echoSettings().getRetrySettings().toBuilder().setTotalTimeout(Duration.ofSeconds(30)).build());
73+
// e.g. foobarSettingBuilder.fooSetting().setRetrySettings(
74+
// echoSettingsBuilder.echoSettings().getRetrySettings().toBuilder()
75+
// .setTotalTimeoutDuration(Duration.ofSeconds(30)).build());
7576
MethodInvocationExpr settingBuilderMethodInvocationExpr =
7677
MethodInvocationExpr.builder()
7778
.setExprReferenceExpr(localSettingsVarExpr)
7879
.setMethodName(
7980
JavaStyle.toLowerCamelCase(String.format("%sSettings", methodNameOpt.get())))
8081
.build();
81-
String disambiguation = "Settings";
8282
MethodInvocationExpr retrySettingsArgExpr =
8383
MethodInvocationExpr.builder()
8484
.setExprReferenceExpr(settingBuilderMethodInvocationExpr)
@@ -364,7 +364,7 @@ public static Optional<Sample> composeLroSettingsSample(
364364
retrySettingsArgExpr =
365365
MethodInvocationExpr.builder()
366366
.setExprReferenceExpr(retrySettingsArgExpr)
367-
.setMethodName("setMaxRetryDelay")
367+
.setMethodName("setMaxRetryDelayDuration")
368368
.setArguments(ofFiveThousandMillisMethodInvocationExpr)
369369
.build();
370370
retrySettingsArgExpr =

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposerTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,20 @@ void paramDefinitionsBlock_basic() {
119119
"ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();\n",
120120
"RetrySettings settings = null;\n",
121121
"settings ="
122-
+ " RetrySettings.newBuilder().setInitialRetryDelay("
122+
+ " RetrySettings.newBuilder().setInitialRetryDelayDuration("
123123
+ "Duration.ofMillis(100L)).setRetryDelayMultiplier(2.0)"
124-
+ ".setMaxRetryDelay(Duration.ofMillis(3000L))"
125-
+ ".setInitialRpcTimeout(Duration.ofMillis(10000L))"
124+
+ ".setMaxRetryDelayDuration(Duration.ofMillis(3000L))"
125+
+ ".setInitialRpcTimeoutDuration(Duration.ofMillis(10000L))"
126126
+ ".setRpcTimeoutMultiplier(1.0)"
127-
+ ".setMaxRpcTimeout(Duration.ofMillis(10000L))"
128-
+ ".setTotalTimeout(Duration.ofMillis(10000L)).build();\n",
127+
+ ".setMaxRpcTimeoutDuration(Duration.ofMillis(10000L))"
128+
+ ".setTotalTimeoutDuration(Duration.ofMillis(10000L)).build();\n",
129129
"definitions.put(\"retry_policy_1_params\", settings);\n",
130130
"settings ="
131131
+ " RetrySettings.newBuilder()"
132-
+ ".setInitialRpcTimeout(Duration.ofMillis(5000L))"
132+
+ ".setInitialRpcTimeoutDuration(Duration.ofMillis(5000L))"
133133
+ ".setRpcTimeoutMultiplier(1.0)"
134-
+ ".setMaxRpcTimeout(Duration.ofMillis(5000L))"
135-
+ ".setTotalTimeout(Duration.ofMillis(5000L)).build();\n",
134+
+ ".setMaxRpcTimeoutDuration(Duration.ofMillis(5000L))"
135+
+ ".setTotalTimeoutDuration(Duration.ofMillis(5000L)).build();\n",
136136
"definitions.put(\"no_retry_0_params\", settings);\n",
137137
"RETRY_PARAM_DEFINITIONS = definitions.build();\n",
138138
"}\n");
@@ -341,10 +341,10 @@ void lroBuilderExpr() {
341341
+ "WaitResponse.class))"
342342
+ ".setMetadataTransformer(ProtoOperationTransformers.MetadataTransformer.create("
343343
+ "WaitMetadata.class)).setPollingAlgorithm(OperationTimedPollAlgorithm.create("
344-
+ "RetrySettings.newBuilder().setInitialRetryDelay(Duration.ofMillis(5000L))"
345-
+ ".setRetryDelayMultiplier(1.5).setMaxRetryDelay(Duration.ofMillis(45000L))"
346-
+ ".setInitialRpcTimeout(Duration.ZERO).setRpcTimeoutMultiplier(1.0)"
347-
+ ".setMaxRpcTimeout(Duration.ZERO).setTotalTimeout(Duration.ofMillis(300000L))"
344+
+ "RetrySettings.newBuilder().setInitialRetryDelayDuration(Duration.ofMillis(5000L))"
345+
+ ".setRetryDelayMultiplier(1.5).setMaxRetryDelayDuration(Duration.ofMillis(45000L))"
346+
+ ".setInitialRpcTimeoutDuration(Duration.ZERO).setRpcTimeoutMultiplier(1.0)"
347+
+ ".setMaxRpcTimeoutDuration(Duration.ZERO).setTotalTimeoutDuration(Duration.ofMillis(300000L))"
348348
+ ".build()))");
349349
assertEquals(expected, writerVisitor.write());
350350
}
@@ -394,7 +394,7 @@ void batchingSettings_minimalFlowControlSettings() {
394394
+ "BatchingSettings.newBuilder()"
395395
+ ".setElementCountThreshold(100L)"
396396
+ ".setRequestByteThreshold(1048576L)"
397-
+ ".setDelayThreshold(Duration.ofMillis(10L))"
397+
+ ".setDelayThresholdDuration(Duration.ofMillis(10L))"
398398
+ ".setFlowControlSettings("
399399
+ "FlowControlSettings.newBuilder()"
400400
+ ".setLimitExceededBehavior(FlowController.LimitExceededBehavior.Ignore)"
@@ -451,7 +451,7 @@ void batchingSettings_fullFlowControlSettings() {
451451
+ "BatchingSettings.newBuilder()"
452452
+ ".setElementCountThreshold(1000L)"
453453
+ ".setRequestByteThreshold(1048576L)"
454-
+ ".setDelayThreshold(Duration.ofMillis(50L))"
454+
+ ".setDelayThresholdDuration(Duration.ofMillis(50L))"
455455
+ ".setFlowControlSettings("
456456
+ "FlowControlSettings.newBuilder()"
457457
+ ".setMaxOutstandingElementCount(100000L)"

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import com.google.common.collect.Lists;
2222
import com.google.protobuf.Empty;
2323
import com.google.testdata.v1.FibonacciRequest;
2424
import java.io.IOException;
25+
import java.time.Duration;
2526
import java.util.List;
2627
import javax.annotation.Generated;
27-
import org.threeten.bp.Duration;
2828

2929
// AUTO-GENERATED DOCUMENTATION AND CLASS.
3030
/**
@@ -206,10 +206,10 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic
206206
RetrySettings settings = null;
207207
settings =
208208
RetrySettings.newBuilder()
209-
.setInitialRpcTimeout(Duration.ofMillis(60000L))
209+
.setInitialRpcTimeoutDuration(Duration.ofMillis(60000L))
210210
.setRpcTimeoutMultiplier(1.0)
211-
.setMaxRpcTimeout(Duration.ofMillis(60000L))
212-
.setTotalTimeout(Duration.ofMillis(60000L))
211+
.setMaxRpcTimeoutDuration(Duration.ofMillis(60000L))
212+
.setTotalTimeoutDuration(Duration.ofMillis(60000L))
213213
.build();
214214
definitions.put("no_retry_0_params", settings);
215215
RETRY_PARAM_DEFINITIONS = definitions.build();

0 commit comments

Comments
 (0)