Adding shard operation changes

Signed-off-by: nishchay21 <nishcha@amazon.com>

Author: nishchay21

src/main/java/org/opensearch/performanceanalyzer/listener/RTFPerformanceAnalyzerSearchListener.java

@@ -189,14 +189,13 @@ public void preQueryPhase(SearchContext searchContext) {
     @Override
     public void queryPhase(SearchContext searchContext, long tookInNanos) {
         long queryStartTime = threadLocal.get().getOrDefault(QUERY_START_TIME, System.nanoTime());
-        long queryTime = (System.nanoTime() - queryStartTime);
-        double queryTimeInMills = queryTime / 1_000_000.0;
+        double queryTimeInMills = tookInNanos / 1_000_000.0;
 
         searchLatencyHistogram.record(
                 queryTimeInMills, createTags(searchContext, SHARD_QUERY_PHASE, false));
 
         addResourceTrackingCompletionListener(
-                searchContext, queryStartTime, queryTime, SHARD_QUERY_PHASE, false);
+                searchContext, queryStartTime, tookInNanos, SHARD_QUERY_PHASE, false);
     }
 
     @Override
@@ -215,14 +214,12 @@ public void preFetchPhase(SearchContext searchContext) {
     @Override
     public void fetchPhase(SearchContext searchContext, long tookInNanos) {
         long fetchStartTime = threadLocal.get().getOrDefault(FETCH_START_TIME, System.nanoTime());
-        long fetchTime = (System.nanoTime() - fetchStartTime);
-        double fetchTimeInMills = fetchTime / 1_000_000.0;
-
+        double fetchTimeInMills = tookInNanos / 1_000_000.0;
         searchLatencyHistogram.record(
                 fetchTimeInMills, createTags(searchContext, SHARD_FETCH_PHASE, false));
 
         addResourceTrackingCompletionListenerForFetchPhase(
-                searchContext, fetchStartTime, fetchTime, SHARD_FETCH_PHASE, false);
+                searchContext, fetchStartTime, tookInNanos, SHARD_FETCH_PHASE, false);
     }
 
     @Override
@@ -291,11 +288,7 @@ protected void innerOnResponse(Task task) {
                  * overall start time.
                  */
                 long totalTime = System.nanoTime() - startTime;
-                double totalTimeInMills = totalTime / 1_000_000.0;
                 double shareFactor = computeShareFactor(phaseTookTime, totalTime);
-
-                searchLatencyHistogram.record(
-                        totalTimeInMills, createTags(searchContext, phase, isFailed));
                 cpuUtilizationHistogram.record(
                         Utils.calculateCPUUtilization(
                                 numProcessors,

src/test/java/org/opensearch/performanceanalyzer/listener/RTFPerformanceAnalyzerSearchListenerTests.java

@@ -174,7 +174,7 @@ public void testTaskCompletionListener() {
         NotifyOnceListener<Task> taskCompletionListener =
                 rtfSearchListener.createListener(searchContext, 0l, 0l, "test", false);
         taskCompletionListener.onResponse(task);
-        Mockito.verify(searchLatencyHistogram).record(Mockito.anyDouble(), Mockito.any(Tags.class));
+
         Mockito.verify(cpuUtilizationHistogram)
                 .record(Mockito.anyDouble(), Mockito.any(Tags.class));
         Mockito.verify(heapUsedHistogram).record(Mockito.anyDouble(), Mockito.any(Tags.class));