Logging: Drop Settings from security logger get calls (#33940)

`Settings` is no longer required to get a `Logger` and we went to quite
a bit of effort to pass it to the `Logger` getters. This removes the
`Settings` from all of the logger fetches in security and x-pack:core.

Author: nik9000

x-pack/plugin/core/src/main/java/org/elasticsearch/license/StartupSelfGeneratedLicenseTask.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.license;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
 import org.elasticsearch.Version;
@@ -14,14 +15,14 @@
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.xpack.core.XPackPlugin;
 
 import java.time.Clock;
 import java.util.UUID;
 
 public class StartupSelfGeneratedLicenseTask extends ClusterStateUpdateTask {
+    private static final Logger logger = LogManager.getLogger(StartupSelfGeneratedLicenseTask.class);
 
     /**
      * Max number of nodes licensed by generated trial license
@@ -31,13 +32,11 @@ public class StartupSelfGeneratedLicenseTask extends ClusterStateUpdateTask {
     private final Settings settings;
     private final Clock clock;
     private final ClusterService clusterService;
-    private final Logger logger;
 
     public StartupSelfGeneratedLicenseTask(Settings settings, Clock clock, ClusterService clusterService) {
         this.settings = settings;
         this.clock = clock;
         this.clusterService = clusterService;
-        this.logger = Loggers.getLogger(getClass(), settings);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityContext.java

@@ -6,8 +6,8 @@
 package org.elasticsearch.xpack.core.security;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.Version;
-import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.util.concurrent.ThreadContext.StoredContext;
@@ -23,8 +23,8 @@
  * A lightweight utility that can find the current user and authentication information for the local thread.
  */
 public class SecurityContext {
+    private final Logger logger = LogManager.getLogger(SecurityContext.class);
 
-    private final Logger logger;
     private final ThreadContext threadContext;
     private final UserSettings userSettings;
     private final String nodeName;
@@ -35,9 +35,8 @@ public class SecurityContext {
      * and {@link UserSettings#getAuthentication()} will always return null.
      */
     public SecurityContext(Settings settings, ThreadContext threadContext) {
-        this.logger = Loggers.getLogger(getClass(), settings);
         this.threadContext = threadContext;
-        this.userSettings = new UserSettings(settings, threadContext);
+        this.userSettings = new UserSettings(threadContext);
         this.nodeName = Node.NODE_NAME_SETTING.get(settings);
     }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/UserSettings.java

@@ -6,24 +6,22 @@
 package org.elasticsearch.xpack.core.security;
 
 import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.xpack.core.security.authc.Authentication;
 import org.elasticsearch.xpack.core.security.user.User;
 
 import java.io.IOException;
 
 public final class UserSettings {
-    private final Logger logger;
+    private final Logger logger = LogManager.getLogger(UserSettings.class);
+
     private final ThreadContext threadContext;
 
-    UserSettings(Settings settings, ThreadContext threadContext) {
-        this.logger = Loggers.getLogger(getClass(), settings);
+    UserSettings(ThreadContext threadContext) {
         this.threadContext = threadContext;
     }
 
-
     /**
      * Returns the current user information, or null if the current request has no authentication info.
      */

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Realm.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.xpack.core.security.authc;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.license.XPackLicenseState;
@@ -25,7 +26,7 @@
  */
 public abstract class Realm implements Comparable<Realm> {
 
-    protected final Logger logger;
+    protected final Logger logger = LogManager.getLogger(getClass());
     protected final String type;
 
     public String getType() {
@@ -37,7 +38,6 @@ public String getType() {
     public Realm(String type, RealmConfig config) {
         this.type = type;
         this.config = config;
-        this.logger = config.logger(getClass());
     }
 
     /**

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/RealmConfig.java

@@ -5,8 +5,6 @@
  */
 package org.elasticsearch.xpack.core.security.authc;
 
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.env.Environment;
@@ -59,10 +57,6 @@ public Settings globalSettings() {
         return globalSettings;
     }
 
-    public Logger logger(Class clazz) {
-        return Loggers.getLogger(clazz, globalSettings);
-    }
-
     public Environment env() {
         return env;
     }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.xpack.core.security.authz.accesscontrol;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.BooleanQuery;
@@ -30,14 +31,12 @@
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.logging.LoggerMessageFormat;
-import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
 import org.elasticsearch.index.engine.EngineException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -89,19 +88,18 @@
  * instance.
  */
 public class SecurityIndexSearcherWrapper extends IndexSearcherWrapper {
+    private static final Logger logger = LogManager.getLogger(SecurityIndexSearcherWrapper.class);
 
     private final Function<ShardId, QueryShardContext> queryShardContextProvider;
     private final BitsetFilterCache bitsetFilterCache;
     private final XPackLicenseState licenseState;
     private final ThreadContext threadContext;
-    private final Logger logger;
     private final ScriptService scriptService;
 
-    public SecurityIndexSearcherWrapper(IndexSettings indexSettings, Function<ShardId, QueryShardContext> queryShardContextProvider,
+    public SecurityIndexSearcherWrapper(Function<ShardId, QueryShardContext> queryShardContextProvider,
                                         BitsetFilterCache bitsetFilterCache, ThreadContext threadContext, XPackLicenseState licenseState,
                                         ScriptService scriptService) {
         this.scriptService = scriptService;
-        this.logger = Loggers.getLogger(getClass(), indexSettings.getSettings());
         this.queryShardContextProvider = queryShardContextProvider;
         this.bitsetFilterCache = bitsetFilterCache;
         this.threadContext = threadContext;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustConfig.java

@@ -30,12 +30,10 @@
 public final class RestrictedTrustConfig extends TrustConfig {
 
     private static final String RESTRICTIONS_KEY_SUBJECT_NAME = "trust.subject_name";
-    private final Settings settings;
     private final String groupConfigPath;
     private final TrustConfig delegate;
 
-    RestrictedTrustConfig(Settings settings, String groupConfigPath, TrustConfig delegate) {
-        this.settings = settings;
+    RestrictedTrustConfig(String groupConfigPath, TrustConfig delegate) {
         this.groupConfigPath = Objects.requireNonNull(groupConfigPath);
         this.delegate = Objects.requireNonNull(delegate);
     }
@@ -45,7 +43,7 @@ RestrictedTrustManager createTrustManager(@Nullable Environment environment) {
         try {
             final X509ExtendedTrustManager delegateTrustManager = delegate.createTrustManager(environment);
             final CertificateTrustRestrictions trustGroupConfig = readTrustGroup(resolveGroupConfigPath(environment));
-            return new RestrictedTrustManager(settings, delegateTrustManager, trustGroupConfig);
+            return new RestrictedTrustManager(delegateTrustManager, trustGroupConfig);
         } catch (IOException e) {
             throw new ElasticsearchException("failed to initialize TrustManager for {}", e, toString());
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustManager.java

@@ -6,9 +6,8 @@
 package org.elasticsearch.xpack.core.ssl;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.X509ExtendedTrustManager;
@@ -35,15 +34,14 @@
  * The underlying certificate validation is delegated to another TrustManager.
  */
 public final class RestrictedTrustManager extends X509ExtendedTrustManager {
-
+    private static final Logger logger = LogManager.getLogger(RestrictedTrustManager.class);
     private static final String CN_OID = "2.5.4.3";
     private static final int SAN_CODE_OTHERNAME = 0;
-    private final Logger logger;
+
     private final X509ExtendedTrustManager delegate;
     private final CertificateTrustRestrictions trustRestrictions;
 
-    public RestrictedTrustManager(Settings settings, X509ExtendedTrustManager delegate, CertificateTrustRestrictions restrictions) {
-        this.logger = Loggers.getLogger(getClass(), settings);
+    public RestrictedTrustManager(X509ExtendedTrustManager delegate, CertificateTrustRestrictions restrictions) {
         this.delegate = delegate;
         this.trustRestrictions = restrictions;
         logger.debug("Configured with trust restrictions: [{}]", restrictions);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SSLConfiguration.java

@@ -206,7 +206,7 @@ private static KeyConfig createKeyConfig(Settings settings, SSLConfiguration glo
     private static TrustConfig createTrustConfig(Settings settings, KeyConfig keyConfig, SSLConfiguration global) {
         final TrustConfig trustConfig = createCertChainTrustConfig(settings, keyConfig, global);
         return SETTINGS_PARSER.trustRestrictionsPath.get(settings)
-                .map(path -> (TrustConfig) new RestrictedTrustConfig(settings, path, trustConfig))
+                .map(path -> (TrustConfig) new RestrictedTrustConfig(path, trustConfig))
                 .orElse(trustConfig);
     }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/TransformRegistry.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.core.watcher.transform;
 
 import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.transform.chain.ChainTransform;
 import org.elasticsearch.xpack.core.watcher.transform.chain.ChainTransformFactory;
@@ -20,9 +19,9 @@ public class TransformRegistry {
 
     private final Map<String, TransformFactory> factories;
 
-    public TransformRegistry(Settings settings, Map<String, TransformFactory> factories) {
+    public TransformRegistry(Map<String, TransformFactory> factories) {
         Map<String, TransformFactory> map = new HashMap<>(factories);
-        map.put(ChainTransform.TYPE, new ChainTransformFactory(settings, this));
+        map.put(ChainTransform.TYPE, new ChainTransformFactory(this));
         this.factories = Collections.unmodifiableMap(map);
     }