added integration tests

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

Author: ajleong623

server/src/internalClusterTest/java/org/opensearch/nodestats/NodeStatsIT.java

@@ -13,6 +13,7 @@
 import org.opensearch.action.admin.cluster.node.stats.NodeStats;
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.opensearch.action.admin.indices.stats.CommonStatsFlags;
+import org.opensearch.action.admin.indices.stats.DocStatusStats;
 import org.opensearch.action.bulk.BulkItemResponse;
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.bulk.BulkResponse;
@@ -32,7 +33,6 @@
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.engine.DocumentMissingException;
 import org.opensearch.index.engine.VersionConflictEngineException;
-import org.opensearch.index.shard.IndexingStats.Stats.DocStatusStats;
 import org.opensearch.indices.NodeIndicesStats;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
@@ -47,7 +47,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
 
 import static java.util.Collections.singletonMap;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
@@ -281,15 +281,14 @@ public void testNodeIndicesStatsDocStatsWithAggregations() {
                 .getNodes()
                 .get(0)
                 .getIndices()
-                .getIndexing()
-                .getTotal()
+                .getStatusCounterStats()
                 .getDocStatusStats();
 
             assertTrue(
                 Arrays.equals(
                     docStatusStats.getDocStatusCounter(),
                     expectedDocStatusStats.getDocStatusCounter(),
-                    Comparator.comparingLong(AtomicLong::longValue)
+                    Comparator.comparingLong(LongAdder::longValue)
                 )
             );
         }
@@ -543,15 +542,14 @@ private void assertDocStatusStats() {
             .getNodes()
             .get(0)
             .getIndices()
-            .getIndexing()
-            .getTotal()
+            .getStatusCounterStats()
             .getDocStatusStats();
 
         assertTrue(
             Arrays.equals(
                 docStatusStats.getDocStatusCounter(),
                 expectedDocStatusStats.getDocStatusCounter(),
-                Comparator.comparingLong(AtomicLong::longValue)
+                Comparator.comparingLong(LongAdder::longValue)
             )
         );
     }

server/src/internalClusterTest/java/org/opensearch/search/msearch/MultiSearchStatsIT.java

@@ -0,0 +1,111 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+package org.opensearch.search.msearch;
+
+import org.opensearch.ExceptionsHelper;
+import org.opensearch.action.admin.indices.stats.SearchResponseStatusStats;
+import org.opensearch.action.search.MultiSearchRequestBuilder;
+import org.opensearch.action.search.MultiSearchResponse;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.test.OpenSearchIntegTestCase;
+import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
+import org.opensearch.test.OpenSearchIntegTestCase.Scope;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.concurrent.atomic.LongAdder;
+
+@ClusterScope(scope = Scope.TEST, numDataNodes = 1, numClientNodes = 0, supportsDedicatedMasters = false)
+public class MultiSearchStatsIT extends OpenSearchIntegTestCase {
+    private final SearchResponseStatusStats expectedSearchResponseStatusStats = new SearchResponseStatusStats();
+
+    public void testNodeIndicesStatsDocStatusStatsIndexBulk() {
+        createIndex("test");
+        ensureGreen();
+        client().prepareIndex("test").setId("1").setSource("field", "xxx").get();
+        client().prepareIndex("test").setId("2").setSource("field", "yyy").get();
+        refresh();
+
+        int failureCount = randomIntBetween(0, 50);
+        int successCount = randomIntBetween(0, 50);
+
+        MultiSearchRequestBuilder multiSearchRequestBuilder = client().prepareMultiSearch();
+
+        for (int i = 0; i < failureCount; i++) {
+            multiSearchRequestBuilder.add(client().prepareSearch("noIndex").setQuery(QueryBuilders.termQuery("field", "yyy")));
+        }
+
+        for (int i = 0; i < successCount; i++) {
+            multiSearchRequestBuilder.add(client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()));
+        }
+
+        MultiSearchResponse response = multiSearchRequestBuilder.get();
+
+        for (MultiSearchResponse.Item item : response) {
+            if (item.isFailure()) {
+                updateExpectedDocStatusCounter(expectedSearchResponseStatusStats, item.getFailure());
+            } else {
+                updateExpectedDocStatusCounter(expectedSearchResponseStatusStats, item.getResponse());
+            }
+        }
+        assertSearchResponseStatusStats();
+    }
+
+    private void assertSearchResponseStatusStats() {
+        SearchResponseStatusStats searchResponseStatusStats = client().admin()
+            .cluster()
+            .prepareNodesStats()
+            .execute()
+            .actionGet()
+            .getNodes()
+            .get(0)
+            .getIndices()
+            .getStatusCounterStats()
+            .getSearchResponseStatusStats();
+
+        Arrays.equals(
+            searchResponseStatusStats.getSearchResponseStatusCounter(),
+            expectedSearchResponseStatusStats.getSearchResponseStatusCounter(),
+            Comparator.comparingLong(LongAdder::longValue)
+        );
+    }
+
+    private void updateExpectedDocStatusCounter(SearchResponseStatusStats expectedSearchResponseStatusStats, SearchResponse r) {
+        expectedSearchResponseStatusStats.inc(r.status());
+    }
+
+    private void updateExpectedDocStatusCounter(SearchResponseStatusStats expectedSearchResponseStatusStats, Exception e) {
+        expectedSearchResponseStatusStats.inc(ExceptionsHelper.status(e));
+    }
+}

server/src/main/java/org/opensearch/indices/IndicesService.java

@@ -1367,9 +1367,10 @@ public IndicesQueryCache getIndicesQueryCache() {
      *
      * @param stats Instance storing {@link DocStatusStats}
      */
+    /*@Deprecated(since = "3.3.0")
     public void addDocStatusStats(final org.opensearch.index.shard.IndexingStats.Stats.DocStatusStats stats) {
         oldShardsStats.indexingStats.getTotal().getDocStatusStats().add(stats);
-    }
+    }*/
 
     /**
      * Accumulate stats from the passed Object