From 995b4d3c69e7ab06c994da67b2692615aa69a15a Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Thu, 2 Nov 2023 18:01:14 +0100 Subject: [PATCH] Cleanup redundant logger fields (#101655) Making loggers static that can be made static, removing redundant test loggers (we already have the correct per class logger in this.logger) and also removing some just unused loggers. --- ...ExportElasticsearchBuildResourcesTask.java | 2 +- .../azure/AzureBlobContainer.java | 2 +- .../azure/AzureClientProvider.java | 2 +- .../CancellableRateLimitedFluxIterator.java | 2 +- .../ReactorScheduledExecutorService.java | 2 +- .../url/http/RetryingHttpInputStream.java | 2 +- .../blobstore/url/http/URLHttpClient.java | 6 +-- .../allocation/AwarenessAllocationIT.java | 2 +- .../cluster/allocation/ClusterRerouteIT.java | 3 -- .../gateway/GatewayIndexStateIT.java | 4 -- .../indices/state/SimpleIndexStateIT.java | 4 -- .../recovery/RecoveryWhileUnderLoadIT.java | 3 -- ...TransportVerifyShardBeforeCloseAction.java | 2 +- .../TransportVerifyShardIndexBlockAction.java | 3 -- .../indices/shrink/TransportResizeAction.java | 3 -- .../action/bulk/BulkRequestHandler.java | 3 +- .../coordination/PreVoteCollector.java | 2 +- .../common/util/FeatureFlag.java | 2 +- .../org/elasticsearch/http/HttpTracer.java | 2 +- .../index/shard/PrimaryReplicaSyncer.java | 11 +++-- .../elasticsearch/indices/IndicesService.java | 12 +----- .../cache/IndicesFieldDataCache.java | 6 +-- .../recovery/plan/ShardSnapshotsService.java | 2 +- .../scanners/NamedComponentReader.java | 2 +- .../MultiBucketConsumerService.java | 2 +- .../bucket/composite/CompositeAggregator.java | 2 +- .../transport/TransportKeepAlive.java | 2 +- .../action/bulk/BulkProcessor2Tests.java | 3 -- .../action/bulk/BulkProcessorTests.java | 3 -- .../allocation/AddIncrementallyTests.java | 3 -- .../allocation/AllocationCommandsTests.java | 3 -- .../allocation/AwarenessAllocationTests.java | 4 -- .../allocation/BalanceConfigurationTests.java | 3 -- .../ClusterRebalanceRoutingTests.java | 3 -- .../ConcurrentRebalanceRoutingTests.java | 3 -- ...ReplicaAsPrimaryDuringRelocationTests.java | 3 -- .../ExpectedShardSizeAllocationTests.java | 4 -- .../allocation/FailedNodeRoutingTests.java | 3 -- .../allocation/FailedShardsRoutingTests.java | 3 -- .../routing/allocation/IndexBalanceTests.java | 3 -- .../NodeVersionAllocationDeciderTests.java | 4 -- .../PreferPrimaryAllocationTests.java | 3 -- .../PrimaryElectionRoutingTests.java | 3 -- ...yNotRelocatedWhileBeingRecoveredTests.java | 4 -- .../allocation/RebalanceAfterActiveTests.java | 3 -- .../ReplicaAllocatedAfterPrimaryTests.java | 3 -- .../allocation/ShardVersioningTests.java | 4 -- .../ShardsLimitAllocationTests.java | 3 -- .../SingleShardNoReplicasRoutingTests.java | 3 -- .../SingleShardOneReplicaRoutingTests.java | 3 -- .../TenShardsOneReplicaRoutingTests.java | 3 -- .../allocation/ThrottlingAllocationTests.java | 3 -- .../UpdateNumberOfReplicasTests.java | 3 -- .../decider/EnableAllocationTests.java | 4 -- .../snapshots/SnapshotResiliencyTests.java | 4 -- .../AbstractCoordinatorTestCase.java | 2 +- .../elasticsearch/test/BackgroundIndexer.java | 2 +- .../test/InternalTestCluster.java | 2 +- .../test/engine/MockEngineSupport.java | 9 ++--- .../transport/DisruptableMockTransport.java | 2 +- .../xpack/core/async/AsyncResultsService.java | 2 +- .../core/async/DeleteAsyncResultsService.java | 2 +- .../DocumentSubsetBitsetCache.java | 4 +- .../permission/ApplicationPermission.java | 3 +- .../xpack/application/rules/QueryRule.java | 4 -- .../application/rules/RuleQueryBuilder.java | 4 -- .../SearchApplicationTemplateService.java | 4 -- .../eql/execution/sample/SampleIterator.java | 2 +- .../execution/sequence/SequenceMatcher.java | 2 +- .../execution/sequence/TumblingWindow.java | 2 +- .../xpack/idp/IdentityProviderPlugin.java | 3 -- ...nsportDeleteSamlServiceProviderAction.java | 2 +- ...TransportPutSamlServiceProviderAction.java | 2 +- ...ansportSamlInitiateSingleSignOnAction.java | 2 +- .../ApplicationActionsResolver.java | 2 +- .../idp/privileges/UserPrivilegeResolver.java | 2 +- .../saml/authn/SamlAuthnRequestValidator.java | 2 +- ...lAuthenticationResponseMessageBuilder.java | 2 +- .../idp/saml/idp/SamlIdentityProvider.java | 2 +- .../idp/saml/idp/SamlMetadataGenerator.java | 2 +- .../idp/saml/sp/SamlServiceProviderIndex.java | 2 +- .../xpack/ml/process/MlMemoryTracker.java | 2 +- .../ssl/SSLReloadDuringStartupIntegTests.java | 40 +++++++++---------- .../DelegatedAuthorizationSupport.java | 3 +- .../authc/support/SecondaryAuthenticator.java | 2 +- .../ingest/SetSecurityUserProcessor.java | 2 +- .../role/NativeRoleBaseRestHandler.java | 2 +- .../user/NativeUserBaseRestHandler.java | 2 +- .../support/SecuritySystemIndices.java | 2 +- .../plan/SnapshotsRecoveryPlannerService.java | 2 +- .../xpack/watcher/watch/WatchTests.java | 4 -- 91 files changed, 82 insertions(+), 229 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java index 56ff470b8d3d..64b9203f8dc4 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java @@ -40,7 +40,7 @@ import javax.inject.Inject; */ public class ExportElasticsearchBuildResourcesTask extends DefaultTask { - private final Logger logger = Logging.getLogger(ExportElasticsearchBuildResourcesTask.class); + private static final Logger logger = Logging.getLogger(ExportElasticsearchBuildResourcesTask.class); private final Set resources = new HashSet<>(); diff --git a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobContainer.java b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobContainer.java index fbf57a019864..16a9f60a3d28 100644 --- a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobContainer.java +++ b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobContainer.java @@ -35,7 +35,7 @@ import java.util.Map; public class AzureBlobContainer extends AbstractBlobContainer { - private final Logger logger = LogManager.getLogger(AzureBlobContainer.class); + private static final Logger logger = LogManager.getLogger(AzureBlobContainer.class); private final AzureBlobStore blobStore; private final String keyPath; diff --git a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java index ae5ae07c9078..cdfd83b79b37 100644 --- a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java +++ b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java @@ -239,8 +239,8 @@ class AzureClientProvider extends AbstractLifecycleComponent { protected void doClose() throws IOException {} private static final class SuccessfulRequestTracker implements HttpPipelinePolicy { + private static final Logger logger = LogManager.getLogger(SuccessfulRequestTracker.class); private final BiConsumer onSuccessfulRequest; - private final Logger logger = LogManager.getLogger(SuccessfulRequestTracker.class); private SuccessfulRequestTracker(BiConsumer onSuccessfulRequest) { this.onSuccessfulRequest = onSuccessfulRequest; diff --git a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java index 3c131affbb84..2dff8a10d39f 100644 --- a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java +++ b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java @@ -50,7 +50,7 @@ class CancellableRateLimitedFluxIterator implements Subscriber, Iterator cleaner; private final AtomicReference subscription = new AtomicReference<>(); - private final Logger logger = LogManager.getLogger(CancellableRateLimitedFluxIterator.class); + private static final Logger logger = LogManager.getLogger(CancellableRateLimitedFluxIterator.class); private volatile Throwable error; private volatile boolean done; private int emittedElements; diff --git a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/executors/ReactorScheduledExecutorService.java b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/executors/ReactorScheduledExecutorService.java index a3359e07119b..5f18a417dccc 100644 --- a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/executors/ReactorScheduledExecutorService.java +++ b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/executors/ReactorScheduledExecutorService.java @@ -37,7 +37,7 @@ import static org.elasticsearch.core.Strings.format; public class ReactorScheduledExecutorService extends AbstractExecutorService implements ScheduledExecutorService { private final ThreadPool threadPool; private final ExecutorService delegate; - private final Logger logger = LogManager.getLogger(ReactorScheduledExecutorService.class); + private static final Logger logger = LogManager.getLogger(ReactorScheduledExecutorService.class); public ReactorScheduledExecutorService(ThreadPool threadPool, String executorName) { this.threadPool = threadPool; diff --git a/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/RetryingHttpInputStream.java b/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/RetryingHttpInputStream.java index 70aaf9864d56..ddf23bce0972 100644 --- a/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/RetryingHttpInputStream.java +++ b/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/RetryingHttpInputStream.java @@ -33,7 +33,7 @@ class RetryingHttpInputStream extends InputStream { public static final int MAX_SUPPRESSED_EXCEPTIONS = 10; public static final long MAX_RANGE_VAL = Long.MAX_VALUE - 1; - private final Logger logger = LogManager.getLogger(RetryingHttpInputStream.class); + private static final Logger logger = LogManager.getLogger(RetryingHttpInputStream.class); private final String blobName; private final URI blobURI; diff --git a/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java b/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java index 42bece3dbea1..490787714ff3 100644 --- a/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java +++ b/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java @@ -37,7 +37,7 @@ import java.util.Map; public class URLHttpClient implements Closeable { public static final int MAX_ERROR_MESSAGE_BODY_SIZE = 1024; private static final int MAX_CONNECTIONS = 50; - private final Logger logger = LogManager.getLogger(URLHttpClient.class); + private static final Logger logger = LogManager.getLogger(URLHttpClient.class); private final CloseableHttpClient client; private final URLHttpClientSettings httpClientSettings; @@ -142,7 +142,7 @@ public class URLHttpClient implements Closeable { }; } - private void handleInvalidResponse(CloseableHttpResponse response) { + private static void handleInvalidResponse(CloseableHttpResponse response) { int statusCode = response.getStatusLine().getStatusCode(); String errorBody = parseBodyAsString(response, MAX_ERROR_MESSAGE_BODY_SIZE); throw new URLHttpClientException(statusCode, createErrorMessage(statusCode, errorBody)); @@ -156,7 +156,7 @@ public class URLHttpClient implements Closeable { } } - private String parseBodyAsString(CloseableHttpResponse response, int maxSize) { + private static String parseBodyAsString(CloseableHttpResponse response, int maxSize) { String errorMessage = ""; InputStream bodyContent = null; try { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java index d010c8b0cd74..f55ac7172266 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.instanceOf; @ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, minNumDataNodes = 2) public class AwarenessAllocationIT extends ESIntegTestCase { - private final Logger logger = LogManager.getLogger(AwarenessAllocationIT.class); + private static final Logger logger = LogManager.getLogger(AwarenessAllocationIT.class); @Override protected int numberOfReplicas() { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java index bd3a545d7ed7..6175395803e8 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java @@ -9,8 +9,6 @@ package org.elasticsearch.cluster.allocation; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.lucene.tests.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteResponse; @@ -66,7 +64,6 @@ import static org.hamcrest.Matchers.hasSize; @LuceneTestCase.SuppressFileSystems(value = "WindowsFS") @ClusterScope(scope = Scope.TEST, numDataNodes = 0) public class ClusterRerouteIT extends ESIntegTestCase { - private final Logger logger = LogManager.getLogger(ClusterRerouteIT.class); public void testRerouteWithCommands_disableAllocationSettings() throws Exception { Settings commonSettings = Settings.builder() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java index e995d815af0f..d92664f55416 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java @@ -8,8 +8,6 @@ package org.elasticsearch.gateway; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; @@ -69,8 +67,6 @@ import static org.hamcrest.Matchers.notNullValue; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) public class GatewayIndexStateIT extends ESIntegTestCase { - private final Logger logger = LogManager.getLogger(GatewayIndexStateIT.class); - @Override protected boolean addMockInternalEngine() { // testRecoverBrokenIndexMetadata replies on the flushing on shutdown behavior which can be randomly disabled in MockInternalEngine. diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java index 9b763ea58118..dd22f50ab420 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java @@ -8,8 +8,6 @@ package org.elasticsearch.indices.state; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.support.ActiveShardCount; @@ -27,8 +25,6 @@ import static org.hamcrest.Matchers.notNullValue; @ESIntegTestCase.ClusterScope(minNumDataNodes = 2) public class SimpleIndexStateIT extends ESIntegTestCase { - private final Logger logger = LogManager.getLogger(SimpleIndexStateIT.class); - public void testSimpleOpenClose() { logger.info("--> creating test index"); createIndex("test"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java index bfd16adaa405..fceeb2013b7c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java @@ -8,8 +8,6 @@ package org.elasticsearch.recovery; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.admin.indices.stats.ShardStats; @@ -47,7 +45,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; public class RecoveryWhileUnderLoadIT extends ESIntegTestCase { - private final Logger logger = LogManager.getLogger(RecoveryWhileUnderLoadIT.class); public static final class RetentionLeaseSyncIntervalSettingPlugin extends Plugin { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseAction.java index 444246de7a1b..c8ecbf273c93 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseAction.java @@ -43,7 +43,7 @@ public class TransportVerifyShardBeforeCloseAction extends TransportReplicationA public static final String NAME = CloseIndexAction.NAME + "[s]"; public static final ActionType TYPE = new ActionType<>(NAME, ReplicationResponse::new); - protected Logger logger = LogManager.getLogger(getClass()); + private static final Logger logger = LogManager.getLogger(TransportVerifyShardBeforeCloseAction.class); @Inject public TransportVerifyShardBeforeCloseAction( diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportVerifyShardIndexBlockAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportVerifyShardIndexBlockAction.java index eca4f6a1463b..7daf04f41a9f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportVerifyShardIndexBlockAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportVerifyShardIndexBlockAction.java @@ -7,8 +7,6 @@ */ package org.elasticsearch.action.admin.indices.readonly; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.ActionFilters; @@ -48,7 +46,6 @@ public class TransportVerifyShardIndexBlockAction extends TransportReplicationAc public static final String NAME = AddIndexBlockAction.NAME + "[s]"; public static final ActionType TYPE = new ActionType<>(NAME, ReplicationResponse::new); - protected Logger logger = LogManager.getLogger(getClass()); @Inject public TransportVerifyShardIndexBlockAction( diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java index 30197d102dc4..5686deb6b804 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.admin.indices.shrink; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; @@ -44,7 +42,6 @@ import java.util.Locale; * Main class to initiate resizing (shrink / split) an index into a new index */ public class TransportResizeAction extends TransportMasterNodeAction { - private static final Logger logger = LogManager.getLogger(TransportResizeAction.class); private final MetadataCreateIndexService createIndexService; private final Client client; diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java index f071ffb22fd5..402b41761e3d 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java @@ -21,7 +21,7 @@ import java.util.function.BiConsumer; * Implements the low-level details of bulk request handling */ public final class BulkRequestHandler { - private final Logger logger; + private static final Logger logger = LogManager.getLogger(BulkRequestHandler.class); private final BiConsumer> consumer; private final BulkProcessor.Listener listener; private final Semaphore semaphore; @@ -36,7 +36,6 @@ public final class BulkRequestHandler { int concurrentRequests ) { assert concurrentRequests >= 0; - this.logger = LogManager.getLogger(getClass()); this.consumer = consumer; this.listener = listener; this.concurrentRequests = concurrentRequests; diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/PreVoteCollector.java b/server/src/main/java/org/elasticsearch/cluster/coordination/PreVoteCollector.java index a308a8e0e6c7..b17eb731cfc6 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/PreVoteCollector.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/PreVoteCollector.java @@ -21,7 +21,7 @@ import org.elasticsearch.transport.TransportService; import java.util.function.LongConsumer; public abstract class PreVoteCollector { - private final Logger logger = LogManager.getLogger(PreVoteCollector.class); + private static final Logger logger = LogManager.getLogger(PreVoteCollector.class); // Tuple for simple atomic updates. null until the first call to `update()`. protected volatile Tuple state; // DiscoveryNode component is null if there is currently no known diff --git a/server/src/main/java/org/elasticsearch/common/util/FeatureFlag.java b/server/src/main/java/org/elasticsearch/common/util/FeatureFlag.java index 5bbf7aff906c..1be14026c20c 100644 --- a/server/src/main/java/org/elasticsearch/common/util/FeatureFlag.java +++ b/server/src/main/java/org/elasticsearch/common/util/FeatureFlag.java @@ -36,7 +36,7 @@ import java.util.function.Function; */ public class FeatureFlag { - private final Logger logger = LogManager.getLogger(FeatureFlag.class); + private static final Logger logger = LogManager.getLogger(FeatureFlag.class); private final String name; private final boolean enabled; diff --git a/server/src/main/java/org/elasticsearch/http/HttpTracer.java b/server/src/main/java/org/elasticsearch/http/HttpTracer.java index cf5a53111a9c..2f3d376e3908 100644 --- a/server/src/main/java/org/elasticsearch/http/HttpTracer.java +++ b/server/src/main/java/org/elasticsearch/http/HttpTracer.java @@ -30,7 +30,7 @@ import static org.elasticsearch.core.Strings.format; */ class HttpTracer { - private final Logger logger = LogManager.getLogger(HttpTracer.class); + private static final Logger logger = LogManager.getLogger(HttpTracer.class); private volatile String[] tracerLogInclude; private volatile String[] tracerLogExclude; diff --git a/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java index cf9fbf222fe0..956858f094c9 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java +++ b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java @@ -238,7 +238,6 @@ public class PrimaryReplicaSyncer { } static class SnapshotSender extends AbstractRunnable implements ActionListener { - private final Logger logger; private final SyncAction syncAction; private final ResyncTask task; // to track progress private final String primaryAllocationId; @@ -270,7 +269,6 @@ public class PrimaryReplicaSyncer { Executor executor, ActionListener listener ) { - this.logger = PrimaryReplicaSyncer.logger; this.syncAction = syncAction; this.task = task; this.shardId = shardId; @@ -353,7 +351,7 @@ public class PrimaryReplicaSyncer { maxSeenAutoIdTimestamp, operations.toArray(EMPTY_ARRAY) ); - logger.trace( + PrimaryReplicaSyncer.logger.trace( "{} sending batch of [{}][{}] (total sent: [{}], skipped: [{}])", shardId, operations.size(), @@ -364,7 +362,12 @@ public class PrimaryReplicaSyncer { firstMessage.set(false); syncAction.sync(request, task, primaryAllocationId, primaryTerm, this); } else if (closed.compareAndSet(false, true)) { - logger.trace("{} resync completed (total sent: [{}], skipped: [{}])", shardId, totalSentOps.get(), totalSkippedOps.get()); + PrimaryReplicaSyncer.logger.trace( + "{} resync completed (total sent: [{}], skipped: [{}])", + shardId, + totalSentOps.get(), + totalSkippedOps.get() + ); listener.onResponse(null); } } diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 61430b08143a..bcd5b6015df5 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -335,7 +335,7 @@ public class IndicesService extends AbstractLifecycleComponent } }); this.cleanInterval = INDICES_CACHE_CLEAN_INTERVAL_SETTING.get(settings); - this.cacheCleaner = new CacheCleaner(indicesFieldDataCache, indicesRequestCache, logger, threadPool, this.cleanInterval); + this.cacheCleaner = new CacheCleaner(indicesFieldDataCache, indicesRequestCache, threadPool, this.cleanInterval); this.metaStateService = metaStateService; this.engineFactoryProviders = engineFactoryProviders; @@ -1440,22 +1440,14 @@ public class IndicesService extends AbstractLifecycleComponent private static final class CacheCleaner implements Runnable, Releasable { private final IndicesFieldDataCache cache; - private final Logger logger; private final ThreadPool threadPool; private final TimeValue interval; private final AtomicBoolean closed = new AtomicBoolean(false); private final IndicesRequestCache requestCache; - CacheCleaner( - IndicesFieldDataCache cache, - IndicesRequestCache requestCache, - Logger logger, - ThreadPool threadPool, - TimeValue interval - ) { + CacheCleaner(IndicesFieldDataCache cache, IndicesRequestCache requestCache, ThreadPool threadPool, TimeValue interval) { this.cache = cache; this.requestCache = requestCache; - this.logger = logger; this.threadPool = threadPool; this.interval = interval; } diff --git a/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java index c77cf15a2b2e..cf9378aabb99 100644 --- a/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java +++ b/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java @@ -67,7 +67,7 @@ public final class IndicesFieldDataCache implements RemovalListener getCache() { @@ -107,14 +107,12 @@ public final class IndicesFieldDataCache implements RemovalListener cache; private final Listener[] listeners; - IndexFieldCache(Logger logger, final Cache cache, Index index, String fieldName, Listener... listeners) { - this.logger = logger; + IndexFieldCache(final Cache cache, Index index, String fieldName, Listener... listeners) { this.listeners = listeners; this.index = index; this.fieldName = fieldName; diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsService.java b/server/src/main/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsService.java index 91592d5f8349..07d62fb87fe5 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsService.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsService.java @@ -54,7 +54,7 @@ import static org.elasticsearch.core.Strings.format; import static org.elasticsearch.indices.recovery.RecoverySettings.SNAPSHOT_RECOVERIES_SUPPORTED_VERSION; public class ShardSnapshotsService { - private final Logger logger = LogManager.getLogger(ShardSnapshotsService.class); + private static final Logger logger = LogManager.getLogger(ShardSnapshotsService.class); private final Client client; private final RepositoriesService repositoriesService; diff --git a/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java b/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java index e007cac442f8..ed32bd245977 100644 --- a/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java +++ b/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java @@ -35,7 +35,7 @@ import static org.elasticsearch.xcontent.XContentType.JSON; */ public class NamedComponentReader { - private Logger logger = LogManager.getLogger(NamedComponentReader.class); + private static final Logger logger = LogManager.getLogger(NamedComponentReader.class); private static final String NAMED_COMPONENTS_FILE_NAME = "named_components.json"; /** * a registry of known classes marked or indirectly marked (extending marked class) with @Extensible diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java b/server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java index fe7ff22ec2b3..4efe8e4c1d5a 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java @@ -93,7 +93,7 @@ public class MultiBucketConsumerService { * {@link Aggregator#buildAggregations} and {@link InternalAggregation#reduce}. */ public static class MultiBucketConsumer implements IntConsumer { - private final Logger logger = LogManager.getLogger(MultiBucketConsumer.class); + private static final Logger logger = LogManager.getLogger(MultiBucketConsumer.class); private final int limit; private final CircuitBreaker breaker; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java index c9c30914da33..dff95332d3f1 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java @@ -70,7 +70,7 @@ import static org.elasticsearch.search.aggregations.MultiBucketConsumerService.M public final class CompositeAggregator extends BucketsAggregator implements SizedBucketAggregator { - private final Logger logger = LogManager.getLogger(CompositeAggregator.class); + private static final Logger logger = LogManager.getLogger(CompositeAggregator.class); private final int size; private final List sourceNames; private final int[] reverseMuls; diff --git a/server/src/main/java/org/elasticsearch/transport/TransportKeepAlive.java b/server/src/main/java/org/elasticsearch/transport/TransportKeepAlive.java index 1caa83aa4048..a3bedd518de8 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportKeepAlive.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportKeepAlive.java @@ -48,7 +48,7 @@ final class TransportKeepAlive implements Closeable { } } - private final Logger logger = LogManager.getLogger(TransportKeepAlive.class); + private static final Logger logger = LogManager.getLogger(TransportKeepAlive.class); private final CounterMetric successfulPings = new CounterMetric(); private final CounterMetric failedPings = new CounterMetric(); private final ConcurrentMap pingIntervals = ConcurrentCollections.newConcurrentMap(); diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessor2Tests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessor2Tests.java index 351af06c5e95..30810e85382c 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessor2Tests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessor2Tests.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.bulk; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; @@ -52,7 +50,6 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; public class BulkProcessor2Tests extends ESTestCase { private ThreadPool threadPool; - private final Logger logger = LogManager.getLogger(BulkProcessor2Tests.class); @Before public void startThreadPool() { diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java index 09f79d1e48d0..3e0ddb639089 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.bulk; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; @@ -59,7 +57,6 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; public class BulkProcessorTests extends ESTestCase { private ThreadPool threadPool; - private final Logger logger = LogManager.getLogger(BulkProcessorTests.class); @Before public void startThreadPool() { diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java index 6ce0f722fc0f..d52678925c13 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -39,7 +37,6 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; public class AddIncrementallyTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(AddIncrementallyTests.class); public void testAddNodesAndIndices() { Settings.Builder settings = Settings.builder(); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java index c67671d5b240..be8807292350 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterInfo; @@ -78,7 +76,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class AllocationCommandsTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(AllocationCommandsTests.class); public void testMoveShardCommand() { AllocationService allocation = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java index 02c25c1fd48e..93949d5b5d59 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -54,8 +52,6 @@ import static org.hamcrest.Matchers.sameInstance; public class AwarenessAllocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(AwarenessAllocationTests.class); - public void testMoveShardOnceNewNodeWithAttributeAdded1() { AllocationService strategy = createAllocationService( Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java index d8e1b5841448..0c54673be703 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -39,7 +37,6 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; public class BalanceConfigurationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(BalanceConfigurationTests.class); // TODO maybe we can randomize these numbers somehow final int numberOfNodes = 25; final int numberOfIndices = 12; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java index f0469c528909..328777bfe28e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -38,7 +36,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; public class ClusterRebalanceRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ClusterRebalanceRoutingTests.class); public void testAlways() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java index 10dcfd5f8454..2143f530e2cf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -31,7 +29,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; public class ConcurrentRebalanceRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ConcurrentRebalanceRoutingTests.class); public void testClusterConcurrentRebalance() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java index 2c0400c959ae..2bbc76f0b1bc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -29,7 +27,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; public class ElectReplicaAsPrimaryDuringRelocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ElectReplicaAsPrimaryDuringRelocationTests.class); public void testElectReplicaAsPrimaryDuringRelocation() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java index 8aa00f07b805..a99c77b0be3c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterInfo; import org.elasticsearch.cluster.ClusterName; @@ -34,8 +32,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; public class ExpectedShardSizeAllocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ExpectedShardSizeAllocationTests.class); - public void testInitializingHasExpectedSize() { final long byteSize = randomIntBetween(0, Integer.MAX_VALUE); final ClusterInfo clusterInfo = createClusterInfoWith(new ShardId("test", "_na_", 0), byteSize); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index 43b378c88ccd..d76e9912cef0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequest; @@ -55,7 +53,6 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.hamcrest.Matchers.equalTo; public class FailedNodeRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(FailedNodeRoutingTests.class); public void testSimpleFailedNodeTest() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java index 74926a755634..607d1feeaea5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; @@ -49,7 +47,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class FailedShardsRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(FailedShardsRoutingTests.class); public void testFailedShardPrimaryRelocatingToAndFrom() { AllocationService allocation = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java index 28af4ba0a29a..911769b0115d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -42,7 +40,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class IndexBalanceTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(IndexBalanceTests.class); public void testBalanceAllNodesStarted() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java index c348cdfe43ec..c622a187d09a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; @@ -78,8 +76,6 @@ import static org.hamcrest.core.Is.is; public class NodeVersionAllocationDeciderTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(NodeVersionAllocationDeciderTests.class); - public void testDoNotAllocateFromPrimary() { AllocationService strategy = createAllocationService( Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java index a322e3458371..889b4552407a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -28,7 +26,6 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.hamcrest.Matchers.equalTo; public class PreferPrimaryAllocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(PreferPrimaryAllocationTests.class); public void testPreferPrimaryAllocationOverReplicas() { logger.info("create an allocation with 1 initial recoveries"); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java index 2456bbe41b90..3e18e9c68b6e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -31,7 +29,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; public class PrimaryElectionRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(PrimaryElectionRoutingTests.class); public void testBackupElectionToPrimaryWhenPrimaryCanBeAllocatedToAnotherNode() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java index 35949ecb6810..3edc03da4cb5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -29,8 +27,6 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.hamcrest.Matchers.equalTo; public class PrimaryNotRelocatedWhileBeingRecoveredTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(PrimaryNotRelocatedWhileBeingRecoveredTests.class); - public void testPrimaryNotRelocatedWhileBeingRecoveredFrom() { AllocationService strategy = createAllocationService( Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java index 4e6fe3f9aaee..4471ed678b01 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterInfo; import org.elasticsearch.cluster.ClusterName; @@ -37,7 +35,6 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; public class RebalanceAfterActiveTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(RebalanceAfterActiveTests.class); public void testRebalanceOnlyAfterAllShardsAreActive() { final long[] sizes = new long[5]; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java index fe52e8331f95..2a109cf692ff 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -31,7 +29,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class ReplicaAllocatedAfterPrimaryTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ReplicaAllocatedAfterPrimaryTests.class); public void testBackupIsAllocatedAfterPrimary() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java index e01ae60abc52..2ac230e1ff18 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -29,8 +27,6 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.UNASSIGNED; import static org.hamcrest.Matchers.equalTo; public class ShardVersioningTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ShardVersioningTests.class); - public void testSimple() { AllocationService strategy = createAllocationService( Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java index a52c768b009e..4c68404efccb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -31,7 +29,6 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.hamcrest.Matchers.equalTo; public class ShardsLimitAllocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ShardsLimitAllocationTests.class); public void testIndexLevelShardsLimitAllocate() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java index 3f18d3ef89c4..d8deaff71b78 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -44,7 +42,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class SingleShardNoReplicasRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(SingleShardNoReplicasRoutingTests.class); public void testSingleIndexStartedShard() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java index 5ffcaa7cccd5..62529a9efccb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -31,7 +29,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class SingleShardOneReplicaRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(SingleShardOneReplicaRoutingTests.class); public void testSingleIndexFirstStartPrimaryThenBackups() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java index a198b13cb4d0..bba1271a37be 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -34,7 +32,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class TenShardsOneReplicaRoutingTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(TenShardsOneReplicaRoutingTests.class); public void testSingleIndexFirstStartPrimaryThenBackups() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java index 86b462e989fa..c200d2df90cd 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -59,7 +57,6 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.UNASSIGNED; import static org.hamcrest.Matchers.equalTo; public class ThrottlingAllocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(ThrottlingAllocationTests.class); public void testPrimaryRecoveryThrottling() { diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java index 1a0d41b6f3ee..ef671dab76b1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.cluster.routing.allocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -31,7 +29,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; public class UpdateNumberOfReplicasTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(UpdateNumberOfReplicasTests.class); public void testUpdateNumberOfReplicas() { AllocationService strategy = createAllocationService( diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java index 0edc8c74ab1d..b4cc0709320d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java @@ -10,8 +10,6 @@ package org.elasticsearch.cluster.routing.allocation.decider; import com.carrotsearch.randomizedtesting.generators.RandomPicks; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; @@ -45,8 +43,6 @@ import static org.hamcrest.Matchers.equalTo; public class EnableAllocationTests extends ESAllocationTestCase { - private final Logger logger = LogManager.getLogger(EnableAllocationTests.class); - public void testClusterEnableNone() { AllocationService strategy = createAllocationService( Settings.builder().put(CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING.getKey(), Allocation.NONE.name()).build() diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java index e95a7e378227..f46517b84811 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.snapshots; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SetOnce; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; @@ -1557,8 +1555,6 @@ public class SnapshotResiliencyTests extends ESTestCase { private final class TestClusterNode { - private final Logger logger = LogManager.getLogger(TestClusterNode.class); - private final NamedWriteableRegistry namedWriteableRegistry = new NamedWriteableRegistry( Stream.concat(ClusterModule.getNamedWriteables().stream(), NetworkModule.getNamedWriteables().stream()).toList() ); diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java index fefc0bf428c1..a5c17b32173a 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java @@ -942,7 +942,7 @@ public class AbstractCoordinatorTestCase extends ESTestCase { } public final class ClusterNode { - private final Logger logger = LogManager.getLogger(ClusterNode.class); + private static final Logger logger = LogManager.getLogger(ClusterNode.class); private final int nodeIndex; Coordinator coordinator; diff --git a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java b/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java index 408cf7199c71..00b16625d17a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java +++ b/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; public final class BackgroundIndexer implements AutoCloseable { - private final Logger logger = LogManager.getLogger(getClass()); + private static final Logger logger = LogManager.getLogger(BackgroundIndexer.class); final Thread[] writers; final Client client; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index bd0f2c88c221..8abf10a77376 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -174,7 +174,7 @@ import static org.junit.Assert.fail; */ public final class InternalTestCluster extends TestCluster { - private final Logger logger = LogManager.getLogger(getClass()); + private static final Logger logger = LogManager.getLogger(InternalTestCluster.class); private static final Predicate DATA_NODE_PREDICATE = nodeAndClient -> DiscoveryNode.canContainData( nodeAndClient.node.settings() diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java b/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java index e0b268c4b274..e35e79fd67c2 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java @@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public final class MockEngineSupport { + private static final Logger logger = LogManager.getLogger(Engine.class); + /** * Allows tests to wrap an index reader randomly with a given ratio. This * is disabled by default ie. {@code 0.0d} since reader wrapping is insanely @@ -58,7 +60,6 @@ public final class MockEngineSupport { ); private final AtomicBoolean closing = new AtomicBoolean(false); - private final Logger logger = LogManager.getLogger(Engine.class); private final ShardId shardId; private final InFlightSearchers inFlightSearchers; private final MockContext mockContext; @@ -178,7 +179,7 @@ public final class MockEngineSupport { * early. - good news, stuff will fail all over the place if we don't * get this right here */ - SearcherCloseable closeable = new SearcherCloseable(searcher, logger, inFlightSearchers); + SearcherCloseable closeable = new SearcherCloseable(searcher, inFlightSearchers); return new Engine.Searcher( searcher.source(), reader, @@ -222,12 +223,10 @@ public final class MockEngineSupport { private RuntimeException firstReleaseStack; private final Object lock = new Object(); private final int initialRefCount; - private final Logger logger; private final AtomicBoolean closed = new AtomicBoolean(false); - SearcherCloseable(final Engine.Searcher searcher, Logger logger, InFlightSearchers inFlightSearchers) { + SearcherCloseable(final Engine.Searcher searcher, InFlightSearchers inFlightSearchers) { this.searcher = searcher; - this.logger = logger; initialRefCount = searcher.getIndexReader().getRefCount(); this.inFlightSearchers = inFlightSearchers; assert initialRefCount > 0 diff --git a/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java b/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java index ddbea2c562db..05d6eca0d021 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java @@ -38,7 +38,7 @@ import static org.elasticsearch.test.ESTestCase.copyWriteable; public abstract class DisruptableMockTransport extends MockTransport { private final DiscoveryNode localNode; - private final Logger logger = LogManager.getLogger(DisruptableMockTransport.class); + private static final Logger logger = LogManager.getLogger(DisruptableMockTransport.class); private final DeterministicTaskQueue deterministicTaskQueue; private final List blackholedRequests = new ArrayList<>(); private final Set blockedActions = new HashSet<>(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncResultsService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncResultsService.java index 51818e7d0d08..945084395448 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncResultsService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncResultsService.java @@ -28,7 +28,7 @@ import static org.elasticsearch.core.Strings.format; * is still running and AsyncTaskIndexService if task results already stored there. */ public class AsyncResultsService> { - private final Logger logger = LogManager.getLogger(AsyncResultsService.class); + private static final Logger logger = LogManager.getLogger(AsyncResultsService.class); private final Class asyncTaskClass; private final TaskManager taskManager; private final ClusterService clusterService; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java index 0aa8b55cd061..1eb271143a3b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java @@ -28,7 +28,7 @@ import java.util.function.Consumer; * is still running and AsyncTaskIndexService if task results already stored there. */ public class DeleteAsyncResultsService { - private final Logger logger = LogManager.getLogger(DeleteAsyncResultsService.class); + private static final Logger logger = LogManager.getLogger(DeleteAsyncResultsService.class); private final TaskManager taskManager; private final AsyncTaskIndexService> store; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java index ec99301b9235..1177ff68c34c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java @@ -102,7 +102,7 @@ public final class DocumentSubsetBitsetCache implements IndexReader.ClosedListen private static final BitSet NULL_MARKER = new FixedBitSet(0); - private final Logger logger; + private static final Logger logger = LogManager.getLogger(DocumentSubsetBitsetCache.class); /** * When a {@link BitSet} is evicted from {@link #bitsetCache}, we need to also remove it from {@link #keysByIndex}. @@ -131,8 +131,6 @@ public final class DocumentSubsetBitsetCache implements IndexReader.ClosedListen * it is sometimes necessary to run an asynchronous task to synchronize the internal state. */ protected DocumentSubsetBitsetCache(Settings settings, ExecutorService cleanupExecutor) { - this.logger = LogManager.getLogger(getClass()); - final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock(); this.cacheEvictionLock = new ReleasableLock(readWriteLock.writeLock()); this.cacheModificationLock = new ReleasableLock(readWriteLock.readLock()); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/ApplicationPermission.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/ApplicationPermission.java index f32e6709851d..c85a648761ca 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/ApplicationPermission.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/ApplicationPermission.java @@ -34,7 +34,7 @@ public final class ApplicationPermission { public static final ApplicationPermission NONE = new ApplicationPermission(Collections.emptyList()); - private final Logger logger; + private static final Logger logger = LogManager.getLogger(ApplicationPermission.class); private final List permissions; /** @@ -43,7 +43,6 @@ public final class ApplicationPermission { * applied. The resources are treated as a wildcard {@link Automatons#pattern}. */ ApplicationPermission(List>> privilegesAndResources) { - this.logger = LogManager.getLogger(getClass()); Map permissionsByPrivilege = new HashMap<>(); privilegesAndResources.forEach(tup -> permissionsByPrivilege.compute(tup.v1(), (appPriv, existing) -> { final Set resourceNames = tup.v2(); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java index d8486bcd930e..9b2ce393e5b0 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java @@ -14,8 +14,6 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.logging.LogManager; -import org.elasticsearch.logging.Logger; import org.elasticsearch.xcontent.ConstructingObjectParser; import org.elasticsearch.xcontent.ParseField; import org.elasticsearch.xcontent.ToXContentObject; @@ -56,8 +54,6 @@ public class QueryRule implements Writeable, ToXContentObject { private final List criteria; private final Map actions; - private final Logger logger = LogManager.getLogger(QueryRule.class); - public enum QueryRuleType { PINNED; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java index ad1626fd2f4b..731408d3c6ef 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java @@ -25,8 +25,6 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.license.LicenseUtils; import org.elasticsearch.license.XPackLicenseState; -import org.elasticsearch.logging.LogManager; -import org.elasticsearch.logging.Logger; import org.elasticsearch.xcontent.ConstructingObjectParser; import org.elasticsearch.xcontent.ParseField; import org.elasticsearch.xcontent.XContentBuilder; @@ -69,8 +67,6 @@ public class RuleQueryBuilder extends AbstractQueryBuilder { private final List pinnedDocs; private final Supplier> pinnedDocsSupplier; - private final Logger logger = LogManager.getLogger(RuleQueryBuilder.class); - @Override public TransportVersion getMinimalSupportedVersion() { return TransportVersions.V_8_500_040; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationTemplateService.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationTemplateService.java index e2be554f0589..bed5cc0cacd6 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationTemplateService.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationTemplateService.java @@ -12,8 +12,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; -import org.elasticsearch.logging.LogManager; -import org.elasticsearch.logging.Logger; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.TemplateScript; @@ -35,8 +33,6 @@ public class SearchApplicationTemplateService { private final ScriptService scriptService; private final NamedXContentRegistry xContentRegistry; - private final Logger logger = LogManager.getLogger(SearchApplicationTemplateService.class); - public SearchApplicationTemplateService(ScriptService scriptService, NamedXContentRegistry xContentRegistry) { this.scriptService = scriptService; this.xContentRegistry = xContentRegistry; diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sample/SampleIterator.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sample/SampleIterator.java index b8dde5574530..a96102dad6cf 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sample/SampleIterator.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sample/SampleIterator.java @@ -47,7 +47,7 @@ import static org.elasticsearch.xpack.eql.execution.search.RuntimeUtils.prepareR public class SampleIterator implements Executable { - private final Logger log = LogManager.getLogger(SampleIterator.class); + private static final Logger log = LogManager.getLogger(SampleIterator.class); private final QueryClient client; private final List criteria; diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/SequenceMatcher.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/SequenceMatcher.java index c53c567b2a2f..adb8ee1b43c0 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/SequenceMatcher.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/SequenceMatcher.java @@ -32,7 +32,7 @@ public class SequenceMatcher { private static final String CB_INFLIGHT_LABEL = "sequence_inflight"; private static final String CB_COMPLETED_LABEL = "sequence_completed"; - private final Logger log = LogManager.getLogger(SequenceMatcher.class); + private static final Logger log = LogManager.getLogger(SequenceMatcher.class); static class Stats { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java index bbee76e976f9..d692bc376de0 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java @@ -77,7 +77,7 @@ public class TumblingWindow implements Executable { */ private static final int MISSING_EVENTS_SEQUENCES_CHECK_BATCH_SIZE = 1000; - private final Logger log = LogManager.getLogger(TumblingWindow.class); + private static final Logger log = LogManager.getLogger(TumblingWindow.class); /** * Simple cache for removing duplicate strings (such as index name or common keys). diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/IdentityProviderPlugin.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/IdentityProviderPlugin.java index c4c91dac9a51..7a279e367a0e 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/IdentityProviderPlugin.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/IdentityProviderPlugin.java @@ -7,8 +7,6 @@ package org.elasticsearch.xpack.idp; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; @@ -68,7 +66,6 @@ public class IdentityProviderPlugin extends Plugin implements ActionPlugin { private static final Setting ENABLED_SETTING = Setting.boolSetting("xpack.idp.enabled", false, Setting.Property.NodeScope); - private final Logger logger = LogManager.getLogger(IdentityProviderPlugin.class); private boolean enabled; private Settings settings; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportDeleteSamlServiceProviderAction.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportDeleteSamlServiceProviderAction.java index f3634f96ed7f..d86268db44f6 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportDeleteSamlServiceProviderAction.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportDeleteSamlServiceProviderAction.java @@ -28,7 +28,7 @@ public class TransportDeleteSamlServiceProviderAction extends HandledTransportAc DeleteSamlServiceProviderRequest, DeleteSamlServiceProviderResponse> { - private final Logger logger = LogManager.getLogger(TransportDeleteSamlServiceProviderAction.class); + private static final Logger logger = LogManager.getLogger(TransportDeleteSamlServiceProviderAction.class); private final SamlServiceProviderIndex index; @Inject diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java index 31bcf6f428fe..64193d7e1778 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java @@ -35,7 +35,7 @@ public class TransportPutSamlServiceProviderAction extends HandledTransportActio PutSamlServiceProviderRequest, PutSamlServiceProviderResponse> { - private final Logger logger = LogManager.getLogger(TransportPutSamlServiceProviderAction.class); + private static final Logger logger = LogManager.getLogger(TransportPutSamlServiceProviderAction.class); private final SamlServiceProviderIndex index; private final SamlIdentityProvider identityProvider; private final Clock clock; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnAction.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnAction.java index 9e2826ed572b..a41569920ecf 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnAction.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnAction.java @@ -38,7 +38,7 @@ public class TransportSamlInitiateSingleSignOnAction extends HandledTransportAct SamlInitiateSingleSignOnRequest, SamlInitiateSingleSignOnResponse> { - private final Logger logger = LogManager.getLogger(TransportSamlInitiateSingleSignOnAction.class); + private static final Logger logger = LogManager.getLogger(TransportSamlInitiateSingleSignOnAction.class); private final SecurityContext securityContext; private final SamlIdentityProvider identityProvider; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/ApplicationActionsResolver.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/ApplicationActionsResolver.java index 9d5e7cae6ad3..09635557d0e0 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/ApplicationActionsResolver.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/ApplicationActionsResolver.java @@ -63,7 +63,7 @@ public class ApplicationActionsResolver extends AbstractLifecycleComponent { Setting.Property.NodeScope ); - private final Logger logger = LogManager.getLogger(ApplicationActionsResolver.class); + private static final Logger logger = LogManager.getLogger(ApplicationActionsResolver.class); private final ServiceProviderDefaults defaults; private final Client client; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java index 4ee2b91c5f2f..eeb5e91f29ce 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java @@ -62,7 +62,7 @@ public class UserPrivilegeResolver { } } - private final Logger logger = LogManager.getLogger(UserPrivilegeResolver.class); + private static final Logger logger = LogManager.getLogger(UserPrivilegeResolver.class); private final Client client; private final SecurityContext securityContext; private final ApplicationActionsResolver actionsResolver; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java index 5c83da57f84a..0313040b7e8a 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java @@ -60,7 +60,7 @@ public class SamlAuthnRequestValidator { private final SamlFactory samlFactory; private final SamlIdentityProvider idp; - private final Logger logger = LogManager.getLogger(SamlAuthnRequestValidator.class); + private static final Logger logger = LogManager.getLogger(SamlAuthnRequestValidator.class); private static final String[] XSD_FILES = new String[] { "/org/elasticsearch/xpack/idp/saml/support/saml-schema-protocol-2.0.xsd", "/org/elasticsearch/xpack/idp/saml/support/saml-schema-assertion-2.0.xsd", diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java index c59d99c7171c..5d8cbf260733 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java @@ -53,7 +53,7 @@ import static org.opensaml.saml.saml2.core.NameIDType.TRANSIENT; */ public class SuccessfulAuthenticationResponseMessageBuilder { - private final Logger logger = LogManager.getLogger(SuccessfulAuthenticationResponseMessageBuilder.class); + private static final Logger logger = LogManager.getLogger(SuccessfulAuthenticationResponseMessageBuilder.class); private final Clock clock; private final SamlIdentityProvider idp; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdentityProvider.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdentityProvider.java index e50c83a9af06..76bbcf6d2e0b 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdentityProvider.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdentityProvider.java @@ -33,7 +33,7 @@ import java.util.stream.Stream; */ public class SamlIdentityProvider { - private final Logger logger = LogManager.getLogger(SamlIdentityProvider.class); + private static final Logger logger = LogManager.getLogger(SamlIdentityProvider.class); private final String entityId; private final Map ssoEndpoints; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGenerator.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGenerator.java index fa30825651a6..dc4a9edbf22f 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGenerator.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGenerator.java @@ -34,7 +34,7 @@ public class SamlMetadataGenerator { private final SamlFactory samlFactory; private final SamlIdentityProvider idp; - private final Logger logger = LogManager.getLogger(SamlMetadataGenerator.class); + private static final Logger logger = LogManager.getLogger(SamlMetadataGenerator.class); public SamlMetadataGenerator(SamlFactory samlFactory, SamlIdentityProvider idp) { this.samlFactory = samlFactory; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java index 558ac9a20dc0..2291061af3e9 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java @@ -65,7 +65,7 @@ import java.util.stream.Stream; */ public class SamlServiceProviderIndex implements Closeable { - private final Logger logger = LogManager.getLogger(SamlServiceProviderIndex.class); + private static final Logger logger = LogManager.getLogger(SamlServiceProviderIndex.class); private final Client client; private final ClusterService clusterService; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/process/MlMemoryTracker.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/process/MlMemoryTracker.java index 7fc61172a5b7..5ba577eb90ab 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/process/MlMemoryTracker.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/process/MlMemoryTracker.java @@ -71,7 +71,7 @@ public class MlMemoryTracker implements LocalNodeMasterListener { private static final Duration RECENT_UPDATE_THRESHOLD = Duration.ofMinutes(1); private static final Duration DEFAULT_AUTOSCALING_CHECK_INTERVAL = Duration.ofMinutes(5); - private final Logger logger = LogManager.getLogger(MlMemoryTracker.class); + private static final Logger logger = LogManager.getLogger(MlMemoryTracker.class); private final Map memoryRequirementByAnomalyDetectorJob = new ConcurrentHashMap<>(); private final Map memoryRequirementByDataFrameAnalyticsJob = new ConcurrentHashMap<>(); private final Map> memoryRequirementByTaskName; diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/ssl/SSLReloadDuringStartupIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/ssl/SSLReloadDuringStartupIntegTests.java index 252cbea619ee..44f7a6d47e36 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/ssl/SSLReloadDuringStartupIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/ssl/SSLReloadDuringStartupIntegTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.ssl; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.util.Strings; import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.Settings; @@ -35,7 +33,6 @@ import java.util.concurrent.CountDownLatch; * by verifying if the cluster goes back to normal. */ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { - private final Logger LOGGER = LogManager.getLogger(SSLReloadDuringStartupIntegTests.class); private final String goodKeyStoreFilePath = "/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks"; private final String badKeyStoreFilePath = "/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode_updated.jks"; @@ -100,18 +97,18 @@ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { final Path badKeystorePath = getDataPath(badKeyStoreFilePath); // stop a node, and apply this bad keystore final Path goodKeystorePath = getDataPath(goodKeyStoreFilePath); // start the node, and apply this good keystore assertTrue(Files.exists(nodeKeystorePath)); - LOGGER.trace("Stopping node [{}] in {}-node cluster {}...", nodeName, nodeNames.length, nodeNames); + logger.trace("Stopping node [{}] in {}-node cluster {}...", nodeName, nodeNames.length, nodeNames); final long stopNanos = System.nanoTime(); internalCluster().restartNode(nodeName, new RestartCallback() { @Override public Settings onNodeStopped(String nodeName) throws Exception { - LOGGER.debug("Node [{}] stopped in {}ms.", nodeName, TimeValue.timeValueNanos(System.nanoTime() - stopNanos).millisFrac()); + logger.debug("Node [{}] stopped in {}ms.", nodeName, TimeValue.timeValueNanos(System.nanoTime() - stopNanos).millisFrac()); atomicCopyIfPossible(badKeystorePath, nodeKeystorePath); final Thread fixKeystoreThread = new Thread(() -> { waitUntilNodeStartupIsReadyToBegin(beforeKeystoreFix); // SYNC: Cert update & ES restart try { atomicCopyIfPossible(goodKeystorePath, nodeKeystorePath); - LOGGER.trace("Waiting for ES restart..."); + logger.trace("Waiting for ES restart..."); afterKeystoreFix.countDown(); // SYNC: Cert update & ES restart } catch (IOException e) { throw new UncheckedIOException(e); @@ -123,30 +120,30 @@ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { return super.onNodeStopped(nodeName); // ASSUME: RestartCallback will do ES start next } }); - LOGGER.trace("Waiting for keystore fix..."); - timed(LOGGER, Level.DEBUG, "Awaited {}ms. Verifying the cluster...", () -> { + logger.trace("Waiting for keystore fix..."); + timed(Level.DEBUG, "Awaited {}ms. Verifying the cluster...", () -> { try { afterKeystoreFix.await(); // SYNC: Verify cluster after cert update } catch (InterruptedException e) { throw new RuntimeException(e); } }); - timed(LOGGER, Level.TRACE, "Ensure cluster size consistency took {}ms.", this::ensureClusterSizeConsistency); - timed(LOGGER, Level.TRACE, "Ensure fully connected cluster took {}ms.", this::ensureFullyConnectedCluster); + timed(Level.TRACE, "Ensure cluster size consistency took {}ms.", this::ensureClusterSizeConsistency); + timed(Level.TRACE, "Ensure fully connected cluster took {}ms.", this::ensureFullyConnectedCluster); } private void waitUntilNodeStartupIsReadyToBegin(final CountDownLatch beforeKeystoreFix) { - LOGGER.trace("Waiting for ES start to begin..."); + logger.trace("Waiting for ES start to begin..."); beforeKeystoreFix.countDown(); // SYNC: Cert update & ES restart final long sleepMillis = randomLongBetween(1L, 2000L); // intended sleepMillis - timed(LOGGER, Level.DEBUG, "Awaited {}ms. Sleeping " + sleepMillis + "ms before fixing...", () -> { + timed(Level.DEBUG, "Awaited {}ms. Sleeping " + sleepMillis + "ms before fixing...", () -> { try { beforeKeystoreFix.await(); // SYNC: Cert update & ES restart } catch (InterruptedException e) { Thread.currentThread().interrupt(); } }); - timed(LOGGER, Level.DEBUG, "Slept {}ms, intended " + sleepMillis + "ms. Fixing can start now...", () -> { + timed(Level.DEBUG, "Slept {}ms, intended " + sleepMillis + "ms. Fixing can start now...", () -> { try { Thread.sleep(sleepMillis); // Simulate cert update delay relative to ES start } catch (InterruptedException e) { @@ -156,9 +153,9 @@ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { } private void waitUntilFixKeystoreIsReadyToBegin(final CountDownLatch beforeKeystoreFix) { - LOGGER.trace("Waiting for keystore fix to begin..."); + logger.trace("Waiting for keystore fix to begin..."); beforeKeystoreFix.countDown(); // SYNC: Cert update & ES restart - timed(LOGGER, Level.DEBUG, "Awaited {}ms. Node can start now...", () -> { + timed(Level.DEBUG, "Awaited {}ms. Node can start now...", () -> { try { beforeKeystoreFix.await(); // SYNC: Cert update & ES restart } catch (InterruptedException e) { @@ -167,8 +164,7 @@ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { }); } - static void timed(final Logger LOGGER, final Level level, final String message, final Runnable runnable) { - assert LOGGER != null; + private void timed(final Level level, final String message, final Runnable runnable) { assert level != null; assert Strings.isEmpty(message) == false; assert message.contains("{}ms") : "Message must contain {}ms"; @@ -178,7 +174,7 @@ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { try { runnable.run(); } finally { - LOGGER.log(level, message, TimeValue.timeValueNanos(System.nanoTime() - startNanos).millisFrac()); + logger.log(level, message, TimeValue.timeValueNanos(System.nanoTime() - startNanos).millisFrac()); } } @@ -191,16 +187,16 @@ public class SSLReloadDuringStartupIntegTests extends SecurityIntegTestCase { * @throws IOException Cannot create temp file, or copy source file to temp file, or non-atomic move temp file to target file. */ private void atomicCopyIfPossible(Path source, Path target) throws IOException { - LOGGER.trace("Copying [{}] to [{}]", source, target); + logger.trace("Copying [{}] to [{}]", source, target); Path tmp = createTempFile(); - LOGGER.trace("Created temporary file [{}]", tmp); + logger.trace("Created temporary file [{}]", tmp); Files.copy(source, tmp, StandardCopyOption.REPLACE_EXISTING); try { Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE); - LOGGER.debug("Atomic move succeeded from [{}] to [{}]", tmp, target); + logger.debug("Atomic move succeeded from [{}] to [{}]", tmp, target); } catch (AtomicMoveNotSupportedException e) { Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING); - LOGGER.debug("Non-atomic move succeeded from [{}] to [{}]", tmp, target); + logger.debug("Non-atomic move succeeded from [{}] to [{}]", tmp, target); } } } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DelegatedAuthorizationSupport.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DelegatedAuthorizationSupport.java index c18428837965..7388b668563b 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DelegatedAuthorizationSupport.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DelegatedAuthorizationSupport.java @@ -41,7 +41,7 @@ import static org.elasticsearch.xpack.core.security.authc.support.DelegatedAutho public class DelegatedAuthorizationSupport { private final RealmUserLookup lookup; - private final Logger logger; + private static final Logger logger = LogManager.getLogger(DelegatedAuthorizationSupport.class); private final XPackLicenseState licenseState; /** @@ -74,7 +74,6 @@ public class DelegatedAuthorizationSupport { final List resolvedLookupRealms = resolveRealms(allRealms, lookupRealms); checkForRealmChains(resolvedLookupRealms, settings); this.lookup = new RealmUserLookup(resolvedLookupRealms, threadContext); - this.logger = LogManager.getLogger(getClass()); this.licenseState = licenseState; } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecondaryAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecondaryAuthenticator.java index 008aa9df6bdd..ca09d6fafbe4 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecondaryAuthenticator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecondaryAuthenticator.java @@ -37,7 +37,7 @@ public class SecondaryAuthenticator { */ public static final String SECONDARY_AUTH_HEADER_NAME = "es-secondary-authorization"; - private final Logger logger = LogManager.getLogger(SecondaryAuthenticator.class); + private static final Logger logger = LogManager.getLogger(SecondaryAuthenticator.class); private final SecurityContext securityContext; private final AuthenticationService authenticationService; private final AuditTrailService auditTrailService; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/ingest/SetSecurityUserProcessor.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/ingest/SetSecurityUserProcessor.java index ca8ab469ce74..62a1a1466ec8 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/ingest/SetSecurityUserProcessor.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/ingest/SetSecurityUserProcessor.java @@ -40,7 +40,7 @@ public final class SetSecurityUserProcessor extends AbstractProcessor { public static final String TYPE = "set_security_user"; - private final Logger logger = LogManager.getLogger(SetSecurityUserProcessor.class); + private static final Logger logger = LogManager.getLogger(SetSecurityUserProcessor.class); private final SecurityContext securityContext; private final Settings settings; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/NativeRoleBaseRestHandler.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/NativeRoleBaseRestHandler.java index 7a7fa306ede2..773d0a8a5ecf 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/NativeRoleBaseRestHandler.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/NativeRoleBaseRestHandler.java @@ -19,7 +19,7 @@ import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; abstract class NativeRoleBaseRestHandler extends SecurityBaseRestHandler { - private final Logger logger = LogManager.getLogger(NativeRoleBaseRestHandler.class); + private static final Logger logger = LogManager.getLogger(NativeRoleBaseRestHandler.class); NativeRoleBaseRestHandler(Settings settings, XPackLicenseState licenseState) { super(settings, licenseState); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/NativeUserBaseRestHandler.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/NativeUserBaseRestHandler.java index 2c1056d33d02..b367a528628e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/NativeUserBaseRestHandler.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/NativeUserBaseRestHandler.java @@ -19,7 +19,7 @@ import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; abstract class NativeUserBaseRestHandler extends SecurityBaseRestHandler { - private final Logger logger = LogManager.getLogger(NativeUserBaseRestHandler.class); + private static final Logger logger = LogManager.getLogger(NativeUserBaseRestHandler.class); NativeUserBaseRestHandler(Settings settings, XPackLicenseState licenseState) { super(settings, licenseState); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java index 3213f990d56b..22aa7e296d6e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java @@ -52,7 +52,7 @@ public class SecuritySystemIndices { public static final String SECURITY_PROFILE_ALIAS = ".security-profile"; public static final Version VERSION_SECURITY_PROFILE_ORIGIN = Version.V_8_3_0; - private final Logger logger = LogManager.getLogger(SecuritySystemIndices.class); + private static final Logger logger = LogManager.getLogger(SecuritySystemIndices.class); private final SystemIndexDescriptor mainDescriptor; private final SystemIndexDescriptor tokenDescriptor; diff --git a/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java b/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java index 5e93003b04aa..f58c6599050d 100644 --- a/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java +++ b/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java @@ -37,7 +37,7 @@ import static org.elasticsearch.core.Strings.format; import static org.elasticsearch.indices.recovery.RecoverySettings.SEQ_NO_SNAPSHOT_RECOVERIES_SUPPORTED_VERSION; public class SnapshotsRecoveryPlannerService implements RecoveryPlannerService { - private final Logger logger = LogManager.getLogger(SnapshotsRecoveryPlannerService.class); + private static final Logger logger = LogManager.getLogger(SnapshotsRecoveryPlannerService.class); private final ShardSnapshotsService shardSnapshotsService; private final BooleanSupplier isLicenseActive; diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java index b29dfa182cb2..32347b5d2624 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java @@ -6,8 +6,6 @@ */ package org.elasticsearch.xpack.watcher.watch; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.search.SearchRequest; @@ -158,7 +156,6 @@ public class WatchTests extends ESTestCase { private TextTemplateEngine templateEngine; private HtmlSanitizer htmlSanitizer; private XPackLicenseState licenseState; - private Logger logger; private Settings settings = Settings.EMPTY; private WatcherSearchTemplateService searchTemplateService; @@ -172,7 +169,6 @@ public class WatchTests extends ESTestCase { templateEngine = mock(TextTemplateEngine.class); htmlSanitizer = mock(HtmlSanitizer.class); licenseState = mock(XPackLicenseState.class); - logger = LogManager.getLogger(WatchTests.class); searchTemplateService = mock(WatcherSearchTemplateService.class); }