Closes inspectIT#750 - Fixed unstable TraceID-Injector tests

JonasKunz · Jun 5, 2020 · 6f7e9c5 · 6f7e9c5
1 parent 0b92f77
commit 6f7e9c5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...rocks/inspectit/ocelot/instrumentation/special/logging/Log4J2TraceIdAutoInjectorTest.java b/...rocks/inspectit/ocelot/instrumentation/special/logging/Log4J2TraceIdAutoInjectorTest.java
@@ -4,16 +4,26 @@
 import io.opencensus.trace.Tracing;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.message.AbstractMessageFactory;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import rocks.inspectit.ocelot.instrumentation.InstrumentationSysTestBase;
 import rocks.inspectit.ocelot.logging.Log4J2LoggingRecorder;
+import rocks.inspectit.ocelot.utils.TestUtils;
+
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class Log4J2TraceIdAutoInjectorTest extends InstrumentationSysTestBase {
 
     private static final Logger LOGGER = LogManager.getLogger(Log4J2TraceIdAutoInjectorTest.class);
 
+    @BeforeAll
+    public static void waitForInstrumentation() {
+        TestUtils.waitForClassInstrumentation(AbstractMessageFactory.class, 15, TimeUnit.SECONDS);
+    }
+
     @Test
     public void logStringAndTraceExists() {
         Log4J2LoggingRecorder.loggingEvents.clear();

diff --git a/.../rocks/inspectit/ocelot/instrumentation/special/logging/Log4JTraceIdAutoInjectorTest.java b/.../rocks/inspectit/ocelot/instrumentation/special/logging/Log4JTraceIdAutoInjectorTest.java
@@ -2,18 +2,28 @@
 
 import io.opencensus.common.Scope;
 import io.opencensus.trace.Tracing;
+import org.apache.log4j.Category;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import rocks.inspectit.ocelot.instrumentation.InstrumentationSysTestBase;
 import rocks.inspectit.ocelot.logging.Log4JLoggingRecorder;
+import rocks.inspectit.ocelot.utils.TestUtils;
+
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class Log4JTraceIdAutoInjectorTest extends InstrumentationSysTestBase {
 
     private static final Logger LOGGER = Logger.getLogger(Log4JTraceIdAutoInjectorTest.class.getName());
 
+    @BeforeAll
+    public static void waitForInstrumentation() {
+        TestUtils.waitForClassInstrumentation(Category.class, 15, TimeUnit.SECONDS);
+    }
+
     @Test
     public void traceExists() {
         Log4JLoggingRecorder.loggingEvents.clear();