SERVER-64385 Track and Report Parity Recipient Fields in ServerStatus

4 files changed, 18 insertions, 5 deletions

diff --git a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp
index 7e5c73757eb..faf0cf0c991 100644
--- a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp
+++ b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp
@@ -270,6 +270,10 @@ bool ReshardingCollectionCloner::doOneBatch(OperationContext* opCtx, Pipeline& p
         pipeline, resharding::gReshardingCollectionClonerBatchSizeInBytes.load());
     _env->metrics()->onCollClonerFillBatchForInsert(
         duration_cast<Milliseconds>(latencyTimer.elapsed()));
+    if (ShardingDataTransformMetrics::isEnabled()) {
+        _env->metricsNew()->onCloningTotalRemoteBatchRetrieval(
+            duration_cast<Milliseconds>(latencyTimer.elapsed()));
+    }
 
     if (batch.empty()) {
         return false;
diff --git a/src/mongo/db/s/resharding/resharding_oplog_applier.cpp b/src/mongo/db/s/resharding/resharding_oplog_applier.cpp
index de2eecac563..99d4d50bb73 100644
--- a/src/mongo/db/s/resharding/resharding_oplog_applier.cpp
+++ b/src/mongo/db/s/resharding/resharding_oplog_applier.cpp
@@ -122,6 +122,11 @@ SemiFuture<void> ReshardingOplogApplier::_applyBatch(
         .onCompletion([this, latencyTimer](Status status) {
             _env->metrics()->onOplogApplierApplyBatch(
                 duration_cast<Milliseconds>(latencyTimer.elapsed()));
+
+            if (ShardingDataTransformMetrics::isEnabled()) {
+                _env->applierMetrics()->onOplogLocalBatchApplied(
+                    duration_cast<Milliseconds>(latencyTimer.elapsed()));
+            }
             return status;
         })
         .semi();
@@ -149,7 +154,7 @@ SemiFuture<void> ReshardingOplogApplier::run(
 
                        if (ShardingDataTransformMetrics::isEnabled()) {
                            _env->applierMetrics()->onBatchRetrievedDuringOplogApplying(
-                               batch.size(), Milliseconds(chainCtx->fetchTimer.millis()));
+                               duration_cast<Milliseconds>(chainCtx->fetchTimer.elapsed()));
                        }
 
                        _currentBatchToApply = std::move(batch);
diff --git a/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.cpp b/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.cpp
index 49285f64f6c..31bb6ca8dd6 100644
--- a/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.cpp
+++ b/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.cpp
@@ -59,9 +59,12 @@ void ReshardingOplogApplierMetrics::onDeleteApplied() {
     _metricsNew->onDeleteApplied();
 }
 
-void ReshardingOplogApplierMetrics::onBatchRetrievedDuringOplogApplying(int64_t numEntries,
-                                                                        Milliseconds elapsed) {
-    _metricsNew->onBatchRetrievedDuringOplogApplying(numEntries, elapsed);
+void ReshardingOplogApplierMetrics::onBatchRetrievedDuringOplogApplying(Milliseconds elapsed) {
+    _metricsNew->onBatchRetrievedDuringOplogApplying(elapsed);
+}
+
+void ReshardingOplogApplierMetrics::onOplogLocalBatchApplied(Milliseconds elapsed) {
+    _metricsNew->onOplogLocalBatchApplied(elapsed);
 }
 
 void ReshardingOplogApplierMetrics::onOplogEntriesApplied(int64_t numEntries) {
diff --git a/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.h b/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.h
index 012ffd257f1..28830da1bfc 100644
--- a/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.h
+++ b/src/mongo/db/s/resharding/resharding_oplog_applier_metrics.h
@@ -47,7 +47,8 @@ public:
     void onUpdateApplied();
     void onDeleteApplied();
 
-    void onBatchRetrievedDuringOplogApplying(int64_t numEntries, Milliseconds elapsed);
+    void onBatchRetrievedDuringOplogApplying(Milliseconds elapsed);
+    void onOplogLocalBatchApplied(Milliseconds elapsed);
     void onOplogEntriesApplied(int64_t numEntries);
     void onWriteToStashCollections();