feat: [cloudprofiler] add client side retry config for export service (#10060)

gcf-owl-bot[bot] · web-flow · commit 1961c40a135f · 2023-11-16T19:08:16.000Z
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 582745175 Source-Link: https://togithub.com/googleapis/googleapis/commit/c497e8440ed4390cfa1de243f73f7114caff8782 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/d254614a635a592e19d4ddf63c5c54c242abfe6c Copy-Tag: eyJwIjoiamF2YS1wcm9maWxlci8uT3dsQm90LnlhbWwiLCJoIjoiZDI1NDYxNGE2MzVhNTkyZTE5ZDRkZGY2M2M1YzU0YzI0MmFiZmU2YyJ9 BEGIN_NESTED_COMMIT chore: [cloudprofiler] update go_package and Go importpath PiperOrigin-RevId: 582685115 Source-Link: https://togithub.com/googleapis/googleapis/commit/c320b40679fccd0e84d328664fa8ce589e62861f Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/8e873fb1b1e209942ab2c1002c0fcfb881f10e59 Copy-Tag: eyJwIjoiamF2YS1wcm9maWxlci8uT3dsQm90LnlhbWwiLCJoIjoiOGU4NzNmYjFiMWUyMDk5NDJhYjJjMTAwMmMwZmNmYjg4MWYxMGU1OSJ9 END_NESTED_COMMIT
diff --git a/java-profiler/README.md b/java-profiler/README.md
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.23.0</version>
+      <version>26.27.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: https://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-profiler.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-profiler/2.24.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-profiler/2.30.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/java-profiler/google-cloud-profiler/src/main/java/com/google/devtools/cloudprofiler/v2/stub/ProfilerServiceStubSettings.java b/java-profiler/google-cloud-profiler/src/main/java/com/google/devtools/cloudprofiler/v2/stub/ProfilerServiceStubSettings.java
@@ -238,10 +238,10 @@ public static class Builder extends StubSettings.Builder<ProfilerServiceStubSett
     static {
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
-      definitions.put(
-          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       definitions.put(
           "no_retry_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -257,15 +257,15 @@ public static class Builder extends StubSettings.Builder<ProfilerServiceStubSett
               .setMaxRpcTimeout(Duration.ofMillis(3610000L))
               .setTotalTimeout(Duration.ofMillis(3610000L))
               .build();
-      definitions.put("no_retry_1_params", settings);
+      definitions.put("no_retry_2_params", settings);
       settings =
           RetrySettings.newBuilder()
               .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
               .setMaxRpcTimeout(Duration.ofMillis(30000L))
               .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("no_retry_2_params", settings);
+      definitions.put("no_retry_3_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -327,18 +327,18 @@ private static Builder createHttpJsonDefault() {
     private static Builder initDefaults(Builder builder) {
       builder
           .createProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
 
       builder
           .createOfflineProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       builder
           .updateProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       return builder;
     }
diff --git a/java-profiler/proto-google-cloud-profiler-v2/src/main/java/com/google/devtools/cloudprofiler/v2/ProfilerProto.java b/java-profiler/proto-google-cloud-profiler-v2/src/main/java/com/google/devtools/cloudprofiler/v2/ProfilerProto.java
@@ -121,13 +121,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "com\322A\212\001https://www.googleapis.com/auth/c"
           + "loud-platform,https://www.googleapis.com"
           + "/auth/monitoring,https://www.googleapis."
-          + "com/auth/monitoring.writeB\332\001\n$com.google"
+          + "com/auth/monitoring.writeB\324\001\n$com.google"
           + ".devtools.cloudprofiler.v2B\rProfilerProt"
-          + "oP\001ZMgoogle.golang.org/genproto/googleap"
-          + "is/devtools/cloudprofiler/v2;cloudprofil"
-          + "er\252\002\030Google.Cloud.Profiler.V2\312\002\030Google\\C"
-          + "loud\\Profiler\\V2\352\002\033Google::Cloud::Profil"
-          + "er::V2b\006proto3"
+          + "oP\001ZGcloud.google.com/go/cloudprofiler/a"
+          + "piv2/cloudprofilerpb;cloudprofilerpb\252\002\030G"
+          + "oogle.Cloud.Profiler.V2\312\002\030Google\\Cloud\\P"
+          + "rofiler\\V2\352\002\033Google::Cloud::Profiler::V2"
+          + "b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-profiler/proto-google-cloud-profiler-v2/src/main/proto/google/devtools/cloudprofiler/v2/profiler.proto b/java-profiler/proto-google-cloud-profiler-v2/src/main/proto/google/devtools/cloudprofiler/v2/profiler.proto
@@ -24,7 +24,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/field_mask.proto";
 
 option csharp_namespace = "Google.Cloud.Profiler.V2";
-option go_package = "google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2;cloudprofiler";
+option go_package = "cloud.google.com/go/cloudprofiler/apiv2/cloudprofilerpb;cloudprofilerpb";
 option java_multiple_files = true;
 option java_outer_classname = "ProfilerProto";
 option java_package = "com.google.devtools.cloudprofiler.v2";
