Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 14 insertions, 12 deletions

diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp
index 2bbfd8867bd..2bf807ed4ae 100644
--- a/src/mongo/util/stacktrace_posix.cpp
+++ b/src/mongo/util/stacktrace_posix.cpp
@@ -97,6 +97,9 @@ struct Options {
     // Add the processInfo block
     bool withProcessInfo = true;
 
+    // Add "human readable" breakdown when dumping stack. 1 line per frame.
+    bool withHumanReadable = true;
+
     // only include the somap entries relevant to the backtrace
     bool trimSoMap = true;
 
@@ -421,7 +424,7 @@ private:
  * analysis tool. For example, on Linux it contains a subobject named "somap", describing
  * the objects referenced in the "b" fields of the "backtrace" list.
  */
-StackTrace getStackTraceImpl(const Options& options) {
+void printStackTraceImpl(const Options& options, StackTraceSink* sink = nullptr) {
     using namespace fmt::literals;
     std::string err;
     BSONObjBuilder bob;
@@ -438,9 +441,16 @@ StackTrace getStackTraceImpl(const Options& options) {
     appendStackTraceObject(&bob, iteration, options);
 #endif
 
-    return StackTrace(bob.obj(), err);
+    if (!err.empty()) {
+        if (sink) {
+            *sink << fmt::format(FMT_STRING("Error collecting stack trace: {}"), err);
+        }
+        LOGV2_ERROR(31430, "Error collecting stack trace", "error"_attr = err);
+    }
+    stack_trace_detail::logBacktraceObject(bob.done(), sink, options.withHumanReadable);
 }
 
+
 }  // namespace
 }  // namespace stack_trace_detail
 
@@ -464,17 +474,10 @@ const StackTraceAddressMetadata& StackTraceAddressMetadataGenerator::load(void*
     return _meta;
 }
 
-StackTrace getStackTrace() {
-    stack_trace_detail::Options options{};
-    options.rawAddress = true;
-    return getStackTraceImpl(options);
-}
-
 void printStackTrace(StackTraceSink& sink) {
     stack_trace_detail::Options options{};
     options.rawAddress = true;
-    const bool withHumanReadable = true;
-    getStackTraceImpl(options).sink(&sink, withHumanReadable);
+    stack_trace_detail::printStackTraceImpl(options, &sink);
 }
 
 void printStackTrace(std::ostream& os) {
@@ -485,8 +488,7 @@ void printStackTrace(std::ostream& os) {
 void printStackTrace() {
     stack_trace_detail::Options options{};
     options.rawAddress = true;
-    const bool withHumanReadable = true;
-    getStackTraceImpl(options).log(withHumanReadable);
+    stack_trace_detail::printStackTraceImpl(options, nullptr);
 }
 
 }  // namespace mongo