fix: update retry configs, adds generated samples (#26)

googleapis · Oct 18, 2019 · f111aee · dehler · Jun 23, 2021 · f111aee
1 parent e2d5a9d
commit f111aee
Show file tree

Hide file tree

Showing 111 changed files with 4,970 additions and 2,322 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,7 @@ Thanks for stopping by to let us know something could be better!
 
 Please run down the following list and make sure you've tried the usual "quick fixes":
 
-  - Search the issues already opened: https://github.com/googleapis/google-cloud-speect/issues
+  - Search the issues already opened: https://github.com/googleapis/java-speech/issues
   - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
 
 If you are still having issues, please include as much information as possible:
@@ -48,4 +48,4 @@ Any relevant stacktrace here.
 
 Following these steps guarantees the quickest resolution possible.
 
-Thanks!
+Thanks!
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -0,0 +1 @@
+releaseType: java-yoshi
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -39,6 +39,7 @@ case ${JOB_TYPE} in
 test)
     mvn test -B
     bash ${KOKORO_GFILE_DIR}/codecov.sh
+    bash .kokoro/coerce_logs.sh
     ;;
 lint)
     mvn com.coveo:fmt-maven-plugin:check
@@ -48,6 +49,7 @@ javadoc)
     ;;
 integration)
     mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify
+    bash .kokoro/coerce_logs.sh
     ;;
 *)
     ;;

diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script finds and moves sponge logs so that they can be found by placer
+# and are not flagged as flaky by sponge.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+job=$(basename ${KOKORO_JOB_NAME})
+
+echo "coercing sponge logs..."
+for xml in `find . -name *-sponge_log.xml`
+do
+  echo "processing ${xml}"
+  class=$(basename ${xml} | cut -d- -f2)
+  dir=$(dirname ${xml})/${job}/${class}
+  text=$(dirname ${xml})/${class}-sponge_log.txt
+  mkdir -p ${dir}
+  mv ${xml} ${dir}/sponge_log.xml
+  mv ${text} ${dir}/sponge_log.txt
+done
diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg
@@ -4,6 +4,7 @@
 action {
   define_artifacts {
     regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
   }
 }
 

diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg
@@ -4,6 +4,7 @@
 action {
   define_artifacts {
     regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
   }
 }
 

diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg
@@ -4,6 +4,7 @@
 action {
   define_artifacts {
     regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
   }
 }
 

diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
@@ -19,6 +19,9 @@ source $(dirname "$0")/common.sh
 MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
 pushd $(dirname "$0")/../../
 
+# ensure we're trying to push a snapshot (no-result returns non-zero exit code)
+grep SNAPSHOT versions.txt
+
 setup_environment_secrets
 create_settings_xml_file "settings.xml"
 
@@ -27,4 +30,4 @@ mvn clean install deploy -B \
   -DperformRelease=true \
   -Dgpg.executable=gpg \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GPG_HOMEDIR}
+  -Dgpg.homedir=${GPG_HOMEDIR}
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
@@ -28,6 +28,7 @@ create_settings_xml_file "settings.xml"
 
 mvn clean install deploy -B \
   --settings ${MAVEN_SETTINGS_FILE} \
+  -DskipTests=true \
   -DperformRelease=true \
   -Dgpg.executable=gpg \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
@@ -196,9 +196,9 @@ public final OperationsClient getOperationsClient() {
    * }
    * </code></pre>
    *
-   * @param config &#42;Required&#42; Provides information to the recognizer that specifies how to
-   *     process the request.
-   * @param audio &#42;Required&#42; The audio data to be recognized.
+   * @param config Required. Provides information to the recognizer that specifies how to process
+   *     the request.
+   * @param audio Required. The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final RecognizeResponse recognize(RecognitionConfig config, RecognitionAudio audio) {
@@ -283,7 +283,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *
@@ -305,9 +306,9 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
    * }
    * </code></pre>
    *
