Skip to content

Commit ce6d52d

Browse files
ajaaymchingor13
ajaaym
authored and
chingor13
committed
---
yaml --- r: 15985 b: refs/heads/autosynth-errorreporting c: 63a9cb7 h: refs/heads/master i: 15983: 3394f4d
1 parent 4c44dc7 commit ce6d52d

5 files changed

Lines changed: 61 additions & 13 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
131131
refs/heads/autosynth-containeranalysis: 039ca5b8db725c76c16a965ff26b2774322b8ef8
132132
refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
133133
refs/heads/autosynth-dialogflow: d7477419376eac9b6dcc7dbcede581152527351d
134-
refs/heads/autosynth-errorreporting: f526a44e5f6c35b442d9dd9b5a52b0399a983a3c
134+
refs/heads/autosynth-errorreporting: 63a9cb7e487a16fcab6dd4229478d93f5e972cbb
135135
refs/heads/autosynth-firestore: 92b27fbc8855c9902168695abb0a8f1f433b750b
136136
refs/heads/autosynth-iot: 9d732be07d99843d8cb53d34ec0837328a807fce
137137
refs/heads/autosynth-kms: dcc6e15d68759010c8735cc868135bd7e6c1cc5f

‎branches/autosynth-errorreporting/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,15 @@ public static EntryListOption filter(String filter) {
186186
Synchronicity getWriteSynchronicity();
187187

188188
/**
189-
* Sets flush severity for asynchronous logging writes. Default is ERROR. Logs will be immediately
190-
* written out for entries at or higher than flush severity.
189+
* Sets flush severity for asynchronous logging writes. It is disabled by default, enabled when
190+
* this method is called with not null value. Logs will be immediately written out for entries at
191+
* or higher than flush severity.
192+
*
193+
* <p>Enabling this can cause the leaking and hanging threads, see BUG(2796) BUG(3880). However
194+
* you can explicitly call {@link #flush}.
195+
*
196+
* <p>TODO: Enable this by default once functionality to trigger rpc is available in generated
197+
* code.
191198
*/
192199
void setFlushSeverity(Severity flushSeverity);
193200

@@ -664,8 +671,8 @@ ApiFuture<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescripto
664671
/**
665672
* Flushes any pending asynchronous logging writes. Logs are automatically flushed based on time
666673
* and message count that be configured via {@link com.google.api.gax.batching.BatchingSettings},
667-
* Logs are also flushed if at or above flush severity, see {@link #setFlushSeverity}. Logging
668-
* frameworks require support for an explicit flush. See usage in the java.util.logging
674+
* Logs are also flushed if enabled, at or above flush severity, see {@link #setFlushSeverity}.
675+
* Logging frameworks require support for an explicit flush. See usage in the java.util.logging
669676
* handler{@link LoggingHandler}.
670677
*/
671678
void flush();

‎branches/autosynth-errorreporting/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,19 @@
7575
import java.util.Map;
7676
import java.util.Set;
7777
import java.util.concurrent.ExecutionException;
78+
import java.util.concurrent.TimeUnit;
79+
import java.util.concurrent.TimeoutException;
7880

7981
class LoggingImpl extends BaseService<LoggingOptions> implements Logging {
8082

83+
private static final int FLUSH_WAIT_TIMEOUT_SECONDS = 6;
8184
private final LoggingRpc rpc;
8285
private final Object writeLock = new Object();
8386
private final Set<ApiFuture<Void>> pendingWrites =
8487
Collections.newSetFromMap(new IdentityHashMap<ApiFuture<Void>, Boolean>());
8588

8689
private volatile Synchronicity writeSynchronicity = Synchronicity.ASYNC;
87-
private volatile Severity flushSeverity = Severity.ERROR;
90+
private volatile Severity flushSeverity = null;
8891
private boolean closed;
8992

9093
private static final Function<Empty, Boolean> EMPTY_TO_BOOLEAN_FUNCTION =
@@ -553,11 +556,13 @@ public void write(Iterable<LogEntry> logEntries, WriteOption... options) {
553556

554557
try {
555558
writeLogEntries(logEntries, options);
556-
for (LogEntry logEntry : logEntries) {
557-
// flush pending writes if log severity at or above flush severity
558-
if (logEntry.getSeverity().compareTo(flushSeverity) >= 0) {
559-
flush();
560-
break;
559+
if (flushSeverity != null) {
560+
for (LogEntry logEntry : logEntries) {
561+
// flush pending writes if log severity at or above flush severity
562+
if (logEntry.getSeverity().compareTo(flushSeverity) >= 0) {
563+
flush();
564+
break;
565+
}
561566
}
562567
}
563568
} finally {
@@ -574,8 +579,8 @@ public void flush() {
574579
}
575580

576581
try {
577-
ApiFutures.allAsList(writesToFlush).get();
578-
} catch (InterruptedException | ExecutionException e) {
582+
ApiFutures.allAsList(writesToFlush).get(FLUSH_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
583+
} catch (InterruptedException | ExecutionException | TimeoutException e) {
579584
throw new RuntimeException(e);
580585
}
581586
}

‎branches/autosynth-errorreporting/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ public void testWriteAndListLogEntries() throws InterruptedException {
229229
.build();
230230
logging().write(ImmutableList.of(firstEntry));
231231
logging().write(ImmutableList.of(secondEntry));
232+
logging().flush();
232233
String filter = createEqualityFilter("logName", logName);
233234
EntryListOption[] options = {EntryListOption.filter(filter), EntryListOption.pageSize(1)};
234235
Page<LogEntry> page = logging().listLogEntries(options);

‎branches/autosynth-errorreporting/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,41 @@ public void testWriteLogEntries() {
11881188
logging.write(ImmutableList.of(LOG_ENTRY1, LOG_ENTRY2));
11891189
}
11901190

1191+
@Test
1192+
public void testWriteLogEntriesDoesnotEnableFlushByDefault() {
1193+
WriteLogEntriesRequest request =
1194+
WriteLogEntriesRequest.newBuilder()
1195+
.addAllEntries(
1196+
Iterables.transform(
1197+
ImmutableList.of(
1198+
LOG_ENTRY1, LOG_ENTRY2.toBuilder().setSeverity(Severity.EMERGENCY).build()),
1199+
LogEntry.toPbFunction(PROJECT)))
1200+
.build();
1201+
ApiFuture<WriteLogEntriesResponse> apiFuture = SettableApiFuture.create();
1202+
EasyMock.expect(loggingRpcMock.write(request)).andReturn(apiFuture);
1203+
EasyMock.replay(rpcFactoryMock, loggingRpcMock);
1204+
logging = options.getService();
1205+
logging.write(
1206+
ImmutableList.of(
1207+
LOG_ENTRY1, LOG_ENTRY2.toBuilder().setSeverity(Severity.EMERGENCY).build()));
1208+
}
1209+
1210+
@Test
1211+
public void testWriteLogEntriesWithSeverityFlushEnabled() {
1212+
WriteLogEntriesRequest request =
1213+
WriteLogEntriesRequest.newBuilder()
1214+
.addAllEntries(
1215+
Iterables.transform(
1216+
ImmutableList.of(LOG_ENTRY1, LOG_ENTRY2), LogEntry.toPbFunction(PROJECT)))
1217+
.build();
1218+
WriteLogEntriesResponse response = WriteLogEntriesResponse.newBuilder().build();
1219+
EasyMock.expect(loggingRpcMock.write(request)).andReturn(ApiFutures.immediateFuture(response));
1220+
EasyMock.replay(rpcFactoryMock, loggingRpcMock);
1221+
logging = options.getService();
1222+
logging.setFlushSeverity(Severity.DEFAULT);
1223+
logging.write(ImmutableList.of(LOG_ENTRY1, LOG_ENTRY2));
1224+
}
1225+
11911226
@Test
11921227
public void testWriteLogEntriesWithOptions() {
11931228
Map<String, String> labels = ImmutableMap.of("key", "value");

0 commit comments

Comments
 (0)