diff --git a/src/main/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancer.java b/src/main/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancer.java index e9cd8c5b8..aad688f9c 100644 --- a/src/main/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancer.java +++ b/src/main/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancer.java @@ -35,6 +35,10 @@ public static void setCurrentTraceId(String id) { MDC.put(TRACE_ID, id); } + /** Clearing a trace Id from the MDC */ + public static void clearTraceId() { + MDC.remove(TRACE_ID); + } /** * Get the Trace ID associated with any logging done by the current thread. * diff --git a/src/test/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancerTest.java b/src/test/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancerTest.java index 4de358073..e06d3b361 100644 --- a/src/test/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancerTest.java +++ b/src/test/java/com/google/cloud/logging/logback/TraceLoggingEventEnhancerTest.java @@ -21,6 +21,7 @@ import ch.qos.logback.classic.spi.LoggingEvent; import com.google.cloud.logging.LogEntry; import com.google.cloud.logging.Payload.StringPayload; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -32,6 +33,11 @@ public void setUp() { classUnderTest = new TraceLoggingEventEnhancer(); } + @After + public void tearDown() { + TraceLoggingEventEnhancer.clearTraceId(); + } + @Test public void testEnhanceLogEntry() { // setup