test fixes

Author: smalyshev

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

@@ -157,8 +157,8 @@ public void testSearchLog() {
             assertThat(message.get(QUERY_FIELD_RESULT_COUNT), equalTo("1"));
             assertThat(message.get(QUERY_FIELD_INDICES), equalTo(""));
             assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "successful")), greaterThanOrEqualTo(1));
-            assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "skipped")), greaterThanOrEqualTo(0));
-            assertThat(message.get(QUERY_FIELD_SHARDS + "failed"), equalTo("0"));
+            assertThat(Integer.valueOf(message.getOrDefault(QUERY_FIELD_SHARDS + "skipped", "0")), greaterThanOrEqualTo(0));
+            assertThat(message.getOrDefault(QUERY_FIELD_SHARDS + "failed", "0"), equalTo("0"));
             assertNull(message.get(ES_QUERY_FIELDS_PREFIX + "timed_out"));
         }
 
@@ -171,8 +171,8 @@ public void testSearchLog() {
             assertThat(message.get(QUERY_FIELD_RESULT_COUNT), equalTo("3"));
             assertThat(message.get(QUERY_FIELD_INDICES), equalTo(INDEX_NAME));
             assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "successful")), greaterThanOrEqualTo(1));
-            assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "skipped")), greaterThanOrEqualTo(0));
-            assertThat(message.get(QUERY_FIELD_SHARDS + "failed"), equalTo("0"));
+            assertThat(Integer.valueOf(message.getOrDefault(QUERY_FIELD_SHARDS + "skipped", "0")), greaterThanOrEqualTo(0));
+            assertThat(message.getOrDefault(QUERY_FIELD_SHARDS + "failed", "0"), equalTo("0"));
             assertNull(message.get(ES_QUERY_FIELDS_PREFIX + "timed_out"));
         }
         // Total hits
@@ -213,10 +213,10 @@ public void testSearchLogShardInfoPartialFailure() throws Exception {
         var event = appender.getLastEventAndReset();
         assertNotNull(event);
         Map<String, String> message = getMessageData(event);
-        assertMessageSuccess(message, "search", "size");
+        assertMessageSuccess(message, SearchLogContext.TYPE, "size");
         assertThat(message.get(QUERY_FIELD_INDICES), equalTo(INDEX_NAME));
         assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "successful")), greaterThan(0));
-        assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "skipped")), equalTo(0));
+        assertThat(Integer.valueOf(message.getOrDefault(QUERY_FIELD_SHARDS + "skipped", "0")), equalTo(0));
         assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "failed")), greaterThan(0));
     }
 

x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/EqlLoggingIT.java

@@ -87,8 +87,6 @@ public void testEqlLogging() throws Exception {
         assertMessageSuccess(message, EqlLogContext.TYPE, query);
         assertThat(message.get(QUERY_FIELD_INDICES), equalTo("test"));
         assertThat(message.get(QUERY_FIELD_RESULT_COUNT), equalTo(success ? "1" : "0"));
-        // EQL only logs shards.failed
-        assertThat(message.get(QUERY_FIELD_SHARDS + "failed"), equalTo("0"));
     }
 
     public void testEqlFailureLogging() throws Exception {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlQueryLoggingIT.java

@@ -87,8 +87,8 @@ private void assertQuery(String query, long hits) {
             var message = getMessageData(appender.getLastEventAndReset());
             assertMessageSuccess(message, EsqlLogContext.TYPE, query);
             assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "successful")), greaterThanOrEqualTo(1));
-            assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "skipped")), greaterThanOrEqualTo(0));
-            assertThat(message.get(QUERY_FIELD_SHARDS + "failed"), equalTo("0"));
+            assertThat(Integer.valueOf(message.getOrDefault(QUERY_FIELD_SHARDS + "skipped", "0")), greaterThanOrEqualTo(0));
+            assertThat(message.getOrDefault(QUERY_FIELD_SHARDS + "failed", "0"), equalTo("0"));
 
             // Create empty EsqlQueryProfile just to get the markers
             EsqlQueryProfile profile = new EsqlQueryProfile();
@@ -143,9 +143,9 @@ public void testLoggingPartialShardFailure() throws Exception {
         var event = appender.getLastEventAndReset();
         assertNotNull(event);
         var message = getMessageData(event);
-        assertMessageSuccess(message, "esql", "FROM esql_partial_test | LIMIT 100");
+        assertMessageSuccess(message, EsqlLogContext.TYPE, "FROM esql_partial_test | LIMIT 100");
         assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "successful")), greaterThanOrEqualTo(1));
-        assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "skipped")), equalTo(0));
+        assertThat(Integer.valueOf(message.getOrDefault(QUERY_FIELD_SHARDS + "skipped", "0")), equalTo(0));
         assertThat(Integer.valueOf(message.get(QUERY_FIELD_SHARDS + "failed")), greaterThanOrEqualTo(1));
     }
 }