Fix log replay of the Log4j 2 appender

open-telemetry · Jan 15, 2024 · 388af96 · 388af96
1 parent e4445ab
commit 388af96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ain/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java b/...ain/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java
@@ -157,9 +157,6 @@ public B setOpenTelemetry(OpenTelemetry openTelemetry) {
     @Override
     public OpenTelemetryAppender build() {
       OpenTelemetry openTelemetry = this.openTelemetry;
-      if (openTelemetry == null) {
-        openTelemetry = OpenTelemetry.noop();
-      }
       return new OpenTelemetryAppender(
           getName(),
           getLayout(),

diff --git a/...pentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java b/...pentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import org.apache.logging.log4j.message.StringMapMessage;
 import org.apache.logging.log4j.message.StructuredDataMessage;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -22,6 +23,10 @@ class LogReplayOpenTelemetryAppenderTest extends AbstractOpenTelemetryAppenderTe
   @BeforeEach
   void setup() {
     generalBeforeEachSetup();
+  }
+
+  @AfterEach
+  void resetOpenTelemetry() {
     OpenTelemetryAppender.install(null);
   }