From ddce9704d4cbd077b59a24b5608f8a1a1d84ee82 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 26 Sep 2018 11:20:52 -0400 Subject: [PATCH] Logging: Drop two deprecated methods (#34055) This drops two deprecated methods from `ESLoggerFactory`, switching all calls to those methods to calls to methods of the same name on `LogManager`. --- .../benchmark/ops/bulk/BulkBenchmarkTask.java | 4 +-- .../discovery/ec2/AmazonEC2Mock.java | 4 +-- .../gce/RetryHttpInitializerWrapper.java | 11 ++++--- .../logging/EvilLoggerConfigurationTests.java | 16 +++++----- .../common/logging/EvilLoggerTests.java | 12 ++++---- .../smoketest/ESSmokeClientTestCase.java | 4 +-- .../elasticsearch/bootstrap/Bootstrap.java | 4 +-- .../common/geo/builders/ShapeBuilder.java | 4 +-- .../common/logging/ESLoggerFactory.java | 19 ------------ .../common/logging/LogConfigurator.java | 4 +-- .../elasticsearch/common/logging/Loggers.java | 2 +- .../common/settings/ClusterSettings.java | 8 ++--- ...AckClusterStatePublishResponseHandler.java | 4 +-- .../elasticsearch/rest/BytesRestResponse.java | 4 +-- .../bootstrap/MaxMapCountCheckTests.java | 6 ++-- .../cluster/settings/ClusterSettingsIT.java | 12 ++++---- .../common/settings/ScopedSettingsTests.java | 30 +++++++++---------- .../elasticsearch/index/codec/CodecTests.java | 4 +-- .../search/fetch/FetchSubPhasePluginIT.java | 5 ++-- .../elasticsearch/search/geo/GeoFilterIT.java | 5 ++-- .../elasticsearch/test/CorruptionUtils.java | 4 +-- .../test/junit/listeners/LoggingListener.java | 4 +-- .../test/test/LoggingListenerTests.java | 8 ++--- .../audit/logfile/CapturingLogger.java | 3 +- .../xpack/security/MigrateToolTestCase.java | 4 +-- .../ldap/AbstractAdLdapRealmTestCase.java | 7 +++-- .../authc/ldap/MultipleAdRealmIT.java | 8 ++--- .../ml/client/ESXPackSmokeClientTestCase.java | 5 ++-- 28 files changed, 91 insertions(+), 114 deletions(-) diff --git a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java index e9cde26e6c870..80d862acd07c8 100644 --- a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java +++ b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java @@ -19,13 +19,13 @@ package org.elasticsearch.client.benchmark.ops.bulk; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.client.benchmark.BenchmarkTask; import org.elasticsearch.client.benchmark.metrics.Sample; import org.elasticsearch.client.benchmark.metrics.SampleRecorder; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.common.logging.ESLoggerFactory; import java.io.BufferedReader; import java.io.IOException; @@ -135,7 +135,7 @@ private void sendBulk(List bulkData) throws InterruptedException { private static final class BulkIndexer implements Runnable { - private static final Logger logger = ESLoggerFactory.getLogger(BulkIndexer.class.getName()); + private static final Logger logger = LogManager.getLogger(BulkIndexer.class); private final BlockingQueue> bulkData; private final int warmupIterations; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AmazonEC2Mock.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AmazonEC2Mock.java index aa08447fd208b..8a8477b2294a5 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AmazonEC2Mock.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AmazonEC2Mock.java @@ -509,7 +509,7 @@ import com.amazonaws.services.ec2.model.UpdateSecurityGroupRuleDescriptionsIngressResult; import com.amazonaws.services.ec2.waiters.AmazonEC2Waiters; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.logging.ESLoggerFactory; +import org.apache.logging.log4j.LogManager; import java.util.ArrayList; import java.util.Collection; @@ -521,7 +521,7 @@ public class AmazonEC2Mock implements AmazonEC2 { - private static final Logger logger = ESLoggerFactory.getLogger(AmazonEC2Mock.class.getName()); + private static final Logger logger = LogManager.getLogger(AmazonEC2Mock.class); public static final String PREFIX_PRIVATE_IP = "10.0.0."; public static final String PREFIX_PUBLIC_IP = "8.8.8."; diff --git a/plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/RetryHttpInitializerWrapper.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/RetryHttpInitializerWrapper.java index dc7f8bf8596af..cc9ae0c8daf15 100644 --- a/plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/RetryHttpInitializerWrapper.java +++ b/plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/RetryHttpInitializerWrapper.java @@ -19,6 +19,8 @@ package org.elasticsearch.discovery.gce; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.googleapis.testing.auth.oauth2.MockGoogleCredential; import com.google.api.client.http.HttpBackOffIOExceptionHandler; @@ -29,19 +31,14 @@ import com.google.api.client.http.HttpUnsuccessfulResponseHandler; import com.google.api.client.util.ExponentialBackOff; import com.google.api.client.util.Sleeper; -import org.apache.logging.log4j.Logger; import org.elasticsearch.cloud.gce.util.Access; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.unit.TimeValue; import java.io.IOException; import java.util.Objects; public class RetryHttpInitializerWrapper implements HttpRequestInitializer { - - private TimeValue maxWait; - - private static final Logger logger = ESLoggerFactory.getLogger(RetryHttpInitializerWrapper.class.getName()); + private static final Logger logger = LogManager.getLogger(RetryHttpInitializerWrapper.class); // Intercepts the request for filling in the "Authorization" // header field, as well as recovering from certain unsuccessful @@ -52,6 +49,8 @@ public class RetryHttpInitializerWrapper implements HttpRequestInitializer { // A sleeper; you can replace it with a mock in your test. private final Sleeper sleeper; + private TimeValue maxWait; + public RetryHttpInitializerWrapper(Credential wrappedCredential) { this(wrappedCredential, Sleeper.DEFAULT, TimeValue.timeValueMillis(ExponentialBackOff.DEFAULT_MAX_ELAPSED_TIME_MILLIS)); } diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java index f53c9d3b1f5e7..53e55faecf912 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java @@ -58,7 +58,7 @@ public void tearDown() throws Exception { } public void testResolveMultipleConfigs() throws Exception { - final Level level = ESLoggerFactory.getLogger("test").getLevel(); + final Level level = LogManager.getLogger("test").getLevel(); try { final Path configDir = getDataPath("config"); final Settings settings = Settings.builder() @@ -106,7 +106,7 @@ public void testDefaults() throws IOException, UserException { LogConfigurator.configure(environment); final String loggerName = "test"; - final Logger logger = ESLoggerFactory.getLogger(loggerName); + final Logger logger = LogManager.getLogger(loggerName); assertThat(logger.getLevel().toString(), equalTo(level)); } @@ -122,7 +122,7 @@ public void testResolveOrder() throws Exception { // args should overwrite whatever is in the config final String loggerName = "test_resolve_order"; - final Logger logger = ESLoggerFactory.getLogger(loggerName); + final Logger logger = LogManager.getLogger(loggerName); assertTrue(logger.isTraceEnabled()); } @@ -134,14 +134,14 @@ public void testHierarchy() throws Exception { final Environment environment = new Environment(settings, configDir); LogConfigurator.configure(environment); - assertThat(ESLoggerFactory.getLogger("x").getLevel(), equalTo(Level.TRACE)); - assertThat(ESLoggerFactory.getLogger("x.y").getLevel(), equalTo(Level.DEBUG)); + assertThat(LogManager.getLogger("x").getLevel(), equalTo(Level.TRACE)); + assertThat(LogManager.getLogger("x.y").getLevel(), equalTo(Level.DEBUG)); final Level level = randomFrom(Level.TRACE, Level.DEBUG, Level.INFO, Level.WARN, Level.ERROR); - Loggers.setLevel(ESLoggerFactory.getLogger("x"), level); + Loggers.setLevel(LogManager.getLogger("x"), level); - assertThat(ESLoggerFactory.getLogger("x").getLevel(), equalTo(level)); - assertThat(ESLoggerFactory.getLogger("x.y").getLevel(), equalTo(level)); + assertThat(LogManager.getLogger("x").getLevel(), equalTo(level)); + assertThat(LogManager.getLogger("x.y").getLevel(), equalTo(level)); } public void testMissingConfigFile() { diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java index 5013148fb7428..bebdb320db4a1 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java @@ -82,7 +82,7 @@ public void tearDown() throws Exception { public void testLocationInfoTest() throws IOException, UserException { setupLogging("location_info"); - final Logger testLogger = ESLoggerFactory.getLogger("test"); + final Logger testLogger = LogManager.getLogger("test"); testLogger.error("This is an error message"); testLogger.warn("This is a warning message"); @@ -108,7 +108,7 @@ public void testLocationInfoTest() throws IOException, UserException { public void testDeprecationLogger() throws IOException, UserException { setupLogging("deprecation"); - final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation")); + final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation")); final int deprecatedIterations = randomIntBetween(0, 256); for (int i = 0; i < deprecatedIterations; i++) { @@ -135,7 +135,7 @@ public void testDeprecationLogger() throws IOException, UserException { public void testConcurrentDeprecationLogger() throws IOException, UserException, BrokenBarrierException, InterruptedException { setupLogging("deprecation"); - final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation")); + final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation")); final int numberOfThreads = randomIntBetween(2, 4); final CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads); @@ -214,7 +214,7 @@ public void testConcurrentDeprecationLogger() throws IOException, UserException, public void testDeprecationLoggerMaybeLog() throws IOException, UserException { setupLogging("deprecation"); - final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation")); + final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation")); final int iterations = randomIntBetween(1, 16); @@ -286,12 +286,12 @@ public void testDeprecatedSettings() throws IOException, UserException { public void testFindAppender() throws IOException, UserException { setupLogging("find_appender"); - final Logger hasConsoleAppender = ESLoggerFactory.getLogger("has_console_appender"); + final Logger hasConsoleAppender = LogManager.getLogger("has_console_appender"); final Appender testLoggerConsoleAppender = Loggers.findAppender(hasConsoleAppender, ConsoleAppender.class); assertNotNull(testLoggerConsoleAppender); assertThat(testLoggerConsoleAppender.getName(), equalTo("console")); - final Logger hasCountingNoOpAppender = ESLoggerFactory.getLogger("has_counting_no_op_appender"); + final Logger hasCountingNoOpAppender = LogManager.getLogger("has_counting_no_op_appender"); assertNull(Loggers.findAppender(hasCountingNoOpAppender, ConsoleAppender.class)); final Appender countingNoOpAppender = Loggers.findAppender(hasCountingNoOpAppender, CountingNoOpAppender.class); assertThat(countingNoOpAppender.getName(), equalTo("counting_no_op")); diff --git a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java index 8f32271948763..676608f3be8b8 100644 --- a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java +++ b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java @@ -20,11 +20,11 @@ package org.elasticsearch.smoketest; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.TransportClient; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; @@ -69,7 +69,7 @@ public abstract class ESSmokeClientTestCase extends LuceneTestCase { */ public static final String TESTS_CLUSTER = "tests.cluster"; - protected static final Logger logger = ESLoggerFactory.getLogger(ESSmokeClientTestCase.class.getName()); + protected static final Logger logger = LogManager.getLogger(ESSmokeClientTestCase.class); private static final AtomicInteger counter = new AtomicInteger(); private static Client client; diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java index 475e9b94c68ae..3395d95141528 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java @@ -307,7 +307,7 @@ static void init( final boolean closeStandardStreams = (foreground == false) || quiet; try { if (closeStandardStreams) { - final Logger rootLogger = ESLoggerFactory.getRootLogger(); + final Logger rootLogger = LogManager.getRootLogger(); final Appender maybeConsoleAppender = Loggers.findAppender(rootLogger, ConsoleAppender.class); if (maybeConsoleAppender != null) { Loggers.removeAppender(rootLogger, maybeConsoleAppender); @@ -339,7 +339,7 @@ static void init( } } catch (NodeValidationException | RuntimeException e) { // disable console logging, so user does not see the exception twice (jvm will show it already) - final Logger rootLogger = ESLoggerFactory.getRootLogger(); + final Logger rootLogger = LogManager.getRootLogger(); final Appender maybeConsoleAppender = Loggers.findAppender(rootLogger, ConsoleAppender.class); if (foreground && maybeConsoleAppender != null) { Loggers.removeAppender(rootLogger, maybeConsoleAppender); diff --git a/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java index fbb2fd19f0e6d..e90d7261c9988 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java +++ b/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java @@ -24,6 +24,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.Assertions; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; @@ -32,7 +33,6 @@ import org.elasticsearch.common.io.stream.NamedWriteable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.locationtech.spatial4j.context.jts.JtsSpatialContext; @@ -54,7 +54,7 @@ */ public abstract class ShapeBuilder> implements NamedWriteable, ToXContentObject { - protected static final Logger LOGGER = ESLoggerFactory.getLogger(ShapeBuilder.class.getName()); + protected static final Logger LOGGER = LogManager.getLogger(ShapeBuilder.class); private static final boolean DEBUG; static { diff --git a/server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java b/server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java index 2159014f8258f..6388853d00b85 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java +++ b/server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java @@ -70,23 +70,4 @@ public static Logger getLogger(String prefix, Logger logger) { public static Logger getLogger(Class clazz) { return getLogger(null, clazz); } - - /** - * Get or build a logger. - * @deprecated Prefer {@link LogManager#getLogger} - */ - @Deprecated - public static Logger getLogger(String name) { - return getLogger(null, name); - } - - /** - * Get the root logger. - * @deprecated Prefer {@link LogManager#getRootLogger} - */ - @Deprecated - public static Logger getRootLogger() { - return LogManager.getRootLogger(); - } - } diff --git a/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java b/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java index 89c9ce229d6a7..6f8358e113d40 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java +++ b/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java @@ -258,13 +258,13 @@ private static void configureStatusLogger() { private static void configureLoggerLevels(final Settings settings) { if (Loggers.LOG_DEFAULT_LEVEL_SETTING.exists(settings)) { final Level level = Loggers.LOG_DEFAULT_LEVEL_SETTING.get(settings); - Loggers.setLevel(ESLoggerFactory.getRootLogger(), level); + Loggers.setLevel(LogManager.getRootLogger(), level); } Loggers.LOG_LEVEL_SETTING.getAllConcreteSettings(settings) // do not set a log level for a logger named level (from the default log setting) .filter(s -> s.getKey().equals(Loggers.LOG_DEFAULT_LEVEL_SETTING.getKey()) == false).forEach(s -> { final Level level = s.get(settings); - Loggers.setLevel(ESLoggerFactory.getLogger(s.getKey().substring("logger.".length())), level); + Loggers.setLevel(LogManager.getLogger(s.getKey().substring("logger.".length())), level); }); } diff --git a/server/src/main/java/org/elasticsearch/common/logging/Loggers.java b/server/src/main/java/org/elasticsearch/common/logging/Loggers.java index 70681ed40e223..a772867c084fe 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/Loggers.java +++ b/server/src/main/java/org/elasticsearch/common/logging/Loggers.java @@ -93,7 +93,7 @@ public static Logger getLogger(Logger parentLogger, String s) { */ @Deprecated public static Logger getLogger(String s) { - return ESLoggerFactory.getLogger(s); + return LogManager.getLogger(s); } /** diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java index 7e90aa3f44206..4b4ebb7414acb 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java @@ -18,6 +18,7 @@ */ package org.elasticsearch.common.settings; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.action.admin.indices.close.TransportCloseIndexAction; import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.support.AutoCreateIndex; @@ -44,7 +45,6 @@ import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.elasticsearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.network.NetworkService; @@ -158,12 +158,12 @@ public void apply(Settings value, Settings current, Settings previous) { if ("_root".equals(component)) { final String rootLevel = value.get(key); if (rootLevel == null) { - Loggers.setLevel(ESLoggerFactory.getRootLogger(), Loggers.LOG_DEFAULT_LEVEL_SETTING.get(settings)); + Loggers.setLevel(LogManager.getRootLogger(), Loggers.LOG_DEFAULT_LEVEL_SETTING.get(settings)); } else { - Loggers.setLevel(ESLoggerFactory.getRootLogger(), rootLevel); + Loggers.setLevel(LogManager.getRootLogger(), rootLevel); } } else { - Loggers.setLevel(ESLoggerFactory.getLogger(component), value.get(key)); + Loggers.setLevel(LogManager.getLogger(component), value.get(key)); } } } diff --git a/server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java b/server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java index fd47fd0e86d51..d3ca7a222e0c6 100644 --- a/server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java +++ b/server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java @@ -19,9 +19,9 @@ package org.elasticsearch.discovery; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.logging.ESLoggerFactory; import java.util.Set; @@ -32,7 +32,7 @@ */ public class AckClusterStatePublishResponseHandler extends BlockingClusterStatePublishResponseHandler { - private static final Logger logger = ESLoggerFactory.getLogger(AckClusterStatePublishResponseHandler.class.getName()); + private static final Logger logger = LogManager.getLogger(AckClusterStatePublishResponseHandler.class); private final Discovery.AckListener ackListener; diff --git a/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java index f8575b4a0127e..d6ed68bcafa35 100644 --- a/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java +++ b/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java @@ -20,6 +20,7 @@ package org.elasticsearch.rest; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.elasticsearch.ElasticsearchException; @@ -27,7 +28,6 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -117,7 +117,7 @@ public RestStatus status() { return this.status; } - private static final Logger SUPPRESSED_ERROR_LOGGER = ESLoggerFactory.getLogger("rest.suppressed"); + private static final Logger SUPPRESSED_ERROR_LOGGER = LogManager.getLogger("rest.suppressed"); private static XContentBuilder build(RestChannel channel, RestStatus status, Exception e) throws IOException { ToXContent.Params params = channel.request(); diff --git a/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java b/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java index 9a964a97bd73c..9e552829d8143 100644 --- a/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java +++ b/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java @@ -21,12 +21,12 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.util.Constants; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; @@ -137,7 +137,7 @@ BufferedReader getBufferedReader(Path path) throws IOException { reset(reader); final IOException ioException = new IOException("fatal"); when(reader.readLine()).thenThrow(ioException); - final Logger logger = ESLoggerFactory.getLogger("testGetMaxMapCountIOException"); + final Logger logger = LogManager.getLogger("testGetMaxMapCountIOException"); final MockLogAppender appender = new MockLogAppender(); appender.start(); appender.addExpectation( @@ -159,7 +159,7 @@ BufferedReader getBufferedReader(Path path) throws IOException { { reset(reader); when(reader.readLine()).thenReturn("eof"); - final Logger logger = ESLoggerFactory.getLogger("testGetMaxMapCountNumberFormatException"); + final Logger logger = LogManager.getLogger("testGetMaxMapCountNumberFormatException"); final MockLogAppender appender = new MockLogAppender(); appender.start(); appender.addExpectation( diff --git a/server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java index 633e043ddd14a..6d23866112d76 100644 --- a/server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java +++ b/server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java @@ -20,12 +20,12 @@ package org.elasticsearch.cluster.settings; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.discovery.Discovery; @@ -355,7 +355,7 @@ public void testMissingUnits() { public void testLoggerLevelUpdate() { assertAcked(prepareCreate("test")); - final Level level = ESLoggerFactory.getRootLogger().getLevel(); + final Level level = LogManager.getRootLogger().getLevel(); final IllegalArgumentException e = expectThrows( @@ -366,8 +366,8 @@ public void testLoggerLevelUpdate() { try { final Settings.Builder testSettings = Settings.builder().put("logger.test", "TRACE").put("logger._root", "trace"); client().admin().cluster().prepareUpdateSettings().setTransientSettings(testSettings).execute().actionGet(); - assertEquals(Level.TRACE, ESLoggerFactory.getLogger("test").getLevel()); - assertEquals(Level.TRACE, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(Level.TRACE, LogManager.getLogger("test").getLevel()); + assertEquals(Level.TRACE, LogManager.getRootLogger().getLevel()); } finally { if (randomBoolean()) { final Settings.Builder defaultSettings = Settings.builder().putNull("logger.test").putNull("logger._root"); @@ -376,8 +376,8 @@ public void testLoggerLevelUpdate() { final Settings.Builder defaultSettings = Settings.builder().putNull("logger.*"); client().admin().cluster().prepareUpdateSettings().setTransientSettings(defaultSettings).execute().actionGet(); } - assertEquals(level, ESLoggerFactory.getLogger("test").getLevel()); - assertEquals(level, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(level, LogManager.getLogger("test").getLevel()); + assertEquals(level, LogManager.getRootLogger().getLevel()); } } diff --git a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java index 419c59e91622c..10c58c562ad5b 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.common.settings; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.allocation.decider.FilterAllocationDecider; import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.index.IndexModule; @@ -905,8 +905,8 @@ public void testAffixKeyPattern() { } public void testLoggingUpdates() { - final Level level = ESLoggerFactory.getRootLogger().getLevel(); - final Level testLevel = ESLoggerFactory.getLogger("test").getLevel(); + final Level level = LogManager.getRootLogger().getLevel(); + final Level testLevel = LogManager.getLogger("test").getLevel(); Level property = randomFrom(Level.values()); Settings.Builder builder = Settings.builder().put("logger.level", property); try { @@ -916,33 +916,33 @@ public void testLoggingUpdates() { IllegalArgumentException.class, () -> settings.validate(Settings.builder().put("logger._root", "boom").build(), false)); assertEquals("Unknown level constant [BOOM].", ex.getMessage()); - assertEquals(level, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(level, LogManager.getRootLogger().getLevel()); settings.applySettings(Settings.builder().put("logger._root", "TRACE").build()); - assertEquals(Level.TRACE, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(Level.TRACE, LogManager.getRootLogger().getLevel()); settings.applySettings(Settings.builder().build()); - assertEquals(property, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(property, LogManager.getRootLogger().getLevel()); settings.applySettings(Settings.builder().put("logger.test", "TRACE").build()); - assertEquals(Level.TRACE, ESLoggerFactory.getLogger("test").getLevel()); + assertEquals(Level.TRACE, LogManager.getLogger("test").getLevel()); settings.applySettings(Settings.builder().build()); - assertEquals(property, ESLoggerFactory.getLogger("test").getLevel()); + assertEquals(property, LogManager.getLogger("test").getLevel()); } finally { - Loggers.setLevel(ESLoggerFactory.getRootLogger(), level); - Loggers.setLevel(ESLoggerFactory.getLogger("test"), testLevel); + Loggers.setLevel(LogManager.getRootLogger(), level); + Loggers.setLevel(LogManager.getLogger("test"), testLevel); } } public void testFallbackToLoggerLevel() { - final Level level = ESLoggerFactory.getRootLogger().getLevel(); + final Level level = LogManager.getRootLogger().getLevel(); try { ClusterSettings settings = new ClusterSettings(Settings.builder().put("logger.level", "ERROR").build(), ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); - assertEquals(level, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(level, LogManager.getRootLogger().getLevel()); settings.applySettings(Settings.builder().put("logger._root", "TRACE").build()); - assertEquals(Level.TRACE, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(Level.TRACE, LogManager.getRootLogger().getLevel()); settings.applySettings(Settings.builder().build()); // here we fall back to 'logger.level' which is our default. - assertEquals(Level.ERROR, ESLoggerFactory.getRootLogger().getLevel()); + assertEquals(Level.ERROR, LogManager.getRootLogger().getLevel()); } finally { - Loggers.setLevel(ESLoggerFactory.getRootLogger(), level); + Loggers.setLevel(LogManager.getRootLogger(), level); } } diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index ddb2b85748686..c225b090816ec 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -19,6 +19,7 @@ package org.elasticsearch.index.codec; +import org.apache.logging.log4j.LogManager; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; @@ -30,7 +31,6 @@ import org.apache.lucene.index.SegmentReader; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; @@ -95,7 +95,7 @@ private CodecService createCodecService() throws IOException { MapperRegistry mapperRegistry = new MapperRegistry(Collections.emptyMap(), Collections.emptyMap(), MapperPlugin.NOOP_FIELD_FILTER); MapperService service = new MapperService(settings, indexAnalyzers, xContentRegistry(), similarityService, mapperRegistry, () -> null); - return new CodecService(service, ESLoggerFactory.getLogger("test")); + return new CodecService(service, LogManager.getLogger("test")); } } diff --git a/server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java b/server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java index 0912236e01823..20f73b5903dfc 100644 --- a/server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java +++ b/server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.fetch; - +import org.apache.logging.log4j.LogManager; import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; @@ -30,7 +30,6 @@ import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.termvectors.TermVectorsService; @@ -146,7 +145,7 @@ public void hitExecute(SearchContext context, HitContext hitContext) { } hitField.getValues().add(tv); } catch (IOException e) { - ESLoggerFactory.getLogger(FetchSubPhasePluginIT.class.getName()).info("Swallowed exception", e); + LogManager.getLogger(FetchSubPhasePluginIT.class).info("Swallowed exception", e); } } } diff --git a/server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java index 8d2f7cd699320..ce6c00f359f77 100644 --- a/server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java +++ b/server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java @@ -19,6 +19,7 @@ package org.elasticsearch.search.geo; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy; import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; @@ -42,7 +43,6 @@ import org.elasticsearch.common.geo.builders.MultiPolygonBuilder; import org.elasticsearch.common.geo.builders.PointBuilder; import org.elasticsearch.common.geo.builders.PolygonBuilder; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -471,8 +471,7 @@ protected static boolean testRelationSupport(SpatialOperation relation) { return true; } catch (UnsupportedSpatialOperation e) { final SpatialOperation finalRelation = relation; - ESLoggerFactory - .getLogger(GeoFilterIT.class.getName()) + LogManager.getLogger(GeoFilterIT.class) .info(() -> new ParameterizedMessage("Unsupported spatial operation {}", finalRelation), e); return false; } diff --git a/test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java b/test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java index c8b8de13d6cfb..b2c562d43a66c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java @@ -20,6 +20,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.ChecksumIndexInput; @@ -27,7 +28,6 @@ import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; -import org.elasticsearch.common.logging.ESLoggerFactory; import java.io.IOException; import java.nio.ByteBuffer; @@ -45,7 +45,7 @@ public final class CorruptionUtils { - private static Logger logger = ESLoggerFactory.getLogger("test"); + private static final Logger logger = LogManager.getLogger(CorruptionUtils.class); private CorruptionUtils() {} public static void corruptIndex(Random random, Path indexPath, boolean corruptSegments) throws IOException { diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java index e021df52c60fe..eb300ba302b01 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.junit.listeners; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.logging.ESLoggerFactory; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.runner.Description; @@ -78,7 +78,7 @@ public void testFinished(final Description description) throws Exception { */ private static Logger resolveLogger(String loggerName) { if (loggerName.equalsIgnoreCase("_root")) { - return ESLoggerFactory.getRootLogger(); + return LogManager.getRootLogger(); } return Loggers.getLogger(loggerName); } diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java index 0845fc2546f49..fe5dedb2d5a7e 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.logging.ESLoggerFactory; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; @@ -51,7 +51,7 @@ public void testCustomLevelPerMethod() throws Exception { Logger xyzLogger = Loggers.getLogger("xyz"); Logger abcLogger = Loggers.getLogger("abc"); - final Level level = ESLoggerFactory.getRootLogger().getLevel(); + final Level level = LogManager.getRootLogger().getLevel(); assertThat(xyzLogger.getLevel(), equalTo(level)); assertThat(abcLogger.getLevel(), equalTo(level)); @@ -88,7 +88,7 @@ public void testCustomLevelPerClass() throws Exception { Logger fooLogger = Loggers.getLogger("foo"); Logger fooBarLogger = Loggers.getLogger("foo.bar"); - final Level level = ESLoggerFactory.getRootLogger().getLevel(); + final Level level = LogManager.getRootLogger().getLevel(); assertThat(xyzLogger.getLevel(), equalTo(level)); assertThat(abcLogger.getLevel(), equalTo(level)); @@ -128,7 +128,7 @@ public void testCustomLevelPerClassAndPerMethod() throws Exception { Logger abcLogger = Loggers.getLogger("abc"); Logger xyzLogger = Loggers.getLogger("xyz"); - final Level level = ESLoggerFactory.getRootLogger().getLevel(); + final Level level = LogManager.getRootLogger().getLevel(); assertThat(xyzLogger.getLevel(), equalTo(level)); assertThat(abcLogger.getLevel(), equalTo(level)); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/audit/logfile/CapturingLogger.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/audit/logfile/CapturingLogger.java index ede18c8241b34..3ea15d48f2b4f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/audit/logfile/CapturingLogger.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/audit/logfile/CapturingLogger.java @@ -17,7 +17,6 @@ import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.filter.RegexFilter; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.logging.Loggers; import java.util.ArrayList; @@ -50,7 +49,7 @@ public static Logger newCapturingLogger(final Level level, @Nullable StringLayou // careful, don't "bury" this on the call stack, unless you know what you're doing final StackTraceElement caller = Thread.currentThread().getStackTrace()[2]; final String name = caller.getClassName() + "." + caller.getMethodName() + "." + level.toString(); - final Logger logger = ESLoggerFactory.getLogger(name); + final Logger logger = LogManager.getLogger(name); Loggers.setLevel(logger, level); final MockAppender appender = new MockAppender(name, layout); appender.start(); diff --git a/x-pack/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java b/x-pack/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java index 6b323c4496d94..0111aeff4cca2 100644 --- a/x-pack/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java +++ b/x-pack/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java @@ -6,11 +6,11 @@ package org.elasticsearch.xpack.security; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.TransportClient; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.xpack.client.PreBuiltXPackTransportClient; @@ -58,7 +58,7 @@ public abstract class MigrateToolTestCase extends LuceneTestCase { */ public static final String TESTS_CLUSTER_DEFAULT = "localhost:9300"; - protected static final Logger logger = ESLoggerFactory.getLogger(MigrateToolTestCase.class.getName()); + protected static final Logger logger = LogManager.getLogger(MigrateToolTestCase.class); private static final AtomicInteger counter = new AtomicInteger(); private static Client client; diff --git a/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/AbstractAdLdapRealmTestCase.java b/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/AbstractAdLdapRealmTestCase.java index d6b2e321d6c8b..135ae14b9c85b 100644 --- a/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/AbstractAdLdapRealmTestCase.java +++ b/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/AbstractAdLdapRealmTestCase.java @@ -5,6 +5,7 @@ */ package org.elasticsearch.xpack.security.authc.ldap; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.ElasticsearchSecurityException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.DocWriteResponse; @@ -13,7 +14,6 @@ import org.elasticsearch.client.Client; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; @@ -110,8 +110,9 @@ public static void setupRealm() { realmConfig = randomFrom(RealmConfig.values()); roleMappings = realmConfig.selectRoleMappings(ESTestCase::randomBoolean); useGlobalSSL = randomBoolean(); - ESLoggerFactory.getLogger("test").info("running test with realm configuration [{}], with direct group to role mapping [{}]. " + - "Settings [{}]", realmConfig, realmConfig.mapGroupsAsRoles, realmConfig.settings); + LogManager.getLogger(AbstractAdLdapRealmTestCase.class).info( + "running test with realm configuration [{}], with direct group to role mapping [{}]. Settings [{}]", + realmConfig, realmConfig.mapGroupsAsRoles, realmConfig.settings); } @AfterClass diff --git a/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/MultipleAdRealmIT.java b/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/MultipleAdRealmIT.java index 3d1cdb202d19d..2231d23296a4c 100644 --- a/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/MultipleAdRealmIT.java +++ b/x-pack/qa/third-party/active-directory/src/test/java/org/elasticsearch/xpack/security/authc/ldap/MultipleAdRealmIT.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.xpack.security.authc.ldap; -import org.elasticsearch.common.logging.ESLoggerFactory; +import org.apache.logging.log4j.LogManager; import org.elasticsearch.common.settings.Settings; import org.junit.BeforeClass; @@ -31,9 +31,9 @@ public static void setupSecondaryRealm() { .filter(config -> config.name().startsWith("AD")) .collect(Collectors.toList()); secondaryRealmConfig = randomFrom(configs); - ESLoggerFactory.getLogger("test") - .info("running test with secondary realm configuration [{}], with direct group to role mapping [{}]. Settings [{}]", - secondaryRealmConfig, secondaryRealmConfig.mapGroupsAsRoles, secondaryRealmConfig.settings); + LogManager.getLogger(MultipleAdRealmIT.class).info( + "running test with secondary realm configuration [{}], with direct group to role mapping [{}]. Settings [{}]", + secondaryRealmConfig, secondaryRealmConfig.mapGroupsAsRoles, secondaryRealmConfig.settings); // It's easier to test 2 realms when using file based role mapping, and for the purposes of // this test, there's no need to test native mappings. diff --git a/x-pack/qa/transport-client-tests/src/test/java/org/elasticsearch/xpack/ml/client/ESXPackSmokeClientTestCase.java b/x-pack/qa/transport-client-tests/src/test/java/org/elasticsearch/xpack/ml/client/ESXPackSmokeClientTestCase.java index c77715431ec5e..28267614dd36d 100644 --- a/x-pack/qa/transport-client-tests/src/test/java/org/elasticsearch/xpack/ml/client/ESXPackSmokeClientTestCase.java +++ b/x-pack/qa/transport-client-tests/src/test/java/org/elasticsearch/xpack/ml/client/ESXPackSmokeClientTestCase.java @@ -6,11 +6,11 @@ package org.elasticsearch.xpack.ml.client; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.TransportClient; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.env.Environment; @@ -54,8 +54,7 @@ public abstract class ESXPackSmokeClientTestCase extends LuceneTestCase { */ public static final String TESTS_CLUSTER = "tests.cluster"; - protected static final Logger logger = ESLoggerFactory - .getLogger(ESXPackSmokeClientTestCase.class.getName()); + protected static final Logger logger = LogManager.getLogger(ESXPackSmokeClientTestCase.class); private static final AtomicInteger counter = new AtomicInteger(); private static Client client;