Make indices be an array

Author: smalyshev

server/src/internalClusterTest/java/org/elasticsearch/search/SearchLoggingIT.java

@@ -78,16 +78,19 @@
 import static org.elasticsearch.test.AbstractSearchCancellationTestCase.ScriptedBlockPlugin.SEARCH_BLOCK_SCRIPT_NAME;
 import static org.elasticsearch.test.ActivityLoggingUtils.assertMessageFailure;
 import static org.elasticsearch.test.ActivityLoggingUtils.assertMessageSuccess;
+import static org.elasticsearch.test.ActivityLoggingUtils.getMessageField;
 import static org.elasticsearch.test.ActivityLoggingUtils.getMessageData;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHitsWithoutFailures;
+import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
 
 public class SearchLoggingIT extends AbstractSearchCancellationTestCase {
     static AccumulatingMockAppender appender;
@@ -179,6 +182,25 @@ public void testSearchLog() {
         }
     }
 
+    public void testIndicesFieldIsArray() {
+        setupIndex();
+
+        assertSearchHitsWithoutFailures(prepareSearch(INDEX_NAME).setQuery(matchQuery("field1", "quick")), "1", "2", "3");
+        var event = appender.getLastEventAndReset();
+        Object indicesField = getMessageField(event, QUERY_FIELD_INDICES);
+        assertThat(indicesField, instanceOf(String[].class));
+        assertThat((String[]) indicesField, arrayContaining(INDEX_NAME));
+
+        // Test with more than one index
+        String secondIndex = INDEX_NAME + "_2";
+        assertAcked(prepareCreate(secondIndex));
+        assertSearchHitsWithoutFailures(prepareSearch(INDEX_NAME, secondIndex).setQuery(matchQuery("field1", "quick")), "1", "2", "3");
+        var event2 = appender.getLastEventAndReset();
+        Object indicesField2 = getMessageField(event2, QUERY_FIELD_INDICES);
+        assertThat(indicesField2, instanceOf(String[].class));
+        assertThat((String[]) indicesField2, arrayContaining(INDEX_NAME, secondIndex));
+    }
+
     public void testFailureLog() {
         assertAcked(prepareCreate(INDEX_NAME).setMapping("field1", "type=text,index_options=docs"));
         indexRandom(

server/src/main/java/org/elasticsearch/action/search/SearchLogContext.java

@@ -9,8 +9,6 @@
 
 package org.elasticsearch.action.search;
 
-import joptsimple.internal.Strings;
-
 import org.apache.lucene.search.TotalHits;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.logging.activity.ActivityLoggerContext;
@@ -108,8 +106,8 @@ public boolean isTimedOut() {
         return response != null && response.isTimedOut();
     }
 
-    public String getIndices() {
-        return Strings.join(getIndexNames(), ",");
+    public String[] getIndices() {
+        return getIndexNames();
     }
 
     public boolean hasAggregations() {

test/framework/src/main/java/org/elasticsearch/test/ActivityLoggingUtils.java

@@ -15,6 +15,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.elasticsearch.action.search.SearchLogProducer.SEARCH_LOGGER_LOG_SYSTEM;
 import static org.elasticsearch.common.logging.activity.ActivityLogProducer.EVENT_DURATION_FIELD;
@@ -53,13 +54,24 @@ public static void disableLoggingSystem() {
         updateClusterSettings(builder);
     }
 
+    private static String stringify(Object t) {
+        if (t instanceof String[]) return String.join(",", (String[]) t);
+        return t.toString();
+    }
+
     public static Map<String, String> getMessageData(LogEvent event) {
         assertNotNull(event);
         assertThat(event.getMessage(), instanceOf(ESLogMessage.class));
         ESLogMessage message = (ESLogMessage) event.getMessage();
-        HashMap<String, String> map = new HashMap<>();
-        message.getData().forEach((k, v) -> map.put(k, v.toString()));
-        return map;
+
+        return message.getData().entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> stringify(e.getValue())));
+    }
+
+    public static Object getMessageField(LogEvent event, String key) {
+        assertNotNull(event);
+        assertThat(event.getMessage(), instanceOf(ESLogMessage.class));
+        ESLogMessage message = (ESLogMessage) event.getMessage();
+        return message.getData().get(key);
     }
 
     public static void assertMessageSuccess(Map<String, String> message, String type, String query) {

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/logging/EqlLogContext.java

@@ -7,8 +7,6 @@
 
 package org.elasticsearch.xpack.eql.logging;
 
-import joptsimple.internal.Strings;
-
 import org.elasticsearch.common.logging.activity.ActivityLoggerContext;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.xpack.eql.action.EqlSearchRequest;
@@ -37,8 +35,8 @@ String getQuery() {
         return request.query();
     }
 
-    public String getIndices() {
-        return Strings.join(request.indices(), ",");
+    public String[] getIndices() {
+        return request.indices();
     }
 
     @Override