Just set log level to debug

Author: benchaplin

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/SearchErrorTraceIT.java

@@ -12,7 +12,6 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.nio.entity.NByteArrayEntity;
 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.elasticsearch.action.search.MultiSearchRequest;
 import org.elasticsearch.action.search.SearchRequest;
@@ -27,7 +26,6 @@
 import org.elasticsearch.test.MockLog;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.xcontent.XContentType;
-import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
@@ -41,23 +39,14 @@
 public class SearchErrorTraceIT extends HttpSmokeTestCase {
     private BooleanSupplier hasStackTrace;
 
-    private static final String loggerName = "org.elasticsearch.search.SearchService";
-    private static Level originalLogLevel;
-
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
         return CollectionUtils.appendToCopyNoNullElements(super.nodePlugins(), MockTransportService.TestPlugin.class);
     }
 
     @BeforeClass
     public static void setDebugLogLevel() {
-        originalLogLevel = LogManager.getLogger(loggerName).getLevel();
-        Configurator.setLevel(loggerName, Level.DEBUG);
-    }
-
-    @AfterClass
-    public static void resetLogLevel() {
-        Configurator.setLevel(loggerName, originalLogLevel);
+        Configurator.setLevel("org.elasticsearch.search.SearchService", Level.DEBUG);
     }
 
     @Before

server/src/test/java/org/elasticsearch/search/SearchServiceTests.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.search;
 
 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.IndexSearcher;
@@ -183,10 +182,8 @@ public void testMaybeWrapListenerForStackTraceLogs() {
             null
         );
 
-        final String loggerName = "org.elasticsearch.search.SearchService";
-        Level originalLogLevel = LogManager.getLogger(loggerName).getLevel();
         try (var mockLog = MockLog.capture(SearchService.class)) {
-            Configurator.setLevel(loggerName, Level.DEBUG);
+            Configurator.setLevel("org.elasticsearch.search.SearchService", Level.DEBUG);
             final String exceptionMessage = "test exception message";
             mockLog.addExpectation(
                 new MockLog.PatternAndExceptionSeenEventExpectation(
@@ -214,8 +211,6 @@ public void onFailure(Exception e) {
             Exception e = new Exception(exceptionMessage);
             listener = maybeWrapListenerForStackTrace(listener, shardRequest, threadPool, createClusterService(threadPool));
             listener.onFailure(e);
-        } finally {
-            Configurator.setLevel(loggerName, originalLogLevel);
         }
     }
 

x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchErrorTraceIT.java

@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.search;
 
 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
@@ -24,7 +23,6 @@
 import org.elasticsearch.test.MockLog;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.xcontent.XContentType;
-import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
@@ -36,9 +34,6 @@
 public class AsyncSearchErrorTraceIT extends ESIntegTestCase {
     private BooleanSupplier transportMessageHasStackTrace;
 
-    private static final String loggerName = "org.elasticsearch.search.SearchService";
-    private static Level originalLogLevel;
-
     @Override
     protected boolean addMockHttpTransport() {
         return false; // enable http
@@ -52,13 +47,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
 
     @BeforeClass
     public static void setDebugLogLevel() {
-        originalLogLevel = LogManager.getLogger(loggerName).getLevel();
-        Configurator.setLevel(loggerName, Level.DEBUG);
-    }
-
-    @AfterClass
-    public static void resetLogLevel() {
-        Configurator.setLevel(loggerName, originalLogLevel);
+        Configurator.setLevel("org.elasticsearch.search.SearchService", Level.DEBUG);
     }
 
     @Before