Skip to content

Commit b1143dd

Browse files
authored
---
yaml --- r: 8609 b: refs/heads/master c: 99e510d h: refs/heads/master i: 8607: a5e18b5
1 parent fab99c9 commit b1143dd

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6e3f26bfe225917d9e0815a4982755d7337fa3ef
2+
refs/heads/master: 99e510d3fcc1d6cb27ab83fdd742e74329217013
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 6daca92127d91b7c2c99490080ecf8a13fa94cde
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

trunk/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.google.api.core.ApiFunction;
2020
import com.google.api.core.ApiFuture;
2121
import com.google.api.core.ApiFutures;
22+
import com.google.api.gax.batching.BatchingSettings;
23+
import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
2224
import com.google.api.gax.core.BackgroundResource;
2325
import com.google.api.gax.core.GaxProperties;
2426
import com.google.api.gax.grpc.GrpcCallContext;
@@ -138,6 +140,24 @@ public Void apply(UnaryCallSettings.Builder<?, ?> builder) {
138140
LoggingSettings.newBuilder(clientContext).applyToAllUnaryMethods(retrySettingsSetter);
139141
MetricsSettings.Builder metricsBuilder =
140142
MetricsSettings.newBuilder(clientContext).applyToAllUnaryMethods(retrySettingsSetter);
143+
144+
// TODO(pongad): Take advantage of https://github.com/googleapis/gax-java/pull/452 when it's
145+
// released.
146+
BatchingSettings oldBatchSettings =
147+
logBuilder.writeLogEntriesSettings().getBatchingSettings();
148+
logBuilder
149+
.writeLogEntriesSettings()
150+
.setBatchingSettings(
151+
oldBatchSettings
152+
.toBuilder()
153+
.setFlowControlSettings(
154+
oldBatchSettings
155+
.getFlowControlSettings()
156+
.toBuilder()
157+
.setLimitExceededBehavior(LimitExceededBehavior.Block)
158+
.build())
159+
.build());
160+
141161
configClient = ConfigClient.create(confBuilder.build());
142162
loggingClient = LoggingClient.create(logBuilder.build());
143163
metricsClient = MetricsClient.create(metricsBuilder.build());

0 commit comments

Comments
 (0)