diff options
| author | Erin McNulty <erin.mcnulty@mongodb.com> | 2022-06-17 18:10:09 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-17 18:52:28 +0000 |
| commit | 25450dbb0e50c4194c80cf8719771c58f871eefb (patch) | |
| tree | 1cd1138250a0330b4412425cf89a7c56778e773a /src/mongo/rpc | |
| parent | 866cb8fb5a50dd4b8bfe47824d90f6091a43a312 (diff) | |
| download | mongo-25450dbb0e50c4194c80cf8719771c58f871eefb.tar.gz | |
SERVER-62683: Client Metadata Information Should Show Pid In Testing Mode
Diffstat (limited to 'src/mongo/rpc')
| -rw-r--r-- | src/mongo/rpc/metadata/client_metadata.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/rpc/metadata/client_metadata_test.cpp | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp index f66941d803f..626a340284e 100644 --- a/src/mongo/rpc/metadata/client_metadata.cpp +++ b/src/mongo/rpc/metadata/client_metadata.cpp @@ -307,7 +307,7 @@ void ClientMetadata::serialize(StringData driverName, ProcessInfo processInfo; std::string appName; - if (kDebugBuild) { + if (TestingProctor::instance().isEnabled()) { appName = processInfo.getProcessName(); if (appName.length() > kMaxApplicationNameByteLength) { static constexpr auto kEllipsis = "..."_sd; @@ -368,7 +368,7 @@ Status ClientMetadata::serializePrivate(StringData driverName, if (!appName.empty()) { BSONObjBuilder subObjBuilder(metaObjBuilder.subobjStart(kApplication)); subObjBuilder.append(kName, appName); - if (kDebugBuild) { + if (TestingProctor::instance().isEnabled()) { subObjBuilder.append(kPid, ProcessId::getCurrent().toString()); } } diff --git a/src/mongo/rpc/metadata/client_metadata_test.cpp b/src/mongo/rpc/metadata/client_metadata_test.cpp index 9d4c000abb9..994cdf489e8 100644 --- a/src/mongo/rpc/metadata/client_metadata_test.cpp +++ b/src/mongo/rpc/metadata/client_metadata_test.cpp @@ -47,6 +47,7 @@ #include "mongo/unittest/unittest.h" #include "mongo/util/processinfo.h" #include "mongo/util/scopeguard.h" +#include "mongo/util/testing_proctor.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest @@ -104,8 +105,9 @@ TEST(ClientMetadataTest, TestLoopbackTest) { .append(kApplication, BOB{} .append(kName, "g") - .appendElements(kDebugBuild ? BOB{}.append(kPid, pid).obj() - : BOB{}.obj()) + .appendElements(TestingProctor::instance().isEnabled() + ? BOB{}.append(kPid, pid).obj() + : BOB{}.obj()) .obj()) .append(kDriver, BOB{}.append(kName, "a").append(kVersion, "b").obj()) .append(kOperatingSystem, @@ -329,7 +331,9 @@ TEST(ClientMetadataTest, TestMongoSAppend) { .append(kApplication, BOB{} .append(kName, "g") - .appendElements(kDebugBuild ? BOB{}.append(kPid, pid).obj() : BOB{}.obj()) + .appendElements(TestingProctor::instance().isEnabled() + ? BOB{}.append(kPid, pid).obj() + : BOB{}.obj()) .obj()) .append(kDriver, BOB{}.append(kName, "a").append(kVersion, "b").obj()) .append(kOperatingSystem, |