---

pongad · web-flow · commit 95a8b8e65477 · 2018-01-06T15:11:50.000+11:00
yaml --- r: 8895 b: refs/heads/lesv-patch-1 c: 99e510d h: refs/heads/master i: 8893: 725d320 8891: 0cc0b06 8887: a6aaa3a 8879: 4c02fcb 8863: 4e14e03 8831: 50dfaab
diff --git a/[refs] b/[refs]
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
 refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
 refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
 refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
-refs/heads/lesv-patch-1: 6e3f26bfe225917d9e0815a4982755d7337fa3ef
+refs/heads/lesv-patch-1: 99e510d3fcc1d6cb27ab83fdd742e74329217013
 refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
 refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
 refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb
diff --git a/branches/lesv-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/branches/lesv-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
@@ -19,6 +19,8 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
+import com.google.api.gax.batching.BatchingSettings;
+import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.grpc.GrpcCallContext;
@@ -138,6 +140,24 @@ public Void apply(UnaryCallSettings.Builder<?, ?> builder) {
           LoggingSettings.newBuilder(clientContext).applyToAllUnaryMethods(retrySettingsSetter);
       MetricsSettings.Builder metricsBuilder =
           MetricsSettings.newBuilder(clientContext).applyToAllUnaryMethods(retrySettingsSetter);
+
+      // TODO(pongad): Take advantage of https://github.com/googleapis/gax-java/pull/452 when it's
+      // released.
+      BatchingSettings oldBatchSettings =
+          logBuilder.writeLogEntriesSettings().getBatchingSettings();
+      logBuilder
+          .writeLogEntriesSettings()
+          .setBatchingSettings(
+              oldBatchSettings
+                  .toBuilder()
+                  .setFlowControlSettings(
+                      oldBatchSettings
+                          .getFlowControlSettings()
+                          .toBuilder()
+                          .setLimitExceededBehavior(LimitExceededBehavior.Block)
+                          .build())
+                  .build());
+
       configClient = ConfigClient.create(confBuilder.build());
       loggingClient = LoggingClient.create(logBuilder.build());
       metricsClient = MetricsClient.create(metricsBuilder.build());
