SERVER-25759 Quote appname in slow log output

2 files changed, 3 insertions, 2 deletions

diff --git a/jstests/noPassthrough/client_metadata_slowlog.js b/jstests/noPassthrough/client_metadata_slowlog.js
index 5a270693d56..bef9b0ce9e7 100644
--- a/jstests/noPassthrough/client_metadata_slowlog.js
+++ b/jstests/noPassthrough/client_metadata_slowlog.js
@@ -22,7 +22,7 @@
     print(`Checking ${conn.fullOptions.logFile} for client metadata message`);
     let log = cat(conn.fullOptions.logFile);
     assert(
-        /COMMAND .* command test.foo appName:MongoDB Shell command: count { count: "foo", query: { \$where: function ()/
+        /COMMAND .* command test.foo appName: "MongoDB Shell" command: count { count: "foo", query: { \$where: function ()/
             .test(log),
         "'slow query' log line missing in mongod log file!\n" + "Log file contents: " +
             conn.fullOptions.logFile +
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 527847c4df6..9d14fbd44c5 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -44,6 +44,7 @@
 #include "mongo/rpc/metadata/client_metadata.h"
 #include "mongo/rpc/metadata/client_metadata_ismaster.h"
 #include "mongo/util/log.h"
+#include "mongo/util/stringutils.h"
 
 namespace mongo {
 
@@ -425,7 +426,7 @@ string OpDebug::report(Client* client,
     if (clientMetadata) {
         auto appName = clientMetadata.get().getApplicationName();
         if (!appName.empty()) {
-            s << " appName:" << appName;
+            s << " appName: \"" << escape(appName) << '\"';
         }
     }