Addressing PR comments

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>

server/src/main/java/org/opensearch/index/shard/FileUploader.java

@@ -13,6 +13,7 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IOContext;
 import org.opensearch.common.CheckedFunction;
+import org.opensearch.common.util.UploadListener;
 import org.opensearch.index.store.RemoteSegmentStoreDirectory;
 
 import java.io.IOException;
@@ -30,7 +31,7 @@ public class FileUploader {
 
     private static final Logger logger = LogManager.getLogger(FileUploader.class);
 
-    private final UploadTracker uploadTracker;
+    private final UploadListener uploadListener;
 
     private final RemoteSegmentStoreDirectory remoteDirectory;
 
@@ -41,13 +42,13 @@ public class FileUploader {
     private final CheckedFunction<String, String, IOException> checksumProvider;
 
     public FileUploader(
-        UploadTracker uploadTracker,
+        UploadListener uploadListener,
         RemoteSegmentStoreDirectory remoteDirectory,
         Directory storeDirectory,
         Set<String> excludeFiles,
         CheckedFunction<String, String, IOException> checksumProvider
     ) {
-        this.uploadTracker = uploadTracker;
+        this.uploadListener = uploadListener;
         this.remoteDirectory = remoteDirectory;
         this.storeDirectory = storeDirectory;
         this.excludeFiles = excludeFiles;
@@ -64,7 +65,7 @@ public FileUploader(
      */
     public boolean uploadFiles(Collection<String> files) throws Exception {
         Collection<String> filteredFiles = files.stream().filter(file -> !skipUpload(file)).collect(Collectors.toList());
-        return remoteDirectory.copyFilesFrom(storeDirectory, filteredFiles, IOContext.DEFAULT, uploadTracker);
+        return remoteDirectory.copyFilesFrom(storeDirectory, filteredFiles, IOContext.DEFAULT, uploadListener);
     }
 
     /**

server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java

@@ -24,6 +24,7 @@
 import org.opensearch.action.bulk.BackoffPolicy;
 import org.opensearch.common.concurrent.GatedCloseable;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.common.util.UploadListener;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
 import org.opensearch.index.engine.EngineException;
 import org.opensearch.index.engine.InternalEngine;
@@ -133,7 +134,7 @@ public RemoteStoreRefreshListener(
         this.segmentTracker = segmentTracker;
         resetBackOffDelayIterator();
         this.checkpointPublisher = checkpointPublisher;
-        this.fileUploader = new FileUploader(new UploadTracker() {
+        this.fileUploader = new FileUploader(new UploadListener() {
             @Override
             public void beforeUpload(String file) {
                 // Start tracking the upload bytes started

server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java

@@ -29,7 +29,7 @@
 import org.opensearch.common.io.VersionedCodecStreamWrapper;
 import org.opensearch.common.lucene.store.ByteArrayIndexInput;
 import org.opensearch.common.util.ByteUtils;
-import org.opensearch.index.shard.UploadTracker;
+import org.opensearch.common.util.UploadListener;
 import org.opensearch.index.store.exception.ChecksumCombinationException;
 import org.opensearch.index.store.lockmanager.FileLockInfo;
 import org.opensearch.index.store.lockmanager.RemoteStoreCommitLevelLockManager;
@@ -356,46 +356,46 @@ public IndexInput openInput(String name, IOContext context) throws IOException {
      * @param from          The directory for all files to be uploaded
      * @param files         A list containing the names of all files to be uploaded
      * @param context       IOContext to be used to open IndexInput to files during remote upload
-     * @param uploadTracker An {@link UploadTracker} for tracking file uploads
+     * @param uploadListener An {@link UploadListener} for tracking file uploads
      * @throws Exception When upload future creation fails or if {@link RemoteSegmentStoreDirectory#copyFrom(Directory, String, String, IOContext, boolean)}
      *                   throws an exception
      */
-    public boolean copyFilesFrom(Directory from, Collection<String> files, IOContext context, UploadTracker uploadTracker)
+    public boolean copyFilesFrom(Directory from, Collection<String> files, IOContext context, UploadListener uploadListener)
         throws Exception {
 
         List<CompletableFuture<Void>> resultFutures = new ArrayList<>();
 
         boolean uploadOfAllFilesSuccessful = true;
         for (String src : files) {
             String remoteFilename = createRemoteFileName(src, false);
-            uploadTracker.beforeUpload(src);
+            uploadListener.beforeUpload(src);
             if (remoteDataDirectory.getBlobContainer().isMultiStreamUploadSupported()) {
                 try {
                     CompletableFuture<Void> resultFuture = createUploadFuture(from, src, remoteFilename, context);
                     resultFuture.whenComplete((uploadResponse, throwable) -> {
                         if (throwable != null) {
-                            uploadTracker.onFailure(src);
+                            uploadListener.onFailure(src);
                         } else {
-                            uploadTracker.onSuccess(src);
+                            uploadListener.onSuccess(src);
                         }
                     });
                     resultFutures.add(resultFuture);
                 } catch (Exception e) {
-                    uploadTracker.onFailure(src);
+                    uploadListener.onFailure(src);
                     throw e;
                 }
             } else {
                 boolean success = true;
                 try {
                     copyFrom(from, src, src, context, false);
-                    uploadTracker.onSuccess(src);
+                    uploadListener.onSuccess(src);
                 } catch (IOException e) {
                     success = false;
                     uploadOfAllFilesSuccessful = false;
                     logger.warn(() -> new ParameterizedMessage("Exception while uploading file {} to the remote segment store", src), e);
                 } finally {
                     if (!success) {
-                        uploadTracker.onFailure(src);
+                        uploadListener.onFailure(src);
                     }
                 }
             }

server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java

@@ -57,7 +57,7 @@ public class RemoteSegmentStoreDirectoryTests extends OpenSearchTestCase {
     private RemoteStoreMetadataLockManager mdLockManager;
 
     private RemoteSegmentStoreDirectory remoteSegmentStoreDirectory;
-    private TestUploadTracker testUploadTracker;
+    private TestUploadListener testUploadListener;
 
     @Before
     public void setup() throws IOException {
@@ -66,7 +66,7 @@ public void setup() throws IOException {
         mdLockManager = mock(RemoteStoreMetadataLockManager.class);
 
         remoteSegmentStoreDirectory = new RemoteSegmentStoreDirectory(remoteDataDirectory, remoteMetadataDirectory, mdLockManager);
-        testUploadTracker = new TestUploadTracker();
+        testUploadListener = new TestUploadListener();
     }
 
     public void testUploadedSegmentMetadataToString() {
@@ -523,10 +523,10 @@ public void testCopyFilesFromMultipart() throws Exception {
         uploadResponseCompletableFuture.complete(null);
         when(blobContainer.writeBlobByStreams(any(WriteContext.class))).thenReturn(uploadResponseCompletableFuture);
 
-        remoteSegmentStoreDirectory.copyFilesFrom(storeDirectory, List.of(filename), IOContext.DEFAULT, testUploadTracker);
+        remoteSegmentStoreDirectory.copyFilesFrom(storeDirectory, List.of(filename), IOContext.DEFAULT, testUploadListener);
 
         assertTrue(remoteSegmentStoreDirectory.getSegmentsUploadedToRemoteStore().containsKey(filename));
-        assertEquals(TestUploadTracker.UploadStatus.UPLOAD_SUCCESS, testUploadTracker.getUploadStatus(filename));
+        assertEquals(TestUploadListener.UploadStatus.UPLOAD_SUCCESS, testUploadListener.getUploadStatus(filename));
 
         storeDirectory.close();
     }
@@ -554,11 +554,11 @@ public void testCopyFilesFromMultipartIOException() throws Exception {
 
         assertThrows(
             IOException.class,
-            () -> remoteSegmentStoreDirectory.copyFilesFrom(storeDirectory, List.of(filename), IOContext.DEFAULT, testUploadTracker)
+            () -> remoteSegmentStoreDirectory.copyFilesFrom(storeDirectory, List.of(filename), IOContext.DEFAULT, testUploadListener)
         );
 
         assertFalse(remoteSegmentStoreDirectory.getSegmentsUploadedToRemoteStore().containsKey(filename));
-        assertEquals(TestUploadTracker.UploadStatus.UPLOAD_FAILURE, testUploadTracker.getUploadStatus(filename));
+        assertEquals(TestUploadListener.UploadStatus.UPLOAD_FAILURE, testUploadListener.getUploadStatus(filename));
 
         storeDirectory.close();
     }
@@ -586,11 +586,11 @@ public void testCopyFilesFromMultipartUploadFutureCompletedExceptionally() throw
 
         assertThrows(
             ExecutionException.class,
-            () -> remoteSegmentStoreDirectory.copyFilesFrom(storeDirectory, List.of(filename), IOContext.DEFAULT, testUploadTracker)
+            () -> remoteSegmentStoreDirectory.copyFilesFrom(storeDirectory, List.of(filename), IOContext.DEFAULT, testUploadListener)
         );
 
         assertFalse(remoteSegmentStoreDirectory.getSegmentsUploadedToRemoteStore().containsKey(filename));
-        assertEquals(TestUploadTracker.UploadStatus.UPLOAD_FAILURE, testUploadTracker.getUploadStatus(filename));
+        assertEquals(TestUploadListener.UploadStatus.UPLOAD_FAILURE, testUploadListener.getUploadStatus(filename));
 
         storeDirectory.close();
     }

server/src/test/java/org/opensearch/index/store/TestUploadTracker.java → server/src/test/java/org/opensearch/index/store/TestUploadListener.java

@@ -8,11 +8,11 @@
 
 package org.opensearch.index.store;
 
-import org.opensearch.index.shard.UploadTracker;
+import org.opensearch.common.util.UploadListener;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-public class TestUploadTracker implements UploadTracker {
+public class TestUploadListener implements UploadListener {
 
     private final ConcurrentHashMap<String, UploadStatus> uploadStatusMap = new ConcurrentHashMap<>();