-   * @param config &#42;Required&#42; Provides information to the recognizer that specifies how to
-   *     process the request.
-   * @param audio &#42;Required&#42; The audio data to be recognized.
+   * @param config Required. Provides information to the recognizer that specifies how to process
+   *     the request.
+   * @param audio Required. The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   @BetaApi(
@@ -324,7 +325,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *
@@ -364,7 +366,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *
@@ -403,7 +406,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * A client to Cloud Speech API.
+ * A client to Cloud Speech-to-Text API.
  *
  * <p>The interfaces provided are listed below, along with usage samples.
  *

diff --git a/...cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java b/...cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
@@ -36,7 +36,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC callable factory implementation for Cloud Speech API.
+ * gRPC callable factory implementation for Cloud Speech-to-Text API.
  *
  * <p>This class is for advanced usage.
  */

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
@@ -41,7 +41,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC stub implementation for Cloud Speech API.
+ * gRPC stub implementation for Cloud Speech-to-Text API.
  *
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
@@ -33,7 +33,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * Base stub class for Cloud Speech API.
+ * Base stub class for Cloud Speech-to-Text API.
  *
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
@@ -233,10 +233,10 @@ public static class Builder extends StubSettings.Builder<SpeechStubSettings, Bui
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(1000000L))
+              .setInitialRpcTimeout(Duration.ofMillis(20000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(1000000L))
-              .setTotalTimeout(Duration.ofMillis(5000000L))
+              .setMaxRpcTimeout(Duration.ofMillis(20000L))
+              .setTotalTimeout(Duration.ofMillis(600000L))
               .build();
       definitions.put("default", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
@@ -277,7 +277,7 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .recognizeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
@@ -301,13 +301,13 @@ private static Builder initDefaults(Builder builder) {
           .setPollingAlgorithm(
               OperationTimedPollAlgorithm.create(
                   RetrySettings.newBuilder()
-                      .setInitialRetryDelay(Duration.ofMillis(20000L))
+                      .setInitialRetryDelay(Duration.ofMillis(500L))
                       .setRetryDelayMultiplier(1.5)
-                      .setMaxRetryDelay(Duration.ofMillis(45000L))
+                      .setMaxRetryDelay(Duration.ofMillis(5000L))
                       .setInitialRpcTimeout(Duration.ZERO) // ignored
                       .setRpcTimeoutMultiplier(1.0) // ignored
                       .setMaxRpcTimeout(Duration.ZERO) // ignored
-                      .setTotalTimeout(Duration.ofMillis(86400000L))
+                      .setTotalTimeout(Duration.ofMillis(300000L))
                       .build()));
 
       return builder;

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
@@ -196,9 +196,9 @@ public final OperationsClient getOperationsClient() {
    * }
    * </code></pre>
    *
-   * @param config &#42;Required&#42; Provides information to the recognizer that specifies how to
-   *     process the request.
-   * @param audio &#42;Required&#42; The audio data to be recognized.
+   * @param config Required. Provides information to the recognizer that specifies how to process
+   *     the request.
+   * @param audio Required. The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final RecognizeResponse recognize(RecognitionConfig config, RecognitionAudio audio) {
@@ -283,7 +283,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *
@@ -305,9 +306,9 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
    * }
    * </code></pre>
    *
-   * @param config &#42;Required&#42; Provides information to the recognizer that specifies how to
-   *     process the request.
-   * @param audio &#42;Required&#42; The audio data to be recognized.
+   * @param config Required. Provides information to the recognizer that specifies how to process
+   *     the request.
+   * @param audio Required. The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   @BetaApi(
@@ -324,7 +325,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *
@@ -364,7 +366,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *
@@ -403,7 +406,8 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
   /**
    * Performs asynchronous speech recognition: receive results via the google.longrunning.Operations
    * interface. Returns either an `Operation.error` or an `Operation.response` which contains a
-   * `LongRunningRecognizeResponse` message.
+   * `LongRunningRecognizeResponse` message. For more information on asynchronous speech
+   * recognition, see the [how-to](https://cloud.google.com/speech-to-text/docs/async-recognize).
    *
    * <p>Sample code:
    *

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * A client to Cloud Speech API.
+ * A client to Cloud Speech-to-Text API.
  *
  * <p>The interfaces provided are listed below, along with usage samples.
  *

diff --git a/...peech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java b/...peech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
@@ -36,7 +36,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC callable factory implementation for Cloud Speech API.
+ * gRPC callable factory implementation for Cloud Speech-to-Text API.
  *
  * <p>This class is for advanced usage.
  */

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
@@ -41,7 +41,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC stub implementation for Cloud Speech API.
+ * gRPC stub implementation for Cloud Speech-to-Text API.
  *
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */

diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
@@ -33,7 +33,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * Base stub class for Cloud Speech API.
+ * Base stub class for Cloud Speech-to-Text API.
  *
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */