logging: flowcontrol should block (#2741)

pongad · web-flow · commit 99e510d3fcc1 · 2018-01-06T15:11:50.000+11:00
Fixes #2714.
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/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());
