Merge log field providers

Author: luigidellaquila

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -846,6 +846,13 @@ public Map<String, String> searchFields() {
                             .flatMap(f -> f.searchFields().entrySet().stream())
                             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                     }
+
+                    @Override
+                    public Map<String, String> queryFields() {
+                        return fields.stream()
+                            .flatMap(f -> f.queryFields().entrySet().stream())
+                            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                    }
                 };
             }
 
@@ -868,6 +875,13 @@ public Map<String, String> searchFields() {
                             .flatMap(f -> f.searchFields().entrySet().stream())
                             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                     }
+
+                    @Override
+                    public Map<String, String> queryFields() {
+                        return fields.stream()
+                            .flatMap(f -> f.queryFields().entrySet().stream())
+                            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                    }
                 };
             }
 
@@ -961,7 +975,7 @@ public Map<String, String> searchFields() {
             documentParsingProvider,
             taskManager,
             projectResolver,
-            slowLogFieldProviders
+            slowLogFieldProvider
         );
 
         Collection<?> pluginComponents = pluginsService.flatMap(plugin -> {

server/src/main/java/org/elasticsearch/node/PluginServiceInstances.java

@@ -57,5 +57,5 @@ public record PluginServiceInstances(
     DocumentParsingProvider documentParsingProvider,
     TaskManager taskManager,
     ProjectResolver projectResolver,
-    List<? extends SlowLogFieldProvider> slowLogFieldProviders
+    SlowLogFieldProvider slowLogFieldProvider
 ) implements Plugin.PluginServices {}

server/src/main/java/org/elasticsearch/plugins/Plugin.java

@@ -183,9 +183,9 @@ public interface PluginServices {
         ProjectResolver projectResolver();
 
         /**
-         * Providers for additional SlowLog fields
+         * Provider for additional SlowLog fields
          */
-        List<? extends SlowLogFieldProvider> slowLogFieldProviders();
+        SlowLogFieldProvider slowLogFieldProvider();
     }
 
     /**

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlPlugin.java

@@ -170,7 +170,7 @@ public Collection<?> createComponents(PluginServices services) {
                 new IndexResolver(services.client()),
                 services.telemetryProvider().getMeterRegistry(),
                 getLicenseState(),
-                new EsqlSlowLog(services.clusterService().getClusterSettings(), services.slowLogFieldProviders())
+                new EsqlSlowLog(services.clusterService().getClusterSettings(), services.slowLogFieldProvider())
             ),
             new ExchangeService(
                 services.clusterService().getSettings(),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/slowlog/EsqlSlowLog.java

@@ -19,7 +19,6 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
 
@@ -44,7 +43,7 @@ public final class EsqlSlowLog {
 
     public static final String LOGGER_NAME = "esql.slowlog.query";
     private static final Logger queryLogger = LogManager.getLogger(LOGGER_NAME);
-    private final List<SlowLogFields> additionalProviders;
+    private final SlowLogFields additionalFields;
 
     private volatile long queryWarnThreshold;
     private volatile long queryInfoThreshold;
@@ -53,14 +52,14 @@ public final class EsqlSlowLog {
 
     private volatile boolean includeUser;
 
-    public EsqlSlowLog(ClusterSettings settings, List<? extends SlowLogFieldProvider> slowLogFieldProviders) {
+    public EsqlSlowLog(ClusterSettings settings, SlowLogFieldProvider slowLogFieldProvider) {
         settings.initializeAndWatch(ESQL_SLOWLOG_THRESHOLD_QUERY_WARN_SETTING, this::setQueryWarnThreshold);
         settings.initializeAndWatch(ESQL_SLOWLOG_THRESHOLD_QUERY_INFO_SETTING, this::setQueryInfoThreshold);
         settings.initializeAndWatch(ESQL_SLOWLOG_THRESHOLD_QUERY_DEBUG_SETTING, this::setQueryDebugThreshold);
         settings.initializeAndWatch(ESQL_SLOWLOG_THRESHOLD_QUERY_TRACE_SETTING, this::setQueryTraceThreshold);
         settings.initializeAndWatch(ESQL_SLOWLOG_THRESHOLD_INCLUDE_USER_SETTING, this::setIncludeUser);
 
-        this.additionalProviders = slowLogFieldProviders.stream().map(SlowLogFieldProvider::create).toList();
+        this.additionalFields = slowLogFieldProvider.create();
     }
 
     public EsqlSlowLog(ClusterSettings settings) {
@@ -72,11 +71,11 @@ public void onQueryPhase(Result esqlResult, String query) {
             return; // TODO review, it happens in some tests, not sure if it's a thing also in prod
         }
         long tookInNanos = esqlResult.executionInfo().overallTook().nanos();
-        log(() -> Message.of(esqlResult, query, additionalProviders), tookInNanos);
+        log(() -> Message.of(esqlResult, query, includeUser ? additionalFields.queryFields() : Map.of()), tookInNanos);
     }
 
     public void onQueryFailure(String query, Exception ex, long tookInNanos) {
-        log(() -> Message.of(query, tookInNanos, ex, additionalProviders), tookInNanos);
+        log(() -> Message.of(query, tookInNanos, ex, includeUser ? additionalFields.queryFields() : Map.of()), tookInNanos);
     }
 
     private void log(Supplier<ESLogMessage> logProducer, long tookInNanos) {
@@ -118,28 +117,22 @@ private static String escapeJson(String text) {
             return new String(sourceEscaped, StandardCharsets.UTF_8);
         }
 
-        public static ESLogMessage of(Result esqlResult, String query, List<SlowLogFields> providers) {
+        public static ESLogMessage of(Result esqlResult, String query, Map<String, String> additionalFields) {
             Map<String, Object> jsonFields = new HashMap<>();
-            addFromProviders(providers, jsonFields);
+            jsonFields.putAll(additionalFields);
             addGenericFields(jsonFields, query, true);
             addResultFields(jsonFields, esqlResult);
             return new ESLogMessage().withFields(jsonFields);
         }
 
-        public static ESLogMessage of(String query, long took, Exception exception, List<SlowLogFields> providers) {
+        public static ESLogMessage of(String query, long took, Exception exception, Map<String, String> additionalFields) {
             Map<String, Object> jsonFields = new HashMap<>();
-            addFromProviders(providers, jsonFields);
+            jsonFields.putAll(additionalFields);
             addGenericFields(jsonFields, query, false);
             addErrorFields(jsonFields, took, exception);
             return new ESLogMessage().withFields(jsonFields);
         }
 
-        private static void addFromProviders(List<SlowLogFields> providers, Map<String, Object> jsonFields) {
-            for (SlowLogFields provider : providers) {
-                jsonFields.putAll(provider.queryFields());
-            }
-        }
-
         private static void addGenericFields(Map<String, Object> fieldMap, String query, boolean success) {
             String source = escapeJson(query);
             fieldMap.put(ELASTICSEARCH_SLOWLOG_SUCCESS, success);