diff

Author: trask

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

@@ -36,7 +36,28 @@ static void setupAll() {
     resource = Resource.getDefault();
     instrumentationScopeInfo = InstrumentationScopeInfo.create("TestLogger");
     // by default LoggerContext contains HOSTNAME property we clear it to start with empty context
-    AbstractOpenTelemetryAppenderTest.resetLoggerContext();
+    resetLoggerContext();
+  }
+
+  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);
+    }
   }
 
   protected abstract InstrumentationExtension getTesting();
@@ -49,7 +70,7 @@ void logLoggerContext() {
       logger.info("log message 1");
       executeAfterLogsExecution();
     } finally {
-      AbstractOpenTelemetryAppenderTest.resetLoggerContext();
+      resetLoggerContext();
     }
 
     getTesting()
@@ -63,25 +84,4 @@ 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);
-    }
-  }
 }