From 1d5b03d3b538d1d5e20d81e742f54129ab129d10 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sat, 18 Dec 2021 00:04:34 +0200 Subject: [PATCH] Fix flaky log4j test (#4931) * Fix flaky log4j test * Update instrumentation/log4j/log4j-2.16/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryAppenderConfigTest.java Co-authored-by: Mateusz Rzeszutek Co-authored-by: Mateusz Rzeszutek --- .../log4j/v2_16/OpenTelemetryAppenderConfigTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instrumentation/log4j/log4j-2.16/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryAppenderConfigTest.java b/instrumentation/log4j/log4j-2.16/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryAppenderConfigTest.java index 15539cd21e..022b3fa93b 100644 --- a/instrumentation/log4j/log4j-2.16/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryAppenderConfigTest.java +++ b/instrumentation/log4j/log4j-2.16/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryAppenderConfigTest.java @@ -104,6 +104,7 @@ class OpenTelemetryAppenderConfigTest { @Test void logWithExtras() { + Instant start = Instant.now(); logger.info("log message 1", new IllegalStateException("Error!")); List logDataList = logExporter.getFinishedLogItems(); @@ -113,7 +114,8 @@ class OpenTelemetryAppenderConfigTest { assertThat(logData.getInstrumentationLibraryInfo()).isEqualTo(instrumentationLibraryInfo); assertThat(logData.getBody().asString()).isEqualTo("log message 1"); assertThat(logData.getEpochNanos()) - .isGreaterThan(TimeUnit.MILLISECONDS.toNanos(Instant.now().toEpochMilli() - 1000)); + .isGreaterThan(TimeUnit.MILLISECONDS.toNanos(start.toEpochMilli())) + .isLessThan(TimeUnit.MILLISECONDS.toNanos(Instant.now().toEpochMilli())); assertThat(logData.getSeverity()).isEqualTo(Severity.INFO); assertThat(logData.getSeverityText()).isEqualTo("INFO"); assertThat(logData.getAttributes()).isEqualTo(Attributes.of(ATTR_THROWABLE_MESSAGE, "Error!"));