4 files changed, 22 insertions, 0 deletions
diff --git a/src/mongo/bson/bsontypes.cpp b/src/mongo/bson/bsontypes.cpp
index ee806e0e8a7..8ff370ec12f 100644
--- a/src/mongo/bson/bsontypes.cpp
+++ b/src/mongo/bson/bsontypes.cpp
@@ -95,6 +95,10 @@ const char* typeName(BSONType type) {
     }
 }
 
+std::ostream& operator<<(std::ostream& stream, BSONType type) {
+    return stream << typeName(type);
+}
+
 bool isValidBSONType(int type) {
     switch (type) {
         case MinKey:
diff --git a/src/mongo/bson/bsontypes.h b/src/mongo/bson/bsontypes.h
index 622547ca098..e3fde085ad9 100644
--- a/src/mongo/bson/bsontypes.h
+++ b/src/mongo/bson/bsontypes.h
@@ -29,6 +29,8 @@
 
 #pragma once
 
+#include <iosfwd>
+
 #include "mongo/config.h"
 #include "mongo/platform/decimal128.h"
 #include "mongo/util/assert_util.h"
@@ -118,6 +120,11 @@ enum BSONType {
 const char* typeName(BSONType type);
 
 /**
+ * Prints the name of the argument's type to the given stream.
+ */
+std::ostream& operator<<(std::ostream& stream, BSONType type);
+
+/**
  * Returns whether or not 'type' can be converted to a valid BSONType.
  */
 bool isValidBSONType(int type);
diff --git a/src/mongo/bson/util/builder.h b/src/mongo/bson/util/builder.h
index 2cce0d93ad5..e6d29ceb175 100644
--- a/src/mongo/bson/util/builder.h
+++ b/src/mongo/bson/util/builder.h
@@ -41,6 +41,7 @@
 #include "mongo/base/data_view.h"
 #include "mongo/base/disallow_copying.h"
 #include "mongo/base/string_data.h"
+#include "mongo/bson/bsontypes.h"
 #include "mongo/bson/inline_decls.h"
 #include "mongo/platform/decimal128.h"
 #include "mongo/stdx/type_traits.h"
@@ -411,6 +412,10 @@ public:
         append(str);
         return *this;
     }
+    StringBuilderImpl& operator<<(BSONType type) {
+        append(typeName(type));
+        return *this;
+    }
 
     void appendDoubleNice(double x) {
         const int prev = _buf.l;
diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h
index 04e1583073c..001175e6e1c 100644
--- a/src/mongo/logger/logstream_builder.h
+++ b/src/mongo/logger/logstream_builder.h
@@ -31,6 +31,7 @@
 #include <sstream>
 #include <string>
 
+#include "mongo/bson/bsontypes.h"
 #include "mongo/logger/labeled_level.h"
 #include "mongo/logger/log_component.h"
 #include "mongo/logger/log_severity.h"
@@ -189,6 +190,11 @@ public:
         return *this;
     }
 
+    LogstreamBuilder& operator<<(BSONType t) {
+        stream() << typeName(t);
+        return *this;
+    }
+
     template <typename T>
     LogstreamBuilder& operator<<(const T& x) {
         stream() << x.toString();