From fbf6e8995df82673786dbd8ac8efbf2f10466640 Mon Sep 17 00:00:00 2001
From: akolarkunnu <abdul.kolarkunnu@netapp.com>
Date: Wed, 29 May 2024 12:38:54 +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 1fc13359e5cd4..b527cd2850236 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
@@ -228,7 +228,6 @@ public void testEnforcedCooldownPeriod() throws IOException {
         assertThat(repository.threadPool().relativeTimeInNanos() - beforeFastDelete, lessThan(TEST_COOLDOWN_PERIOD.getNanos()));
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/10735")
     @Override
     public void testRequestStats() throws Exception {
         final String repository = createRepository(randomName());
@@ -312,6 +311,8 @@ protected S3Repository createRepository(
             ClusterService clusterService,
             RecoverySettings recoverySettings
         ) {
+            GenericStatsMetricPublisher genericStatsMetricPublisher = new GenericStatsMetricPublisher(10000L, 10, 10000L, 10);
+
             return new S3Repository(
                 metadata,
                 registry,
@@ -326,7 +327,7 @@ protected S3Repository createRepository(
                 false,
                 null,
                 null,
-                null
+                genericStatsMetricPublisher
             ) {
 
                 @Override