Skip to content

Fix exporter tests to have reasonable dates #38436

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
merged 5 commits into from
Feb 12, 2019
Merged

Fix exporter tests to have reasonable dates #38436

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdf5516
Fix exporter tests to have reasonable dates
spinscale Feb 5, 2019
e5c9b9b
Merge branch 'master' into 1902-fix-exporter-tests-master
spinscale Feb 5, 2019
a827460
Merge branch 'master' into 1902-fix-exporter-tests-master
spinscale Feb 6, 2019
950f079
Merge branch 'master' into 1902-fix-exporter-tests-master
spinscale Feb 8, 2019
47a6d23
Merge branch 'master' into 1902-fix-exporter-tests-master
spinscale Feb 9, 2019
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
8 changes: 5 additions & 3 deletions ...ugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@

public final class MonitoringTestUtils {

// maximum number of milliseconds before a five digit year comes in, which could change formatting
private static final long MAX_MILLIS_BEFORE_10000 = 253402300799999L;

private MonitoringTestUtils() {
}

Expand All @@ -37,7 +40,7 @@ public static MonitoringDoc.Node randomMonitoringNode(final Random random) {
final String host = fakeTransportAddress.address().getHostString();
final String transportAddress = fakeTransportAddress.toString();
final String ip = fakeTransportAddress.getAddress();
final long timestamp = RandomNumbers.randomLongBetween(random, 0, Long.MAX_VALUE);
final long timestamp = RandomNumbers.randomLongBetween(random, 0, MAX_MILLIS_BEFORE_10000);

return new MonitoringDoc.Node(id, host, transportAddress, ip, name, timestamp);
}
Expand Down Expand Up @@ -87,8 +90,7 @@ public static MonitoringBulkDoc randomMonitoringBulkDoc(final Random random,
final MonitoredSystem system,
final String type) throws IOException {
final String id = random.nextBoolean() ? RandomStrings.randomAsciiLettersOfLength(random, 5) : null;
// ending date is the last second of 9999, should be sufficient
final long timestamp = RandomNumbers.randomLongBetween(random, 0L, 253402300799000L);
final long timestamp = RandomNumbers.randomLongBetween(random, 0L, MAX_MILLIS_BEFORE_10000);
final long interval = RandomNumbers.randomLongBetween(random, 0L, Long.MAX_VALUE);
return new MonitoringBulkDoc(system, type, id, timestamp, interval, source, xContentType);
}
Expand Down