Logging: Drop remaining Settings log ctor (#34149)

Drops the last logging constructor that takes `Settings` because it is
no longer needed.

Watcher goes through a lot of effort to pass `Settings` to `Logger`
constructors and dropping `Settings` from all of those calls allowed us
to remove quite a bit of log-based ceremony from watcher.

Author: nik9000

plugins/discovery-file/src/main/java/org/elasticsearch/discovery/file/FileBasedDiscoveryPlugin.java

@@ -22,7 +22,6 @@
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.network.NetworkService;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.discovery.zen.UnicastHostsProvider;
 import org.elasticsearch.plugins.DiscoveryPlugin;
 import org.elasticsearch.plugins.Plugin;
@@ -38,8 +37,8 @@ public class FileBasedDiscoveryPlugin extends Plugin implements DiscoveryPlugin
     static final String DEPRECATION_MESSAGE
         = "File-based discovery is now built into Elasticsearch and does not require the discovery-file plugin";
 
-    public FileBasedDiscoveryPlugin(Settings settings) {
-        deprecationLogger = new DeprecationLogger(Loggers.getLogger(this.getClass(), settings));
+    public FileBasedDiscoveryPlugin() {
+        deprecationLogger = new DeprecationLogger(Loggers.getLogger(this.getClass()));
     }
 
     @Override

plugins/discovery-file/src/test/java/org/elasticsearch/discovery/file/FileBasedDiscoveryPluginDeprecationTests.java

@@ -19,14 +19,13 @@
 
 package org.elasticsearch.discovery.file;
 
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.ESTestCase;
 
 import static org.elasticsearch.discovery.file.FileBasedDiscoveryPlugin.DEPRECATION_MESSAGE;
 
 public class FileBasedDiscoveryPluginDeprecationTests extends ESTestCase {
     public void testDeprecationWarning() {
-        new FileBasedDiscoveryPlugin(Settings.EMPTY).getZenHostsProviders(null, null);
+        new FileBasedDiscoveryPlugin().getZenHostsProviders(null, null);
         assertWarnings(DEPRECATION_MESSAGE);
     }
 }

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

@@ -28,7 +28,6 @@
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.elasticsearch.common.settings.Setting;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.shard.ShardId;
 
@@ -65,16 +64,6 @@ public static Logger getLogger(Class<?> clazz, Index index, String... prefixes)
         return getLogger(clazz, asArrayList(Loggers.SPACE, index.getName(), prefixes).toArray(new String[0]));
     }
 
-    /**
-     * Get a logger.
-     * @deprecated prefer {@link #getLogger(Class, String...)} or {@link LogManager#getLogger}
-     *     as the Settings is no longer needed
-     */
-    @Deprecated
-    public static Logger getLogger(Class<?> clazz, Settings settings, String... prefixes) {
-        return ESLoggerFactory.getLogger(formatPrefix(prefixes), clazz);
-    }
-
     public static Logger getLogger(Class<?> clazz, String... prefixes) {
         return ESLoggerFactory.getLogger(formatPrefix(prefixes), clazz);
     }

server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java

@@ -455,7 +455,7 @@ public IndexAnalyzers build(IndexSettings indexSettings,
 
         Index index = indexSettings.getIndex();
         analyzerProviders = new HashMap<>(analyzerProviders);
-        Logger logger = Loggers.getLogger(getClass(), indexSettings.getSettings());
+        Logger logger = Loggers.getLogger(getClass());
         DeprecationLogger deprecationLogger = new DeprecationLogger(logger);
         Map<String, NamedAnalyzer> analyzerAliases = new HashMap<>();
         Map<String, NamedAnalyzer> analyzers = new HashMap<>();

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/input/ExecutableInput.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.watcher.input;
 
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -17,11 +16,9 @@
 public abstract class ExecutableInput<I extends Input, R extends Input.Result> implements ToXContentObject {
 
     protected final I input;
-    protected final Logger logger;
 
-    protected ExecutableInput(I input, Logger logger) {
+    protected ExecutableInput(I input) {
         this.input = input;
-        this.logger = logger;
     }
 
     /**

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java

@@ -330,32 +330,32 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
 
         final ConditionRegistry conditionRegistry = new ConditionRegistry(Collections.unmodifiableMap(parsers), getClock());
         final Map<String, TransformFactory> transformFactories = new HashMap<>();
-        transformFactories.put(ScriptTransform.TYPE, new ScriptTransformFactory(settings, scriptService));
+        transformFactories.put(ScriptTransform.TYPE, new ScriptTransformFactory(scriptService));
         transformFactories.put(SearchTransform.TYPE, new SearchTransformFactory(settings, client, xContentRegistry, scriptService));
         final TransformRegistry transformRegistry = new TransformRegistry(Collections.unmodifiableMap(transformFactories));
 
         // actions
         final Map<String, ActionFactory> actionFactoryMap = new HashMap<>();
         actionFactoryMap.put(EmailAction.TYPE, new EmailActionFactory(settings, emailService, templateEngine, emailAttachmentsParser));
-        actionFactoryMap.put(WebhookAction.TYPE, new WebhookActionFactory(settings, httpClient, templateEngine));
+        actionFactoryMap.put(WebhookAction.TYPE, new WebhookActionFactory(httpClient, templateEngine));
         actionFactoryMap.put(IndexAction.TYPE, new IndexActionFactory(settings, client));
         actionFactoryMap.put(LoggingAction.TYPE, new LoggingActionFactory(templateEngine));
-        actionFactoryMap.put(HipChatAction.TYPE, new HipChatActionFactory(settings, templateEngine, hipChatService));
-        actionFactoryMap.put(JiraAction.TYPE, new JiraActionFactory(settings, templateEngine, jiraService));
-        actionFactoryMap.put(SlackAction.TYPE, new SlackActionFactory(settings, templateEngine, slackService));
-        actionFactoryMap.put(PagerDutyAction.TYPE, new PagerDutyActionFactory(settings, templateEngine, pagerDutyService));
+        actionFactoryMap.put(HipChatAction.TYPE, new HipChatActionFactory(templateEngine, hipChatService));
+        actionFactoryMap.put(JiraAction.TYPE, new JiraActionFactory(templateEngine, jiraService));
+        actionFactoryMap.put(SlackAction.TYPE, new SlackActionFactory(templateEngine, slackService));
+        actionFactoryMap.put(PagerDutyAction.TYPE, new PagerDutyActionFactory(templateEngine, pagerDutyService));
         final ActionRegistry registry =
                 new ActionRegistry(actionFactoryMap, conditionRegistry, transformRegistry, getClock(), getLicenseState());
 
         // inputs
         final Map<String, InputFactory> inputFactories = new HashMap<>();
         inputFactories.put(SearchInput.TYPE, new SearchInputFactory(settings, client, xContentRegistry, scriptService));
-        inputFactories.put(SimpleInput.TYPE, new SimpleInputFactory(settings));
+        inputFactories.put(SimpleInput.TYPE, new SimpleInputFactory());
         inputFactories.put(HttpInput.TYPE, new HttpInputFactory(settings, httpClient, templateEngine));
-        inputFactories.put(NoneInput.TYPE, new NoneInputFactory(settings));
-        inputFactories.put(TransformInput.TYPE, new TransformInputFactory(settings, transformRegistry));
-        final InputRegistry inputRegistry = new InputRegistry(settings, inputFactories);
-        inputFactories.put(ChainInput.TYPE, new ChainInputFactory(settings, inputRegistry));
+        inputFactories.put(NoneInput.TYPE, new NoneInputFactory());
+        inputFactories.put(TransformInput.TYPE, new TransformInputFactory(transformRegistry));
+        final InputRegistry inputRegistry = new InputRegistry(inputFactories);
+        inputFactories.put(ChainInput.TYPE, new ChainInputFactory(inputRegistry));
 
         bulkProcessor = BulkProcessor.builder(ClientHelper.clientWithOrigin(client, WATCHER_ORIGIN), new BulkProcessor.Listener() {
             @Override
@@ -457,7 +457,7 @@ protected WatchExecutor getWatchExecutor(ThreadPool threadPool) {
     }
 
     protected Consumer<Iterable<TriggerEvent>> getTriggerEngineListener(ExecutionService executionService) {
-        return new AsyncTriggerEventConsumer(settings, executionService);
+        return new AsyncTriggerEventConsumer(executionService);
     }
 
     @Override

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.actions.email;
 
-import org.elasticsearch.common.logging.Loggers;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.actions.ActionFactory;
@@ -25,7 +25,7 @@ public class EmailActionFactory extends ActionFactory {
 
     public EmailActionFactory(Settings settings, EmailService emailService, TextTemplateEngine templateEngine,
                               EmailAttachmentsParser emailAttachmentsParser) {
-        super(Loggers.getLogger(ExecutableEmailAction.class, settings));
+        super(LogManager.getLogger(ExecutableEmailAction.class));
         this.emailService = emailService;
         this.templateEngine = templateEngine;
         this.htmlSanitizer = new HtmlSanitizer(settings);

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java

@@ -5,8 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.actions.hipchat;
 
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.actions.ActionFactory;
 import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
@@ -20,8 +19,8 @@ public class HipChatActionFactory extends ActionFactory {
     private final TextTemplateEngine templateEngine;
     private final HipChatService hipchatService;
 
-    public HipChatActionFactory(Settings settings, TextTemplateEngine templateEngine, HipChatService hipchatService) {
-        super(Loggers.getLogger(ExecutableHipChatAction.class, settings));
+    public HipChatActionFactory(TextTemplateEngine templateEngine, HipChatService hipchatService) {
+        super(LogManager.getLogger(ExecutableHipChatAction.class));
         this.templateEngine = templateEngine;
         this.hipchatService = hipchatService;
     }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.watcher.actions.index;
 
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -21,7 +21,7 @@ public class IndexActionFactory extends ActionFactory {
     private final TimeValue bulkDefaultTimeout;
 
     public IndexActionFactory(Settings settings, Client client) {
-        super(Loggers.getLogger(IndexActionFactory.class, settings));
+        super(LogManager.getLogger(IndexActionFactory.class));
         this.client = client;
         this.indexDefaultTimeout = settings.getAsTime("xpack.watcher.actions.index.default_timeout", TimeValue.timeValueSeconds(30));
         this.bulkDefaultTimeout = settings.getAsTime("xpack.watcher.actions.bulk.default_timeout", TimeValue.timeValueMinutes(1));

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/jira/JiraActionFactory.java

@@ -5,8 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.actions.jira;
 
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.actions.ActionFactory;
 import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
@@ -19,8 +18,8 @@ public class JiraActionFactory extends ActionFactory {
     private final TextTemplateEngine templateEngine;
     private final JiraService jiraService;
 
-    public JiraActionFactory(Settings settings, TextTemplateEngine templateEngine, JiraService jiraService) {
-        super(Loggers.getLogger(ExecutableJiraAction.class, settings));
+    public JiraActionFactory(TextTemplateEngine templateEngine, JiraService jiraService) {
+        super(LogManager.getLogger(ExecutableJiraAction.class));
         this.templateEngine = templateEngine;
         this.jiraService = jiraService;
     }