Skip to content

Commit d7ea82f

Browse files
nik9000nik9000
committed
Logging: Drop two deprecated methods (elastic#34055)
This drops two deprecated methods from `ESLoggerFactory`, switching all calls to those methods to calls to methods of the same name on `LogManager`.
1 parent f2f4738 commit d7ea82f

File tree

29 files changed

+95
-118
lines changed

29 files changed

+95
-118
lines changed

‎client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
package org.elasticsearch.client.benchmark.ops.bulk;
2020

2121
import org.apache.logging.log4j.Logger;
22+
import org.apache.logging.log4j.LogManager;
2223
import org.elasticsearch.ElasticsearchException;
2324
import org.elasticsearch.client.benchmark.BenchmarkTask;
2425
import org.elasticsearch.client.benchmark.metrics.Sample;
2526
import org.elasticsearch.client.benchmark.metrics.SampleRecorder;
2627
import org.elasticsearch.common.SuppressForbidden;
2728
import org.elasticsearch.common.io.PathUtils;
28-
import org.elasticsearch.common.logging.ESLoggerFactory;
2929

3030
import java.io.BufferedReader;
3131
import java.io.IOException;
@@ -135,7 +135,7 @@ private void sendBulk(List<String> bulkData) throws InterruptedException {
135135

136136

137137
private static final class BulkIndexer implements Runnable {
138-
private static final Logger logger = ESLoggerFactory.getLogger(BulkIndexer.class.getName());
138+
private static final Logger logger = LogManager.getLogger(BulkIndexer.class);
139139

140140
private final BlockingQueue<List<String>> bulkData;
141141
private final int warmupIterations;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AmazonEC2Mock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@
509509
import com.amazonaws.services.ec2.model.UpdateSecurityGroupRuleDescriptionsIngressResult;
510510
import com.amazonaws.services.ec2.waiters.AmazonEC2Waiters;
511511
import org.apache.logging.log4j.Logger;
512-
import org.elasticsearch.common.logging.ESLoggerFactory;
512+
import org.apache.logging.log4j.LogManager;
513513

514514
import java.util.ArrayList;
515515
import java.util.Collection;
@@ -521,7 +521,7 @@
521521

522522
public class AmazonEC2Mock implements AmazonEC2 {
523523

524-
private static final Logger logger = ESLoggerFactory.getLogger(AmazonEC2Mock.class.getName());
524+
private static final Logger logger = LogManager.getLogger(AmazonEC2Mock.class);
525525

526526
public static final String PREFIX_PRIVATE_IP = "10.0.0.";
527527
public static final String PREFIX_PUBLIC_IP = "8.8.8.";

‎plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/RetryHttpInitializerWrapper.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.discovery.gce;
2121

22+
import org.apache.logging.log4j.Logger;
23+
import org.apache.logging.log4j.LogManager;
2224
import com.google.api.client.auth.oauth2.Credential;
2325
import com.google.api.client.googleapis.testing.auth.oauth2.MockGoogleCredential;
2426
import com.google.api.client.http.HttpBackOffIOExceptionHandler;
@@ -29,19 +31,14 @@
2931
import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
3032
import com.google.api.client.util.ExponentialBackOff;
3133
import com.google.api.client.util.Sleeper;
32-
import org.apache.logging.log4j.Logger;
3334
import org.elasticsearch.cloud.gce.util.Access;
34-
import org.elasticsearch.common.logging.ESLoggerFactory;
3535
import org.elasticsearch.common.unit.TimeValue;
3636

3737
import java.io.IOException;
3838
import java.util.Objects;
3939

4040
public class RetryHttpInitializerWrapper implements HttpRequestInitializer {
41-
42-
private TimeValue maxWait;
43-
44-
private static final Logger logger = ESLoggerFactory.getLogger(RetryHttpInitializerWrapper.class.getName());
41+
private static final Logger logger = LogManager.getLogger(RetryHttpInitializerWrapper.class);
4542

4643
// Intercepts the request for filling in the "Authorization"
4744
// header field, as well as recovering from certain unsuccessful
@@ -52,6 +49,8 @@ public class RetryHttpInitializerWrapper implements HttpRequestInitializer {
5249
// A sleeper; you can replace it with a mock in your test.
5350
private final Sleeper sleeper;
5451

52+
private TimeValue maxWait;
53+
5554
public RetryHttpInitializerWrapper(Credential wrappedCredential) {
5655
this(wrappedCredential, Sleeper.DEFAULT, TimeValue.timeValueMillis(ExponentialBackOff.DEFAULT_MAX_ELAPSED_TIME_MILLIS));
5756
}

‎qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void tearDown() throws Exception {
5858
}
5959

6060
public void testResolveMultipleConfigs() throws Exception {
61-
final Level level = ESLoggerFactory.getLogger("test").getLevel();
61+
final Level level = LogManager.getLogger("test").getLevel();
6262
try {
6363
final Path configDir = getDataPath("config");
6464
final Settings settings = Settings.builder()
@@ -106,7 +106,7 @@ public void testDefaults() throws IOException, UserException {
106106
LogConfigurator.configure(environment);
107107

108108
final String loggerName = "test";
109-
final Logger logger = ESLoggerFactory.getLogger(loggerName);
109+
final Logger logger = LogManager.getLogger(loggerName);
110110
assertThat(logger.getLevel().toString(), equalTo(level));
111111
}
112112

@@ -122,7 +122,7 @@ public void testResolveOrder() throws Exception {
122122

123123
// args should overwrite whatever is in the config
124124
final String loggerName = "test_resolve_order";
125-
final Logger logger = ESLoggerFactory.getLogger(loggerName);
125+
final Logger logger = LogManager.getLogger(loggerName);
126126
assertTrue(logger.isTraceEnabled());
127127
}
128128

@@ -134,14 +134,14 @@ public void testHierarchy() throws Exception {
134134
final Environment environment = new Environment(settings, configDir);
135135
LogConfigurator.configure(environment);
136136

137-
assertThat(ESLoggerFactory.getLogger("x").getLevel(), equalTo(Level.TRACE));
138-
assertThat(ESLoggerFactory.getLogger("x.y").getLevel(), equalTo(Level.DEBUG));
137+
assertThat(LogManager.getLogger("x").getLevel(), equalTo(Level.TRACE));
138+
assertThat(LogManager.getLogger("x.y").getLevel(), equalTo(Level.DEBUG));
139139

140140
final Level level = randomFrom(Level.TRACE, Level.DEBUG, Level.INFO, Level.WARN, Level.ERROR);
141-
Loggers.setLevel(ESLoggerFactory.getLogger("x"), level);
141+
Loggers.setLevel(LogManager.getLogger("x"), level);
142142

143-
assertThat(ESLoggerFactory.getLogger("x").getLevel(), equalTo(level));
144-
assertThat(ESLoggerFactory.getLogger("x.y").getLevel(), equalTo(level));
143+
assertThat(LogManager.getLogger("x").getLevel(), equalTo(level));
144+
assertThat(LogManager.getLogger("x.y").getLevel(), equalTo(level));
145145
}
146146

147147
public void testMissingConfigFile() {

‎qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void tearDown() throws Exception {
8282
public void testLocationInfoTest() throws IOException, UserException {
8383
setupLogging("location_info");
8484

85-
final Logger testLogger = ESLoggerFactory.getLogger("test");
85+
final Logger testLogger = LogManager.getLogger("test");
8686

8787
testLogger.error("This is an error message");
8888
testLogger.warn("This is a warning message");
@@ -108,7 +108,7 @@ public void testLocationInfoTest() throws IOException, UserException {
108108
public void testDeprecationLogger() throws IOException, UserException {
109109
setupLogging("deprecation");
110110

111-
final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation"));
111+
final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation"));
112112

113113
final int deprecatedIterations = randomIntBetween(0, 256);
114114
for (int i = 0; i < deprecatedIterations; i++) {
@@ -135,7 +135,7 @@ public void testDeprecationLogger() throws IOException, UserException {
135135
public void testConcurrentDeprecationLogger() throws IOException, UserException, BrokenBarrierException, InterruptedException {
136136
setupLogging("deprecation");
137137

138-
final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation"));
138+
final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation"));
139139

140140
final int numberOfThreads = randomIntBetween(2, 4);
141141
final CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads);
@@ -214,7 +214,7 @@ public void testConcurrentDeprecationLogger() throws IOException, UserException,
214214
public void testDeprecationLoggerMaybeLog() throws IOException, UserException {
215215
setupLogging("deprecation");
216216

217-
final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation"));
217+
final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation"));
218218

219219
final int iterations = randomIntBetween(1, 16);
220220

@@ -286,12 +286,12 @@ public void testDeprecatedSettings() throws IOException, UserException {
286286
public void testFindAppender() throws IOException, UserException {
287287
setupLogging("find_appender");
288288

289-
final Logger hasConsoleAppender = ESLoggerFactory.getLogger("has_console_appender");
289+
final Logger hasConsoleAppender = LogManager.getLogger("has_console_appender");
290290

291291
final Appender testLoggerConsoleAppender = Loggers.findAppender(hasConsoleAppender, ConsoleAppender.class);
292292
assertNotNull(testLoggerConsoleAppender);
293293
assertThat(testLoggerConsoleAppender.getName(), equalTo("console"));
294-
final Logger hasCountingNoOpAppender = ESLoggerFactory.getLogger("has_counting_no_op_appender");
294+
final Logger hasCountingNoOpAppender = LogManager.getLogger("has_counting_no_op_appender");
295295
assertNull(Loggers.findAppender(hasCountingNoOpAppender, ConsoleAppender.class));
296296
final Appender countingNoOpAppender = Loggers.findAppender(hasCountingNoOpAppender, CountingNoOpAppender.class);
297297
assertThat(countingNoOpAppender.getName(), equalTo("counting_no_op"));

‎qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
package org.elasticsearch.smoketest;
2121

2222
import org.apache.logging.log4j.Logger;
23+
import org.apache.logging.log4j.LogManager;
2324
import org.apache.lucene.util.LuceneTestCase;
2425
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
2526
import org.elasticsearch.client.Client;
2627
import org.elasticsearch.client.transport.TransportClient;
27-
import org.elasticsearch.common.logging.ESLoggerFactory;
2828
import org.elasticsearch.common.network.NetworkModule;
2929
import org.elasticsearch.common.settings.Settings;
3030
import org.elasticsearch.common.transport.TransportAddress;
@@ -69,7 +69,7 @@ public abstract class ESSmokeClientTestCase extends LuceneTestCase {
6969
*/
7070
public static final String TESTS_CLUSTER = "tests.cluster";
7171

72-
protected static final Logger logger = ESLoggerFactory.getLogger(ESSmokeClientTestCase.class.getName());
72+
protected static final Logger logger = LogManager.getLogger(ESSmokeClientTestCase.class);
7373

7474
private static final AtomicInteger counter = new AtomicInteger();
7575
private static Client client;

‎server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ static void init(
315315
final boolean closeStandardStreams = (foreground == false) || quiet;
316316
try {
317317
if (closeStandardStreams) {
318-
final Logger rootLogger = ESLoggerFactory.getRootLogger();
318+
final Logger rootLogger = LogManager.getRootLogger();
319319
final Appender maybeConsoleAppender = Loggers.findAppender(rootLogger, ConsoleAppender.class);
320320
if (maybeConsoleAppender != null) {
321321
Loggers.removeAppender(rootLogger, maybeConsoleAppender);
@@ -347,7 +347,7 @@ static void init(
347347
}
348348
} catch (NodeValidationException | RuntimeException e) {
349349
// disable console logging, so user does not see the exception twice (jvm will show it already)
350-
final Logger rootLogger = ESLoggerFactory.getRootLogger();
350+
final Logger rootLogger = LogManager.getRootLogger();
351351
final Appender maybeConsoleAppender = Loggers.findAppender(rootLogger, ConsoleAppender.class);
352352
if (foreground && maybeConsoleAppender != null) {
353353
Loggers.removeAppender(rootLogger, maybeConsoleAppender);

‎server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.locationtech.jts.geom.GeometryFactory;
2525

2626
import org.apache.logging.log4j.Logger;
27+
import org.apache.logging.log4j.LogManager;
2728
import org.elasticsearch.Assertions;
2829
import org.elasticsearch.Version;
2930
import org.elasticsearch.common.Strings;
@@ -33,7 +34,6 @@
3334
import org.elasticsearch.common.io.stream.NamedWriteable;
3435
import org.elasticsearch.common.io.stream.StreamInput;
3536
import org.elasticsearch.common.io.stream.StreamOutput;
36-
import org.elasticsearch.common.logging.ESLoggerFactory;
3737
import org.elasticsearch.common.xcontent.ToXContentObject;
3838
import org.elasticsearch.common.xcontent.XContentBuilder;
3939
import org.elasticsearch.common.xcontent.XContentParser;
@@ -56,7 +56,7 @@
5656
*/
5757
public abstract class ShapeBuilder<T extends Shape, E extends ShapeBuilder<T,E>> implements NamedWriteable, ToXContentObject {
5858

59-
protected static final Logger LOGGER = ESLoggerFactory.getLogger(ShapeBuilder.class.getName());
59+
protected static final Logger LOGGER = LogManager.getLogger(ShapeBuilder.class);
6060

6161
private static final boolean DEBUG;
6262
static {

‎server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java

-19
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,4 @@ public static Logger getLogger(String prefix, Logger logger) {
7070
public static Logger getLogger(Class<?> clazz) {
7171
return getLogger(null, clazz);
7272
}
73-
74-
/**
75-
* Get or build a logger.
76-
* @deprecated Prefer {@link LogManager#getLogger}
77-
*/
78-
@Deprecated
79-
public static Logger getLogger(String name) {
80-
return getLogger(null, name);
81-
}
82-
83-
/**
84-
* Get the root logger.
85-
* @deprecated Prefer {@link LogManager#getRootLogger}
86-
*/
87-
@Deprecated
88-
public static Logger getRootLogger() {
89-
return LogManager.getRootLogger();
90-
}
91-
9273
}

‎server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,13 @@ private static void configureStatusLogger() {
258258
private static void configureLoggerLevels(final Settings settings) {
259259
if (Loggers.LOG_DEFAULT_LEVEL_SETTING.exists(settings)) {
260260
final Level level = Loggers.LOG_DEFAULT_LEVEL_SETTING.get(settings);
261-
Loggers.setLevel(ESLoggerFactory.getRootLogger(), level);
261+
Loggers.setLevel(LogManager.getRootLogger(), level);
262262
}
263263
Loggers.LOG_LEVEL_SETTING.getAllConcreteSettings(settings)
264264
// do not set a log level for a logger named level (from the default log setting)
265265
.filter(s -> s.getKey().equals(Loggers.LOG_DEFAULT_LEVEL_SETTING.getKey()) == false).forEach(s -> {
266266
final Level level = s.get(settings);
267-
Loggers.setLevel(ESLoggerFactory.getLogger(s.getKey().substring("logger.".length())), level);
267+
Loggers.setLevel(LogManager.getLogger(s.getKey().substring("logger.".length())), level);
268268
});
269269
}
270270

‎server/src/main/java/org/elasticsearch/common/logging/Loggers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static Logger getLogger(Logger parentLogger, String s) {
9393
*/
9494
@Deprecated
9595
public static Logger getLogger(String s) {
96-
return ESLoggerFactory.getLogger(s);
96+
return LogManager.getLogger(s);
9797
}
9898

9999
/**

‎server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.elasticsearch.common.settings;
2020

21+
import org.apache.logging.log4j.LogManager;
2122
import org.elasticsearch.action.admin.indices.close.TransportCloseIndexAction;
2223
import org.elasticsearch.action.search.TransportSearchAction;
2324
import org.elasticsearch.action.support.AutoCreateIndex;
@@ -45,7 +46,6 @@
4546
import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider;
4647
import org.elasticsearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider;
4748
import org.elasticsearch.cluster.service.ClusterService;
48-
import org.elasticsearch.common.logging.ESLoggerFactory;
4949
import org.elasticsearch.common.logging.Loggers;
5050
import org.elasticsearch.common.network.NetworkModule;
5151
import org.elasticsearch.common.network.NetworkService;
@@ -159,12 +159,12 @@ public void apply(Settings value, Settings current, Settings previous) {
159159
if ("_root".equals(component)) {
160160
final String rootLevel = value.get(key);
161161
if (rootLevel == null) {
162-
Loggers.setLevel(ESLoggerFactory.getRootLogger(), Loggers.LOG_DEFAULT_LEVEL_SETTING.get(settings));
162+
Loggers.setLevel(LogManager.getRootLogger(), Loggers.LOG_DEFAULT_LEVEL_SETTING.get(settings));
163163
} else {
164-
Loggers.setLevel(ESLoggerFactory.getRootLogger(), rootLevel);
164+
Loggers.setLevel(LogManager.getRootLogger(), rootLevel);
165165
}
166166
} else {
167-
Loggers.setLevel(ESLoggerFactory.getLogger(component), value.get(key));
167+
Loggers.setLevel(LogManager.getLogger(component), value.get(key));
168168
}
169169
}
170170
}

‎server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
package org.elasticsearch.discovery;
2020

2121
import org.apache.logging.log4j.Logger;
22+
import org.apache.logging.log4j.LogManager;
2223
import org.apache.logging.log4j.message.ParameterizedMessage;
2324
import org.elasticsearch.cluster.node.DiscoveryNode;
24-
import org.elasticsearch.common.logging.ESLoggerFactory;
2525

2626
import java.util.Set;
2727

@@ -32,7 +32,7 @@
3232
*/
3333
public class AckClusterStatePublishResponseHandler extends BlockingClusterStatePublishResponseHandler {
3434

35-
private static final Logger logger = ESLoggerFactory.getLogger(AckClusterStatePublishResponseHandler.class.getName());
35+
private static final Logger logger = LogManager.getLogger(AckClusterStatePublishResponseHandler.class);
3636

3737
private final Discovery.AckListener ackListener;
3838

‎server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
package org.elasticsearch.rest;
2121

2222
import org.apache.logging.log4j.Logger;
23+
import org.apache.logging.log4j.LogManager;
2324
import org.apache.logging.log4j.message.ParameterizedMessage;
2425
import org.apache.logging.log4j.util.Supplier;
2526
import org.elasticsearch.ElasticsearchException;
2627
import org.elasticsearch.ElasticsearchStatusException;
2728
import org.elasticsearch.ExceptionsHelper;
2829
import org.elasticsearch.common.bytes.BytesArray;
2930
import org.elasticsearch.common.bytes.BytesReference;
30-
import org.elasticsearch.common.logging.ESLoggerFactory;
3131
import org.elasticsearch.common.xcontent.ToXContent;
3232
import org.elasticsearch.common.xcontent.XContentBuilder;
3333
import org.elasticsearch.common.xcontent.XContentParser;
@@ -117,7 +117,7 @@ public RestStatus status() {
117117
return this.status;
118118
}
119119

120-
private static final Logger SUPPRESSED_ERROR_LOGGER = ESLoggerFactory.getLogger("rest.suppressed");
120+
private static final Logger SUPPRESSED_ERROR_LOGGER = LogManager.getLogger("rest.suppressed");
121121

122122
private static XContentBuilder build(RestChannel channel, RestStatus status, Exception e) throws IOException {
123123
ToXContent.Params params = channel.request();

0 commit comments

Comments
 (0)