SERVER-42017 make stage names in error messages match name used

1 files changed, 12 insertions, 3 deletions

diff --git a/src/mongo/db/pipeline/document_source_add_fields.cpp b/src/mongo/db/pipeline/document_source_add_fields.cpp
index 319ef9776c6..8784a5ebf16 100644
--- a/src/mongo/db/pipeline/document_source_add_fields.cpp
+++ b/src/mongo/db/pipeline/document_source_add_fields.cpp
@@ -50,14 +50,23 @@ REGISTER_DOCUMENT_SOURCE(set,
                          DocumentSourceAddFields::createFromBson);
 
 intrusive_ptr<DocumentSource> DocumentSourceAddFields::create(
-    BSONObj addFieldsSpec, const intrusive_ptr<ExpressionContext>& expCtx, StringData stageName) {
+    BSONObj addFieldsSpec,
+    const intrusive_ptr<ExpressionContext>& expCtx,
+    StringData userSpecifiedName) {
 
     const bool isIndependentOfAnyCollection = false;
     intrusive_ptr<DocumentSourceSingleDocumentTransformation> addFields(
         new DocumentSourceSingleDocumentTransformation(
             expCtx,
-            ParsedAddFields::create(expCtx, addFieldsSpec),
-            stageName.toString(),
+            [&]() {
+                try {
+                    return ParsedAddFields::create(expCtx, addFieldsSpec);
+                } catch (DBException& ex) {
+                    ex.addContext("Invalid " + userSpecifiedName.toString());
+                    throw;
+                }
+            }(),
+            userSpecifiedName.toString(),
             isIndependentOfAnyCollection));
     return addFields;
 }