update

Author: trask

instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java

@@ -9,10 +9,14 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.ContextBase;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.resources.Resource;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -32,7 +36,7 @@ static void setupAll() {
     resource = Resource.getDefault();
     instrumentationScopeInfo = InstrumentationScopeInfo.create("TestLogger");
     // by default LoggerContext contains HOSTNAME property we clear it to start with empty context
-    AbstractLogbackTest.resetLoggerContext();
+    AbstractOpenTelemetryAppenderTest.resetLoggerContext();
   }
 
   protected abstract InstrumentationExtension getTesting();
@@ -45,7 +49,7 @@ void logLoggerContext() {
       logger.info("log message 1");
       executeAfterLogsExecution();
     } finally {
-      AbstractLogbackTest.resetLoggerContext();
+      AbstractOpenTelemetryAppenderTest.resetLoggerContext();
     }
 
     getTesting()
@@ -59,4 +63,25 @@ void logLoggerContext() {
                     .hasAttributesSatisfying(
                         equalTo(AttributeKey.stringKey("test-property"), "test-value")));
   }
+
+  static void resetLoggerContext() {
+    try {
+      LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+      Field field = ContextBase.class.getDeclaredField("propertyMap");
+      field.setAccessible(true);
+      Map<?, ?> map = (Map<?, ?>) field.get(loggerContext);
+      map.clear();
+
+      Method method;
+      try {
+        method = LoggerContext.class.getDeclaredMethod("syncRemoteView");
+      } catch (NoSuchMethodException noSuchMethodException) {
+        method = LoggerContext.class.getDeclaredMethod("updateLoggerContextVO");
+      }
+      method.setAccessible(true);
+      method.invoke(loggerContext);
+    } catch (Exception exception) {
+      throw new IllegalStateException("Failed to reset logger context", exception);
+    }
+  }
 }

instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogReplayOpenTelemetryAppenderTest.java

@@ -52,7 +52,7 @@ private static void reloadLoggerConfiguration() throws Exception {
       URL url = LogReplayOpenTelemetryAppenderTest.class.getResource("/logback-test.xml");
       ContextInitializer.class.getMethod("configureByResource", URL.class).invoke(ci, url);
       // by default LoggerContext contains HOSTNAME property we clear it to start with empty context
-      AbstractLogbackTest.resetLoggerContext();
+      AbstractOpenTelemetryAppenderTest.resetLoggerContext();
     }
   }
 

instrumentation/logback/logback-appender-1.0/testing/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractLogbackTest.java

@@ -14,20 +14,15 @@
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.ContextBase;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -66,15 +61,13 @@ protected boolean expectEventName() {
   @BeforeEach
   void setUp() {
     testing().clearData();
-    resetLoggerContext();
     beforeEachTest();
   }
 
   @AfterEach
   void tearDown() {
     afterEachTest();
     testing().clearData();
-    resetLoggerContext();
   }
 
   private static Stream<Arguments> parameters() {
@@ -276,27 +269,6 @@ private static void performLogging(
     }
   }
 
-  protected static void resetLoggerContext() {
-    try {
-      LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-      Field field = ContextBase.class.getDeclaredField("propertyMap");
-      field.setAccessible(true);
-      Map<?, ?> map = (Map<?, ?>) field.get(loggerContext);
-      map.clear();
-
-      Method method;
-      try {
-        method = LoggerContext.class.getDeclaredMethod("syncRemoteView");
-      } catch (NoSuchMethodException exception) {
-        method = LoggerContext.class.getDeclaredMethod("updateLoggerContextVO");
-      }
-      method.setAccessible(true);
-      method.invoke(loggerContext);
-    } catch (Exception exception) {
-      throw new IllegalStateException("Failed to reset logger context", exception);
-    }
-  }
-
   @FunctionalInterface
   public interface OneArgLoggerMethod {
     void call(Logger logger, String msg, Object arg);