SERVER-76557: Keep RequestShapifiers in telemetry store

2 files changed, 6 insertions, 6 deletions

diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp
index add8ceb3d57..2b6d5cb9dc8 100644
--- a/src/mongo/db/commands/find_cmd.cpp
+++ b/src/mongo/db/commands/find_cmd.cpp
@@ -563,11 +563,11 @@ public:
             if (collection) {
                 // Collect telemetry. Exclude queries against collections with encrypted fields.
                 if (!collection.get()->getCollectionOptions().encryptedFieldConfig) {
-                    telemetry::registerRequest(
-                        telemetry::FindRequestShapifier(cq->getFindCommandRequest(), opCtx),
-                        collection.get()->ns(),
-                        opCtx,
-                        cq->getExpCtx());
+                    telemetry::registerRequest(std::make_unique<telemetry::FindRequestShapifier>(
+                                                   cq->getFindCommandRequest(), opCtx),
+                                               collection.get()->ns(),
+                                               opCtx,
+                                               cq->getExpCtx());
                 }
             }
 
diff --git a/src/mongo/db/commands/run_aggregate.cpp b/src/mongo/db/commands/run_aggregate.cpp
index 4b2c535cbc7..8a2d675982d 100644
--- a/src/mongo/db/commands/run_aggregate.cpp
+++ b/src/mongo/db/commands/run_aggregate.cpp
@@ -1226,7 +1226,7 @@ Status runAggregate(OperationContext* opCtx,
         if (keepCursor) {
             collectTelemetryMongod(opCtx, pins[0]);
         } else {
-            collectTelemetryMongod(opCtx, cmdObj);
+            collectTelemetryMongod(opCtx, std::move(curOp->debug().telemetryRequestShapifier));
         }
 
         // For an optimized away pipeline, signal the cache that a query operation has completed.