Skip to content

chore(fix): improve exec time of flaky test #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minherz merged 2 commits into from
Sep 15, 2021
Merged

chore(fix): improve exec time of flaky test #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7faafbe
chore(fix): imrpove exec time of flaky test
minherz Sep 15, 2021
e6bc4bd
chore: apply lint
minherz Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions samples/snippets/src/main/java/com/example/logging/ListLogEntries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;


public class ListLogEntries {

public static void main(String[] args) throws Exception {
Expand All @@ -39,13 +38,20 @@ public static void main(String[] args) throws Exception {

// When composing a filter, using indexed fields, such as timestamp, resource.type, logName and
// others can help accelerate the results
// Full list of indexed fields here: https://cloud.google.com/logging/docs/view/advanced-queries#finding-quickly
// Full list of indexed fields here:
// https://cloud.google.com/logging/docs/view/advanced-queries#finding-quickly
// This sample restrict the results to only last hour to minimize number of API calls
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.HOUR, -1);
DateFormat rfc3339 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
String logFilter = "logName=projects/" + options.getProjectId() + "/logs/" + logName
+ " AND timestamp>=\"" + rfc3339.format(calendar.getTime()) + "\"";
String logFilter =
"logName=projects/"
+ options.getProjectId()
+ "/logs/"
+ logName
+ " AND timestamp>=\""
+ rfc3339.format(calendar.getTime())
+ "\"";

// List all log entries
Page<LogEntry> entries = logging.listLogEntries(EntryListOption.filter(logFilter));
Expand Down
7 changes: 5 additions & 2 deletions samples/snippets/src/test/java/com/example/logging/LoggingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.example.logging;

import static com.google.cloud.logging.testing.RemoteLoggingHelper.formatForTest;
import static com.google.common.truth.Truth.assertThat;

import com.google.cloud.MonitoredResource;
Expand All @@ -24,6 +25,7 @@
import com.google.cloud.logging.Logging;
import com.google.cloud.logging.LoggingOptions;
import com.google.cloud.logging.Payload.StringPayload;
import com.google.cloud.logging.Synchronicity;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.Collections;
Expand All @@ -38,7 +40,7 @@
@SuppressWarnings("checkstyle:abbreviationaswordinname")
public class LoggingIT {

private static final String TEST_LOG = "test-log";
private static final String TEST_LOG = formatForTest("test-log");
private static final String GOOGLEAPIS_AUDIT_LOGNAME = "cloudaudit.googleapis.com%2Factivity";
private static final String STRING_PAYLOAD = "Hello, world!";
private static final String STRING_PAYLOAD2 = "Hello world again";
Expand Down Expand Up @@ -74,13 +76,14 @@ public void testQuickstart() throws Exception {
}

@Test(timeout = 60000)
public void testWriteAndListLogs() throws Exception {
public void testListLogEntries() throws Exception {
// write a log entry
LogEntry entry =
LogEntry.newBuilder(StringPayload.of(STRING_PAYLOAD2))
.setLogName(TEST_LOG)
.setResource(MonitoredResource.newBuilder("global").build())
.build();
logging.setWriteSynchronicity(Synchronicity.SYNC);
logging.write(Collections.singleton(entry));
// flush out log immediately
logging.flush();
Expand Down