Logging: Drop remaining Settings log ctor

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);
     }

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

@@ -311,32 +311,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
@@ -438,7 +438,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;
     }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java

@@ -5,8 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.actions.pagerduty;
 
-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 PagerDutyActionFactory extends ActionFactory {
     private final TextTemplateEngine templateEngine;
     private final PagerDutyService pagerDutyService;
 
-    public PagerDutyActionFactory(Settings settings, TextTemplateEngine templateEngine, PagerDutyService pagerDutyService) {
-        super(Loggers.getLogger(ExecutablePagerDutyAction.class, settings));
+    public PagerDutyActionFactory(TextTemplateEngine templateEngine, PagerDutyService pagerDutyService) {
+        super(LogManager.getLogger(ExecutablePagerDutyAction.class));
         this.templateEngine = templateEngine;
         this.pagerDutyService = pagerDutyService;
     }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java

@@ -5,8 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.actions.slack;
 
-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;
@@ -18,8 +17,8 @@ public class SlackActionFactory extends ActionFactory {
     private final TextTemplateEngine templateEngine;
     private final SlackService slackService;
 
-    public SlackActionFactory(Settings settings, TextTemplateEngine templateEngine, SlackService slackService) {
-        super(Loggers.getLogger(ExecutableSlackAction.class, settings));
+    public SlackActionFactory(TextTemplateEngine templateEngine, SlackService slackService) {
+        super(LogManager.getLogger(ExecutableSlackAction.class));
         this.templateEngine = templateEngine;
         this.slackService = slackService;
     }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java

@@ -5,8 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.actions.webhook;
 
-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.http.HttpClient;
@@ -19,9 +18,8 @@ public class WebhookActionFactory extends ActionFactory {
     private final HttpClient httpClient;
     private final TextTemplateEngine templateEngine;
 
-    public WebhookActionFactory(Settings settings, HttpClient httpClient, TextTemplateEngine templateEngine) {
-
-        super(Loggers.getLogger(ExecutableWebhookAction.class, settings));
+    public WebhookActionFactory(HttpClient httpClient, TextTemplateEngine templateEngine) {
+        super(LogManager.getLogger(ExecutableWebhookAction.class));
         this.httpClient = httpClient;
         this.templateEngine = templateEngine;
     }

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

@@ -6,23 +6,20 @@
 package org.elasticsearch.xpack.watcher.execution;
 
 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.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.xpack.core.watcher.trigger.TriggerEvent;
 
 import java.util.function.Consumer;
 
 import static java.util.stream.StreamSupport.stream;
 
 public class AsyncTriggerEventConsumer implements Consumer<Iterable<TriggerEvent>> {
-
-    private final Logger logger;
+    private static final Logger logger = LogManager.getLogger(SyncTriggerEventConsumer.class);
     private final ExecutionService executionService;
 
-    public AsyncTriggerEventConsumer(Settings settings, ExecutionService executionService) {
-        this.logger = Loggers.getLogger(SyncTriggerEventConsumer.class, settings);
+    public AsyncTriggerEventConsumer(ExecutionService executionService) {
         this.executionService = executionService;
     }
 

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

@@ -6,23 +6,21 @@
 package org.elasticsearch.xpack.watcher.execution;
 
 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.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.xpack.core.watcher.trigger.TriggerEvent;
 
 import java.util.function.Consumer;
 
 import static java.util.stream.StreamSupport.stream;
 
 public class SyncTriggerEventConsumer implements Consumer<Iterable<TriggerEvent>> {
+    private static final Logger logger = LogManager.getLogger(SyncTriggerEventConsumer.class);
 
     private final ExecutionService executionService;
-    private final Logger logger;
 
-    public SyncTriggerEventConsumer(Settings settings, ExecutionService executionService) {
-        this.logger = Loggers.getLogger(SyncTriggerEventConsumer.class, settings);
+    public SyncTriggerEventConsumer(ExecutionService executionService) {
         this.executionService = executionService;
     }
 

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

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.watcher.input;
 
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.input.ExecutableInput;
 import org.elasticsearch.xpack.core.watcher.input.Input;
@@ -16,13 +15,6 @@
  * Parses xcontent to a concrete input of the same type.
  */
 public abstract class InputFactory<I extends Input, R extends Input.Result, E extends ExecutableInput<I, R>> {
-
-    protected final Logger inputLogger;
-
-    public InputFactory(Logger inputLogger) {
-        this.inputLogger = inputLogger;
-    }
-
     /**
      * @return  The type of the input
      */

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

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.watcher.input;
 
 import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.input.ExecutableInput;
 import org.elasticsearch.xpack.watcher.input.chain.ChainInput;
@@ -21,9 +20,9 @@ public class InputRegistry {
 
     private final Map<String, InputFactory> factories;
 
-    public InputRegistry(Settings settings, Map<String, InputFactory> factories) {
+    public InputRegistry(Map<String, InputFactory> factories) {
         Map<String, InputFactory> map = new HashMap<>(factories);
-        map.put(ChainInput.TYPE, new ChainInputFactory(settings, this));
+        map.put(ChainInput.TYPE, new ChainInputFactory(this));
         this.factories = Collections.unmodifiableMap(map);
     }
 

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java

@@ -6,8 +6,6 @@
 package org.elasticsearch.xpack.watcher.input.chain;
 
 import org.elasticsearch.common.collect.Tuple;
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.watcher.input.ExecutableInput;
 import org.elasticsearch.xpack.core.watcher.input.Input;
@@ -22,8 +20,7 @@ public class ChainInputFactory extends InputFactory<ChainInput, ChainInput.Resul
 
     private final InputRegistry inputRegistry;
 
-    public ChainInputFactory(Settings settings, InputRegistry inputRegistry) {
-        super(Loggers.getLogger(ExecutableChainInput.class, settings));
+    public ChainInputFactory(InputRegistry inputRegistry) {
         this.inputRegistry = inputRegistry;
     }
 
@@ -45,6 +42,6 @@ public ExecutableChainInput createExecutable(ChainInput input) {
             executableInputs.add(new Tuple<>(tuple.v1(), executableInput));
         }
 
-        return new ExecutableChainInput(input, executableInputs, inputLogger);
+        return new ExecutableChainInput(input, executableInputs);
     }
 }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.xpack.watcher.input.chain;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.xpack.core.watcher.execution.WatchExecutionContext;
 import org.elasticsearch.xpack.core.watcher.input.ExecutableInput;
@@ -20,11 +21,12 @@
 import static org.elasticsearch.xpack.watcher.input.chain.ChainInput.TYPE;
 
 public class ExecutableChainInput extends ExecutableInput<ChainInput,ChainInput.Result> {
+    private static final Logger logger = LogManager.getLogger(ExecutableChainInput.class);
 
     private List<Tuple<String, ExecutableInput>> inputs;
 
-    public ExecutableChainInput(ChainInput input, List<Tuple<String, ExecutableInput>> inputs, Logger logger) {
-        super(input, logger);
+    public ExecutableChainInput(ChainInput input, List<Tuple<String, ExecutableInput>> inputs) {
+        super(input);
         this.inputs = inputs;
     }