Fixups

Author: smalyshev

server/src/main/java/org/elasticsearch/common/logging/activity/ActivityLogProducer.java

@@ -65,15 +65,9 @@ default ESLogMessage produceCommon(Context context, String prefix, ActionLogging
             fields.field(prefix + "timed_out", true);
         }
         context.shardInfo().ifPresent(shardInfo -> {
-            if (shardInfo.successfulShards() != null) {
-                fields.field(QUERY_FIELD_SHARDS + "successful", shardInfo.successfulShards());
-            }
-            if (shardInfo.skippedShards() != null) {
-                fields.field(QUERY_FIELD_SHARDS + "skipped", shardInfo.skippedShards());
-            }
-            if (shardInfo.failedShards() != null) {
-                fields.field(QUERY_FIELD_SHARDS + "failed", shardInfo.failedShards());
-            }
+            fields.field(QUERY_FIELD_SHARDS + "successful", shardInfo.successfulShards());
+            fields.field(QUERY_FIELD_SHARDS + "skipped", shardInfo.skippedShards());
+            fields.field(QUERY_FIELD_SHARDS + "failed", shardInfo.failedShards());
         });
         return fields;
     }

server/src/main/java/org/elasticsearch/common/logging/activity/QueryLogging.java

@@ -29,6 +29,9 @@ public interface QueryLogging {
      * Which indices were queried. May not apply to some modules like ESQL or SQL.
      */
     String QUERY_FIELD_INDICES = ES_QUERY_FIELDS_PREFIX + "indices";
+    /**
+     * Shard stats information - successful, skipped, failed.
+     */
     String QUERY_FIELD_SHARDS = ES_QUERY_FIELDS_PREFIX + "shards.";
     /**
      * This is the name Log4j logger will use.

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

@@ -55,15 +55,12 @@ long getHits() {
     }
 
     public Optional<ShardInfo> shardInfo() {
-        if (response == null) {
-            return Optional.empty();
-        }
         // We only know about failed shards in EQL
-        return Optional.of(new ShardInfo(null, null, getFailedShards(response)));
+        return Optional.ofNullable(response).map(r -> new ShardInfo(null, null, getFailedShards(response)));
     }
 
     private static int getFailedShards(EqlSearchResponse response) {
         long failedShards = Arrays.stream(response.shardFailures()).map(ShardSearchFailure::shard).distinct().count();
-        return failedShards >= Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) failedShards;
+        return Math.clamp(failedShards, 0, Integer.MAX_VALUE);
     }
 }

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

@@ -19,7 +19,6 @@
 import org.elasticsearch.test.ActivityLoggingUtils;
 import org.elasticsearch.transport.RemoteClusterService;
 import org.elasticsearch.xpack.esql.VerificationException;
-import org.elasticsearch.xpack.esql.action.EsqlQueryProfile;
 import org.elasticsearch.xpack.esql.querylog.EsqlLogContext;
 import org.elasticsearch.xpack.esql.querylog.EsqlLogProducer;
 import org.junit.After;