From e8d3c4716cd7b6ad2f8e47d599f2f4e4f4989a3b Mon Sep 17 00:00:00 2001
From: akolarkunnu <abdul.kolarkunnu@netapp.com>
Date: Fri, 24 May 2024 16:24:15 +0530
Subject: [PATCH] 
 org.opensearch.repositories.s3.S3BlobStoreRepositoryTests.testRequestStats
 fails with NullPointerException It's a NullPointerException from
 S3BlobStore.extendedStats() method, where 'genericStatsMetricPublisher' is
 null. This parameter sets through S3Repository constructor from test and in
 this test it sets as null. This is the root cause of the issue. If we set
 valid a GenericStatsMetricPublisher, test works fine without any issue. This
 was a consistent failure, not a random failure. Resolves #10735
 Signed-off-by: Abdul Muneer Kolarkunnu <muneer.kolarkunnu@netapp.com>

---
 .../repositories/s3/S3BlobStoreRepositoryTests.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java b/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java
index 21184380d54a9..f72374d63808a 100644
--- a/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java
+++ b/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java
@@ -165,7 +165,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
         return builder.build();
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/10735")
     @Override
     public void testRequestStats() throws Exception {
         final String repository = createRepository(randomName());
@@ -249,6 +248,8 @@ protected S3Repository createRepository(
             ClusterService clusterService,
             RecoverySettings recoverySettings
         ) {
+            GenericStatsMetricPublisher genericStatsMetricPublisher = new GenericStatsMetricPublisher(10000L, 10, 10000L, 10);
+
             return new S3Repository(
                 metadata,
                 registry,
@@ -263,7 +264,7 @@ protected S3Repository createRepository(
                 false,
                 null,
                 null,
-                null
+                genericStatsMetricPublisher
             ) {
 
                 @Override