SERVER-74213: Remove hashedTelemetryKey from find and agg commands

10 files changed, 0 insertions, 344 deletions

diff --git a/jstests/noPassthrough/telemetry/telemetry_sharded_on_mongod.js b/jstests/noPassthrough/telemetry/telemetry_sharded_on_mongod.js
deleted file mode 100644
index 3876f7c94ae..00000000000
--- a/jstests/noPassthrough/telemetry/telemetry_sharded_on_mongod.js
+++ /dev/null
@@ -1,166 +0,0 @@
-// Tests that queries from mongos to mongod record telemetry correctly on mongod.
-// Does not test any mongos logic on the telemetry read path.
-// @tags: [
-//   __TEMPORARILY_DISABLED__, # TODO: SERVER-74945
-//   featureFlagTelemetry,
-//   requires_fcv_63,
-//   requires_sharding,
-// ]
-//
-load('jstests/libs/analyze_plan.js');
-load("jstests/libs/feature_flag_util.js");
-
-(function() {
-"use strict";
-
-let options = {
-    setParameter: {internalQueryConfigureTelemetrySamplingRate: 2147483647},
-};
-
-const conn = MongoRunner.runMongod(options);
-let db = conn.getDB(jsTestName());
-let coll = db[jsTestName()];
-coll.drop();
-
-// Insert documents.
-let documents = [];
-for (let i = 0; i < 10; i++) {
-    documents.push({_id: i, val: i * 5});
-}
-
-coll.insert(documents);
-
-// Run a query that pretends to be from mongos. For the purposes of this test we don't care about
-// the results. If the command worked, it should show up in the telemetry store.
-
-const queryHashForTestBinA = new BinData(5, "Q4fGyPrguloyCjEQ/JJk9Q==");
-assert.commandWorked(db.runCommand({
-    aggregate: coll.getName(),
-    pipeline: [{$match: {_id: 5}}, {$project: {val: false}}],
-    fromMongos: true,
-    needsMerge: true,
-    hashedTelemetryKey: {queryHash: queryHashForTestBinA, hostAndPort: "localHost:1"},
-    cursor: {},
-}));
-
-const queryHashForTestBinB = new BinData(5, "Tfo0EBc0wbGscAbGuj7goA==");
-// Do the same, but a find command.
-assert.commandWorked(db.runCommand({
-    find: coll.getName(),
-    filter: {_id: 5},
-    sort: {_id: 1},
-    projection: {val: false},
-    hashedTelemetryKey: {queryHash: queryHashForTestBinB, hostAndPort: "localHost:1"},
-}));
-
-// Check the telemetry store.
-const telemetryResult = assert.commandWorked(
-    db.adminCommand({aggregate: 1, pipeline: [{$telemetry: {}}, {$sort: {"key": 1}}], cursor: {}}));
-// Assert that the telemetry object has the "hashed key" as a key as expected and not the query
-// shape for both commands.
-let telemetryResultBatch = telemetryResult.cursor.firstBatch;
-assert(telemetryResultBatch[0].key.hasOwnProperty("queryHash"), tojson(telemetryResultBatch[0]));
-assert.eq(
-    telemetryResultBatch[0].key.queryHash, queryHashForTestBinA, tojson(telemetryResultBatch[0]));
-assert(telemetryResultBatch[1].key.hasOwnProperty("queryHash"), tojson(telemetryResultBatch[1]));
-assert.eq(
-    telemetryResultBatch[1].key.queryHash, queryHashForTestBinB, tojson(telemetryResultBatch[1]));
-
-MongoRunner.stopMongod(conn);
-
-// Spin up a sharded cluster to test end to end.
-const st = new ShardingTest({
-    mongos: 1,
-    shards: 1,
-    config: 1,
-    rs: {nodes: 1},
-    rsOptions: options,
-    shardOptions: options,
-    mongosOptions: options,
-});
-
-const mongos = st.s;
-db = mongos.getDB(jsTestName());
-assert(FeatureFlagUtil.isEnabled(db, "Telemetry"), "featureFlagTelemetry not enabled");
-coll = db[jsTestName()];
-coll.insert(documents);
-
-// Helper function to run the test regardless of the sharding state of the collection.
-function runTestOnDbAndColl(funcDb, funcColl, funcShardTest) {
-    // Run an aggregation command.
-    assert.commandWorked(funcDb.runCommand({
-        aggregate: funcColl.getName(),
-        pipeline: [{$match: {_id: 5}}, {$project: {val: false}}],
-        cursor: {},
-    }));
-
-    // Run a find command.
-    assert.commandWorked(funcDb.runCommand({
-        find: funcColl.getName(),
-        filter: {_id: 5},
-        sort: {_id: 1},
-        projection: {val: false},
-    }));
-
-    const mongod = funcShardTest.getPrimaryShard(funcDb.getName());
-    const shardDB = mongod.getDB(jsTestName());
-    // Check that these commands generated something in the shard telemetry store.
-    const shardedTelemetryResult = assert.commandWorked(shardDB.adminCommand({
-        aggregate: 1,
-        pipeline: [
-            {$telemetry: {}},
-            {$match: {"key.queryHash": {"$exists": true}}},
-            {$sort: {"key.queryHash": 1}}
-        ],
-        cursor: {}
-    }));
-
-    let telemetryResultBatch = shardedTelemetryResult.cursor.firstBatch;
-    // We can't check the value of hostandport as we may be assigned a different value each run. The
-    // hash should be deterministic.
-    // Note that this test is for checking mongod, not mongos. We are not checking whether mongos
-    // correctly aggregates results, just that mongod has a hashed key.
-    assert(telemetryResultBatch[0].key.hasOwnProperty("queryHash"),
-           tojson(telemetryResultBatch[0]));
-    assert.eq(telemetryResultBatch[0].key.queryHash,
-              queryHashForTestBinA,
-              tojson(telemetryResultBatch[1]));
-    assert(telemetryResultBatch[1].key.hasOwnProperty("queryHash"),
-           tojson(telemetryResultBatch[0]));
-    assert.eq(telemetryResultBatch[1].key.queryHash,
-              queryHashForTestBinB,
-              tojson(telemetryResultBatch[1]));
-}
-runTestOnDbAndColl(db, coll, st);
-
-// Restart the cluster to clear the telemetry store.
-st.stop();
-
-// We're going to shard the collection, so have two shards this time.
-const shardedST = new ShardingTest({
-    mongos: 1,
-    shards: 2,
-    config: 1,
-    rs: {nodes: 1},
-    rsOptions: options,
-    mongosOptions: options,
-});
-
-const shardedMongos = shardedST.s;
-db = shardedMongos.getDB(jsTestName());
-assert(FeatureFlagUtil.isEnabled(db, "Telemetry"), "featureFlagTelemetry not enabled");
-assert.commandWorked(db.adminCommand({enableSharding: db.getName()}));
-coll = db[jsTestName()];
-coll.insert(documents);
-assert.commandWorked(
-    shardedMongos.adminCommand({shardCollection: coll.getFullName(), key: {_id: 1}}));
-// Ensure docs on each shard.
-assert.commandWorked(db.adminCommand({split: coll.getFullName(), middle: {_id: 5}}));
-assert.commandWorked(shardedMongos.adminCommand(
-    {moveChunk: coll.getFullName(), find: {_id: 3}, to: shardedST.shard0.shardName}));
-assert.commandWorked(shardedMongos.adminCommand(
-    {moveChunk: coll.getFullName(), find: {_id: 7}, to: shardedST.shard1.shardName}));
-
-runTestOnDbAndColl(db, coll, shardedST);
-shardedST.stop();
-}());
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index ddf13861347..9d07159ca23 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -75,8 +75,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/db/write_concern_options',
         'document_sources_idl',
