diff options
author | Ben Caimano <ben.caimano@10gen.com> | 2020-10-08 02:02:24 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-15 17:21:11 +0000 |
commit | 5a9d2dd204f41b4a02fe83d710f3f38c6092b322 (patch) | |
tree | a45a543241ad8b4159e3356ce4d4db151dd5af07 /src/mongo/db/introspect.cpp | |
parent | dba33bef953f8d1740523c159c66f0fb3b9b53d4 (diff) | |
download | mongo-5a9d2dd204f41b4a02fe83d710f3f38c6092b322.tar.gz |
SERVER-49336 Set ClientMetadata before CommandInvocations are run
This patch does the following:
- Always parses ClientMetadata before command implementations are run.
- Marks general ClientMetadata as final in the first hello.
- Removes client_metadata_ismaster.* (SERVER-50517)
- Switches references to "isMaster" to "hello" (SERVER-50517)
- Binds "$client" metadata as a decoration (SERVER-50804)
Diffstat (limited to 'src/mongo/db/introspect.cpp')
-rw-r--r-- | src/mongo/db/introspect.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp index 307723838fd..89fea0c89cb 100644 --- a/src/mongo/db/introspect.cpp +++ b/src/mongo/db/introspect.cpp @@ -46,7 +46,6 @@ #include "mongo/db/stats/resource_consumption_metrics.h" #include "mongo/logv2/log.h" #include "mongo/rpc/metadata/client_metadata.h" -#include "mongo/rpc/metadata/client_metadata_ismaster.h" #include "mongo/util/scopeguard.h" namespace mongo { @@ -79,10 +78,8 @@ void profile(OperationContext* opCtx, NetworkOp op) { b.appendDate("ts", jsTime()); b.append("client", opCtx->getClient()->clientAddress()); - const auto& clientMetadata = - ClientMetadataIsMasterState::get(opCtx->getClient()).getClientMetadata(); - if (clientMetadata) { - auto appName = clientMetadata.get().getApplicationName(); + if (auto clientMetadata = ClientMetadata::get(opCtx->getClient())) { + auto appName = clientMetadata->getApplicationName(); if (!appName.empty()) { b.append("appName", appName); } |