open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix log replay of the Log4j 2 appender (#10243)

This commit is contained in:
Jean Bisutti 2024-01-17 18:55:47 +01:00 committed by GitHub
parent dbb8ab1366
commit 9ec6401fae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,9 +157,6 @@ public class OpenTelemetryAppender extends AbstractAppender {
@Override @Override
public OpenTelemetryAppender build() { public OpenTelemetryAppender build() {
OpenTelemetry openTelemetry = this.openTelemetry; OpenTelemetry openTelemetry = this.openTelemetry;
if (openTelemetry == null) {
openTelemetry = OpenTelemetry.noop();
}
return new OpenTelemetryAppender( return new OpenTelemetryAppender(
getName(), getName(),
getLayout(), getLayout(),

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

@ -14,6 +14,7 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
import java.util.List; import java.util.List;
import org.apache.logging.log4j.message.StringMapMessage; import org.apache.logging.log4j.message.StringMapMessage;
import org.apache.logging.log4j.message.StructuredDataMessage; import org.apache.logging.log4j.message.StructuredDataMessage;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -22,6 +23,10 @@ class LogReplayOpenTelemetryAppenderTest extends AbstractOpenTelemetryAppenderTe
@BeforeEach @BeforeEach
void setup() { void setup() {
generalBeforeEachSetup(); generalBeforeEachSetup();
}
@AfterEach
void resetOpenTelemetry() {
OpenTelemetryAppender.install(null); OpenTelemetryAppender.install(null);
} }