Skip to content

Commit 9ec6401

Browse files
authored
Fix log replay of the Log4j 2 appender (#10243)
1 parent dbb8ab1 commit 9ec6401

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java

-3
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ public B setOpenTelemetry(OpenTelemetry openTelemetry) {
157157
@Override
158158
public OpenTelemetryAppender build() {
159159
OpenTelemetry openTelemetry = this.openTelemetry;
160-
if (openTelemetry == null) {
161-
openTelemetry = OpenTelemetry.noop();
162-
}
163160
return new OpenTelemetryAppender(
164161
getName(),
165162
getLayout(),

instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.util.List;
1515
import org.apache.logging.log4j.message.StringMapMessage;
1616
import org.apache.logging.log4j.message.StructuredDataMessage;
17+
import org.junit.jupiter.api.AfterEach;
1718
import org.junit.jupiter.api.BeforeEach;
1819
import org.junit.jupiter.api.Test;
1920

@@ -22,6 +23,10 @@ class LogReplayOpenTelemetryAppenderTest extends AbstractOpenTelemetryAppenderTe
2223
@BeforeEach
2324
void setup() {
2425
generalBeforeEachSetup();
26+
}
27+
28+
@AfterEach
29+
void resetOpenTelemetry() {
2530
OpenTelemetryAppender.install(null);
2631
}
2732

0 commit comments

Comments
 (0)