diff options
| author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2023-05-10 09:45:34 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-10 11:14:47 +0000 |
| commit | 118b6f998ca8ceb1b6392071f49efa3649cbe4e1 (patch) | |
| tree | 31a4b138d5f23fdb07603cc270addeed5b1ae490 /src/mongo/s | |
| parent | 406e69f6f5dee8b698c4e4308de2e9e5cef6c12c (diff) | |
| download | mongo-118b6f998ca8ceb1b6392071f49efa3649cbe4e1.tar.gz | |
Revert "SERVER-75512 key telemetry store on hash rather than BSONObj"
This reverts commit b6eab7e7d83b10cef5c57f781c1751b465aade9f.
Diffstat (limited to 'src/mongo/s')
| -rw-r--r-- | src/mongo/s/query/cluster_client_cursor_impl.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/s/query/cluster_client_cursor_impl.h | 3 | ||||
| -rw-r--r-- | src/mongo/s/query/cluster_cursor_manager.cpp | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/mongo/s/query/cluster_client_cursor_impl.cpp b/src/mongo/s/query/cluster_client_cursor_impl.cpp index 939637d0f32..9cc44be6811 100644 --- a/src/mongo/s/query/cluster_client_cursor_impl.cpp +++ b/src/mongo/s/query/cluster_client_cursor_impl.cpp @@ -75,7 +75,6 @@ ClusterClientCursorImpl::ClusterClientCursorImpl(OperationContext* opCtx, _lastUseDate(_createdDate), _queryHash(CurOp::get(opCtx)->debug().queryHash), _shouldOmitDiagnosticInformation(CurOp::get(opCtx)->debug().shouldOmitDiagnosticInformation), - _telemetryStoreKeyHash(CurOp::get(opCtx)->debug().telemetryStoreKeyHash), _telemetryStoreKey(CurOp::get(opCtx)->debug().telemetryStoreKey), _telemetryRequestShapifier(std::move(CurOp::get(opCtx)->debug().telemetryRequestShapifier)) { dassert(!_params.compareWholeSortKeyOnRouter || @@ -137,9 +136,8 @@ void ClusterClientCursorImpl::kill(OperationContext* opCtx) { "Cannot kill a cluster client cursor that has already been killed", !_hasBeenKilled); - if (_telemetryStoreKeyHash && opCtx) { + if (_telemetryStoreKey && opCtx) { telemetry::writeTelemetry(opCtx, - _telemetryStoreKeyHash, _telemetryStoreKey, std::move(_telemetryRequestShapifier), _metrics.executionTime.value_or(Microseconds{0}).count(), diff --git a/src/mongo/s/query/cluster_client_cursor_impl.h b/src/mongo/s/query/cluster_client_cursor_impl.h index ecb7535715c..8f23c25ff02 100644 --- a/src/mongo/s/query/cluster_client_cursor_impl.h +++ b/src/mongo/s/query/cluster_client_cursor_impl.h @@ -32,7 +32,6 @@ #include <memory> #include <queue> -#include "mongo/bson/bsonobj.h" #include "mongo/executor/task_executor.h" #include "mongo/s/query/cluster_client_cursor.h" #include "mongo/s/query/cluster_client_cursor_guard.h" @@ -186,8 +185,6 @@ private: bool _shouldOmitDiagnosticInformation = false; // If boost::none, telemetry should not be collected for this cursor. - boost::optional<std::size_t> _telemetryStoreKeyHash; - // TODO: SERVER-73152 remove telemetryStoreKey when RequestShapifier is used for agg. boost::optional<BSONObj> _telemetryStoreKey; // The RequestShapifier used by telemetry to shapify the request payload into the telemetry // store key. diff --git a/src/mongo/s/query/cluster_cursor_manager.cpp b/src/mongo/s/query/cluster_cursor_manager.cpp index d8e47e55ecf..1cfbd7bf700 100644 --- a/src/mongo/s/query/cluster_cursor_manager.cpp +++ b/src/mongo/s/query/cluster_cursor_manager.cpp @@ -598,7 +598,6 @@ void collectTelemetryMongos(OperationContext* opCtx, auto&& opDebug = CurOp::get(opCtx)->debug(); telemetry::writeTelemetry( opCtx, - opDebug.telemetryStoreKeyHash, opDebug.telemetryStoreKey, std::move(requestShapifier), opDebug.additiveMetrics.executionTime.value_or(Microseconds{0}).count(), |