-    ], LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/query/telemetry_idl',
     ])
 
 env.Library(
@@ -182,7 +180,6 @@ env.Library(
         'sharded_agg_helpers.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/query/op_metrics',
         '$BUILD_DIR/mongo/s/async_requests_sender',
         '$BUILD_DIR/mongo/s/query/cluster_query',
         'aggregation',
diff --git a/src/mongo/db/pipeline/aggregate_command.idl b/src/mongo/db/pipeline/aggregate_command.idl
index 8cb7e6c6cef..a4b890b033c 100644
--- a/src/mongo/db/pipeline/aggregate_command.idl
+++ b/src/mongo/db/pipeline/aggregate_command.idl
@@ -43,7 +43,6 @@ imports:
     - "mongo/db/pipeline/legacy_runtime_constants.idl"
     - "mongo/db/query/hint.idl"
     - "mongo/db/query/cursor_response.idl"
-    - "mongo/db/query/telemetry.idl"
     - "mongo/db/write_concern_options.idl"
 
 types:
@@ -310,9 +309,4 @@ commands:
                 type: optionalBool
                 cpp_name: isClusterQueryWithoutShardKeyCmd
                 stability: internal
-            hashedTelemetryKey:
-                description: "For sharded queries the telemetry key is calculated on mongos instead of from the full query shape locally"
-                type: ShardedTelemetryStoreKey 
-                optional: true
-                stability: internal
             
diff --git a/src/mongo/db/pipeline/sharded_agg_helpers.cpp b/src/mongo/db/pipeline/sharded_agg_helpers.cpp
index c72ed111884..934dd54a7da 100644
--- a/src/mongo/db/pipeline/sharded_agg_helpers.cpp
+++ b/src/mongo/db/pipeline/sharded_agg_helpers.cpp
@@ -52,7 +52,6 @@
 #include "mongo/db/pipeline/search_helper.h"
 #include "mongo/db/pipeline/semantic_analysis.h"
 #include "mongo/db/query/cursor_response_gen.h"
-#include "mongo/db/query/telemetry.h"
 #include "mongo/db/vector_clock.h"
 #include "mongo/logv2/log.h"
 #include "mongo/rpc/get_status_from_command_result.h"
@@ -67,7 +66,6 @@
 #include "mongo/s/stale_exception.h"
 #include "mongo/s/transaction_router.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/net/socket_utils.h"
 #include "mongo/util/overloaded_visitor.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery
@@ -760,17 +758,6 @@ void abandonCacheIfSentToShards(Pipeline* shardsPipeline) {
     }
 }
 
-void setTelemetryKeyOnAggRequest(AggregateCommandRequest& request, ExpressionContext* expCtx) {
-    if (!telemetry::isTelemetryEnabled()) {
-        return;
-    }
-
-    if (auto telemetryKey = telemetry::getTelemetryKeyFromOpCtx(expCtx->opCtx)) {
-        request.setHashedTelemetryKey(
-            telemetry::telemetryKeyToShardedStoreId(*telemetryKey, getHostNameCachedAndPort()));
-    }
-}
-
 }  // namespace
 
 std::unique_ptr<Pipeline, PipelineDeleter> targetShardsAndAddMergeCursors(
@@ -817,7 +804,6 @@ std::unique_ptr<Pipeline, PipelineDeleter> targetShardsAndAddMergeCursors(
     LiteParsedPipeline liteParsedPipeline(aggRequest);
     auto hasChangeStream = liteParsedPipeline.hasChangeStream();
     auto startsWithDocuments = liteParsedPipeline.startsWithDocuments();
-    setTelemetryKeyOnAggRequest(aggRequest, expCtx.get());
     auto shardDispatchResults =
         dispatchShardPipeline(aggregation_request_helper::serializeToCommandDoc(aggRequest),
                               hasChangeStream,
@@ -991,9 +977,6 @@ BSONObj createPassthroughCommandForShard(
         }
     }
 
-    telemetry::appendShardedTelemetryKeyIfApplicable(
-        targetedCmd, getHostNameCachedAndPort(), expCtx->opCtx);
-
     auto shardCommand = genericTransformForShards(std::move(targetedCmd),
                                                   expCtx,
                                                   explainVerbosity,
@@ -1531,7 +1514,6 @@ BSONObj targetShardsForExplain(Pipeline* ownedPipeline) {
     }();
 
     AggregateCommandRequest aggRequest(expCtx->ns, rawStages);
-    setTelemetryKeyOnAggRequest(aggRequest, expCtx.get());
     LiteParsedPipeline liteParsedPipeline(aggRequest);
     auto hasChangeStream = liteParsedPipeline.hasChangeStream();
     auto startsWithDocuments = liteParsedPipeline.startsWithDocuments();
diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index c8c7eacd32a..6e94c559040 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -247,7 +247,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
         'cursor_response_idl',
-        'telemetry_idl',
     ],
 )
 
@@ -390,7 +389,6 @@ env.Library(
         'memory_util',
         'query_knobs',
         'rate_limiting',
-        'telemetry_idl',
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/auth/auth',
@@ -401,22 +399,12 @@ env.Library(
         # TODO (SERVER-66896): Remove this dependency.
         '$BUILD_DIR/mongo/db/storage/storage_engine_feature_flags',
         '$BUILD_DIR/mongo/util/concurrency/admission_context',
-        '$BUILD_DIR/mongo/util/md5',
         '$BUILD_DIR/mongo/util/namespace_string_database_name_util',
         'projection_ast',
         'sort_pattern',
     ],
 )
 
-env.Library(
-    target='telemetry_idl',
-    source=['telemetry.idl'],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        "$BUILD_DIR/mongo/idl/idl_parser",
-    ],
-)
-
 env.CppUnitTest(
     target="db_query_test",
     source=[
diff --git a/src/mongo/db/query/find_command.idl b/src/mongo/db/query/find_command.idl
index b43ef171c4d..c7a157dc810 100644
--- a/src/mongo/db/query/find_command.idl
+++ b/src/mongo/db/query/find_command.idl
@@ -44,7 +44,6 @@ imports:
     - "mongo/db/basic_types.idl"
     - "mongo/db/query/cursor_response.idl"
     - "mongo/db/query/hint.idl"
-    - "mongo/db/query/telemetry.idl"
 
 types:
     boolNoOpSerializer:
@@ -249,9 +248,4 @@ commands:
         type: uuid
         optional: true
         stability: unstable
-      hashedTelemetryKey:
-        description: "For sharded queries the telemetry key is calculated on mongos instead of from the full query shape locally"
-        type: ShardedTelemetryStoreKey 
-        optional: true
-        stability: internal
 
diff --git a/src/mongo/db/query/telemetry.cpp b/src/mongo/db/query/telemetry.cpp
index 4f4864a6f96..ffab6e36ba4 100644
--- a/src/mongo/db/query/telemetry.cpp
+++ b/src/mongo/db/query/telemetry.cpp
@@ -51,10 +51,8 @@
 #include "mongo/rpc/metadata/client_metadata.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/debug_util.h"
-#include "mongo/util/md5.hpp"
 #include "mongo/util/processinfo.h"
 #include "mongo/util/system_clock_source.h"
-#include <array>
 #include <optional>
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery
@@ -63,23 +61,6 @@ namespace mongo {
 
 namespace telemetry {
 
-// This is defined by IDL in the find and aggregate command, but we don't want to pull in those
-// files/libraries here. Instead define here as well.
-static const std::string kTelemetryKeyInShardedCommand = "hashedTelemetryKey";
-
-
-ShardedTelemetryStoreKey telemetryKeyToShardedStoreId(const BSONObj& key, std::string hostAndPort) {
-    md5digest finishedMD5;
-    std::array<unsigned char, 16> md5Bin;
-    md5(key.objdata(), 16, finishedMD5);
-    std::copy(std::begin(finishedMD5), std::end(finishedMD5), std::begin(md5Bin));
-    return ShardedTelemetryStoreKey(hostAndPort, md5Bin);
-}
-
-boost::optional<BSONObj> getTelemetryKeyFromOpCtx(OperationContext* opCtx) {
-    return CurOp::get(opCtx)->debug().telemetryStoreKey;
-}
-
 /**
  * Redacts all BSONObj field names as if they were paths, unless the field name is a special hint
  * operator.
@@ -360,32 +341,6 @@ StatusWith<BSONObj> makeTelemetryKey(const FindCommandRequest& findCommand,
     return bob.obj();
 }
 
-void appendShardedTelemetryKeyIfApplicable(MutableDocument& objToModify,
-                                           std::string hostAndPort,
-                                           OperationContext* opCtx) {
-    if (!isTelemetryEnabled()) {
-        return;
-    }
-    if (auto telemetryKey = getTelemetryKeyFromOpCtx(opCtx)) {
-        objToModify.addField(
-            kTelemetryKeyInShardedCommand,
-            Value(telemetryKeyToShardedStoreId(*telemetryKey, hostAndPort).toBSON()));
-    }
-}
-
-void appendShardedTelemetryKeyIfApplicable(BSONObjBuilder& objToModify,
-                                           std::string hostAndPort,
-                                           OperationContext* opCtx) {
-    if (!isTelemetryEnabled()) {
-        return;
-    }
-    auto telemetryKey = getTelemetryKeyFromOpCtx(opCtx);
-    if (!telemetryKey) {
-        return;
-    }
-    objToModify.append(kTelemetryKeyInShardedCommand,
-                       telemetryKeyToShardedStoreId(*telemetryKey, hostAndPort).toBSON());
-}
 CounterMetric telemetryStoreSizeEstimateBytesMetric("telemetry.telemetryStoreSizeEstimateBytes");
 namespace {
 
@@ -731,13 +686,7 @@ void registerAggRequest(const AggregateCommandRequest& request, OperationContext
     if (!shouldCollect(opCtx->getServiceContext())) {
         return;
     }
-    if (auto hashKey = request.getHashedTelemetryKey()) {
-        // The key is in the command request in "telemetryKey".
-        CurOp::get(opCtx)->debug().telemetryStoreKey = hashKey->toBSON();
-        return;
-    }
 
-    // On standalone build the key from the request.
     BSONObjBuilder telemetryKey;
     BSONObjBuilder pipelineBuilder = telemetryKey.subarrayStart("pipeline"_sd);
     try {
@@ -778,12 +727,6 @@ void registerFindRequest(const FindCommandRequest& request,
         return;
     }
 
-    if (auto hashKey = request.getHashedTelemetryKey()) {
-        // The key is in the command request in "hashedTelemetryKey".
-        CurOp::get(opCtx)->debug().telemetryStoreKey = hashKey->toBSON();
-        return;
-    }
-
     SerializationOptions options;
     options.replacementForLiteralArgs = replacementForLiteralArgs;
     auto swTelemetryKey = makeTelemetryKey(request, options, expCtx);
diff --git a/src/mongo/db/query/telemetry.h b/src/mongo/db/query/telemetry.h
index 9bf3fbd7160..622269e98fb 100644
--- a/src/mongo/db/query/telemetry.h
+++ b/src/mongo/db/query/telemetry.h
@@ -36,7 +36,6 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/query/partitioned_cache.h"
 #include "mongo/db/query/plan_explainer.h"
-#include "mongo/db/query/telemetry_gen.h"
 #include "mongo/db/query/util/memory_util.h"
 #include "mongo/db/service_context.h"
 #include <cstdint>
@@ -60,28 +59,6 @@ namespace telemetry {
 bool isTelemetryEnabled();
 
 /**
- * Generate a Telemetry Store key to be used on a shard from a Telemetry Store key that is being
- * used on mongos.
- */
-ShardedTelemetryStoreKey telemetryKeyToShardedStoreId(const BSONObj& key, std::string hostAndPort);
-/**
- * Get the telemetry query shape from the opCtx.
- */
-boost::optional<BSONObj> getTelemetryKeyFromOpCtx(OperationContext* opCtx);
-
-/**
- * Given an object builder these functions append the telemetry key to it in the form
- * for sharded commands {hostAndPort and hashedKey}. If there is no telemetry key available
- * on the opCtx, does not modify the object.
- */
-void appendShardedTelemetryKeyIfApplicable(MutableDocument& objToModify,
-                                           std::string hostAndPort,
-                                           OperationContext* opCtx);
-void appendShardedTelemetryKeyIfApplicable(BSONObjBuilder& objToModify,
-                                           std::string hostAndPort,
-                                           OperationContext* opCtx);
-
-/**
  * An aggregated metric stores a compressed view of data. It balances the loss of information
  * with the reduction in required storage.
  */
diff --git a/src/mongo/db/query/telemetry.idl b/src/mongo/db/query/telemetry.idl
deleted file mode 100644
index fd233c98a2a..00000000000
--- a/src/mongo/db/query/telemetry.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright(C) 2023 - present MongoDB, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the Server Side Public License, version 1,
-# as published by MongoDB, Inc.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Server Side Public License for more details.
-#
-# You should have received a copy of the Server Side Public License
-# along with this program. If not, see
-# <http://www.mongodb.com/licensing/server-side-public-license>.
-#
-# As a special exception, the copyright holders give permission to link the
-# code of portions of this program with the OpenSSL library under certain
-# conditions as described in each individual source file and distribute
-# linked combinations including the program with the OpenSSL library. You
-# must comply with the Server Side Public License in all respects for
-# all of the code used other than as permitted herein. If you modify file(s)
-# with this exception, you may extend this exception to your version of the
-# file(s), but you are not obligated to do so. If you do not wish to do so,
-# delete this exception statement from your version. If you delete this
-# exception statement from all source files in the program, then also delete
-# it in the license file.
-#
-
-# This IDL file describes the format of options needed for any command that can enable telemetry.
-
-global:
-  cpp_namespace: "mongo"
-
-imports:
-    - "mongo/db/basic_types.idl"
-
-structs:
-    ShardedTelemetryStoreKey:
-        description: "The hash of a query shape and the host:port of the originating mongos"
-        fields:
-            hostAndPort:
-                type: string
-                stability: internal
-                optional: false
-            queryHash:
-                type: bindata_md5
-                stability: internal
-                optional: false
- 
\ No newline at end of file
diff --git a/src/mongo/s/query/cluster_find.cpp b/src/mongo/s/query/cluster_find.cpp
index e43d0614971..18b9b9dbacf 100644
--- a/src/mongo/s/query/cluster_find.cpp
+++ b/src/mongo/s/query/cluster_find.cpp
@@ -47,7 +47,6 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/curop_failpoint_helpers.h"
-#include "mongo/db/fle_crud.h"
 #include "mongo/db/pipeline/change_stream_invalidation_info.h"
 #include "mongo/db/query/canonical_query.h"
 #include "mongo/db/query/canonical_query_encoder.h"
@@ -74,7 +73,6 @@
 #include "mongo/s/stale_exception.h"
 #include "mongo/s/transaction_router.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/net/socket_utils.h"
 #include "mongo/util/scopeguard.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery
@@ -207,8 +205,6 @@ std::vector<std::pair<ShardId, BSONObj>> constructRequestsForShards(
             analyze_shard_key::appendSampleId(&cmdBuilder, *sampleId);
         }
 
-        telemetry::appendShardedTelemetryKeyIfApplicable(
-            cmdBuilder, getHostNameCachedAndPort(), opCtx);
         requests.emplace_back(shardId, cmdBuilder.obj());
     }