fix(regen): updates retry settings, common templates (#48)

googleapis · Nov 19, 2019 · 19725a9 · 19725a9
1 parent ea1e37b
commit 19725a9
Show file tree

Hide file tree

Showing 12 changed files with 251 additions and 172 deletions.
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1 +1,2 @@
 releaseType: java-yoshi
+bumpMinorPreMajor: true
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -27,6 +27,7 @@ echo ${JOB_TYPE}
 mvn install -B -V \
   -DskipTests=true \
   -Dclirr.skip=true \
+  -Denforcer.skip=true \
   -Dmaven.javadoc.skip=true \
   -Dgcloud.download.skip=true \
   -T 1C
@@ -38,7 +39,7 @@ fi
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -Dclirr.skip=true
+    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
     bash ${KOKORO_GFILE_DIR}/codecov.sh
     bash .kokoro/coerce_logs.sh
     ;;
@@ -49,12 +50,17 @@ javadoc)
     mvn javadoc:javadoc javadoc:test-javadoc
     ;;
 integration)
-    mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify
+    mvn -B ${INTEGRATION_TEST_ARGS} \
+      -DtrimStackTrace=false \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -fae \
+      verify
     bash .kokoro/coerce_logs.sh
     ;;
 clirr)
-    mvn -B clirr:check
+    mvn -B -Denforcer.skip=true clirr:check
     ;;
 *)
     ;;
-esac
+esac
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
@@ -23,5 +23,9 @@ echo $JOB_TYPE
 
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
-mvn install -DskipTests=true -B -V
+# this should run maven enforcer
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true
+
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java
@@ -266,13 +266,13 @@ public final UnaryCallable<BatchWriteSpansRequest, Empty> batchWriteSpansCallabl
    *
    * <pre><code>
    * try (TraceServiceClient traceServiceClient = TraceServiceClient.create()) {
-   *   SpanName name = SpanName.of("[PROJECT]", "[TRACE]", "[SPAN]");
+   *   String name = "";
    *   String spanId = "";
    *   TruncatableString displayName = TruncatableString.newBuilder().build();
    *   Timestamp startTime = Timestamp.newBuilder().build();
    *   Timestamp endTime = Timestamp.newBuilder().build();
    *   Span request = Span.newBuilder()
-   *     .setName(name.toString())
+   *     .setName(name)
    *     .setSpanId(spanId)
    *     .setDisplayName(displayName)
    *     .setStartTime(startTime)
@@ -297,13 +297,13 @@ public final Span createSpan(Span request) {
    *
    * <pre><code>
    * try (TraceServiceClient traceServiceClient = TraceServiceClient.create()) {
-   *   SpanName name = SpanName.of("[PROJECT]", "[TRACE]", "[SPAN]");
+   *   String name = "";
    *   String spanId = "";
    *   TruncatableString displayName = TruncatableString.newBuilder().build();
    *   Timestamp startTime = Timestamp.newBuilder().build();
    *   Timestamp endTime = Timestamp.newBuilder().build();
    *   Span request = Span.newBuilder()
-   *     .setName(name.toString())
+   *     .setName(name)
    *     .setSpanId(spanId)
    *     .setDisplayName(displayName)
    *     .setStartTime(startTime)

diff --git a/...le-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java b/...le-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java
@@ -195,12 +195,12 @@ public static class Builder extends StubSettings.Builder<TraceServiceStubSetting
       settings =
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
-              .setRetryDelayMultiplier(1.2)
-              .setMaxRetryDelay(Duration.ofMillis(1000L))
-              .setInitialRpcTimeout(Duration.ofMillis(30000L))
-              .setRpcTimeoutMultiplier(1.5)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(120000L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(20000L))
+              .setTotalTimeout(Duration.ofMillis(600000L))
               .build();
       definitions.put("default", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
@@ -242,7 +242,7 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .createSpanSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       return builder;

diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java
@@ -38,6 +38,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -56,7 +57,8 @@ public class TraceServiceClientTest {
   public static void startStaticServer() {
     mockTraceService = new MockTraceService();
     serviceHelper =
-        new MockServiceHelper("in-process-1", Arrays.<MockGrpcService>asList(mockTraceService));
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockTraceService));
     serviceHelper.start();
   }
 

diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -51,7 +52,8 @@ public class TraceServiceClientTest {
   public static void startStaticServer() {
     mockTraceService = new MockTraceService();
     serviceHelper =
-        new MockServiceHelper("in-process-1", Arrays.<MockGrpcService>asList(mockTraceService));
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockTraceService));
     serviceHelper.start();
   }