From 6505966611629eef5291a0766851abd8e89928b3 Mon Sep 17 00:00:00 2001
From: Divlo <contact@divlo.fr>
Date: Thu, 2 Sep 2021 01:59:45 +0200
Subject: [PATCH 1/2] errors: display version on fatal exception that causes
 exit

Display Node.js version at the end of stacktraces
on fatal exception that causes exit.
Easier for debugging so you don't have
to ask "what node version are you on?",
it is directly in the error the user
copy/paste from when asking for help.

Fixes: https://github.com/nodejs/node/issues/29731
---
 doc/api/cli.md                                  |   8 ++++++++
 doc/node.1                                      |   3 +++
 src/node_errors.cc                              |   4 ++++
 src/node_options.cc                             |   5 +++++
 src/node_options.h                              |   1 +
 test/message/assert_throws_stack.out            |   2 ++
 test/message/core_line_numbers.out              |   2 ++
 test/message/error_aggregateTwoErrors.out       |   2 ++
 test/message/error_exit.out                     |   2 ++
 test/message/error_with_nul.out                 | Bin 561 -> 572 bytes
 test/message/esm_display_syntax_error.out       |   2 ++
 .../message/esm_display_syntax_error_import.out |   2 ++
 .../esm_display_syntax_error_import_module.out  |   2 ++
 .../message/esm_display_syntax_error_module.out |   2 ++
 test/message/esm_loader_not_found.out           |   2 ++
 .../esm_loader_not_found_cjs_hint_bare.out      |   2 ++
 .../esm_loader_not_found_cjs_hint_relative.out  |   2 ++
 test/message/esm_loader_syntax_error.out        |   2 ++
 test/message/eval_messages.out                  |  12 ++++++++++++
 .../events_unhandled_error_common_trace.out     |   2 ++
 .../message/events_unhandled_error_nexttick.out |   2 ++
 .../message/events_unhandled_error_sameline.out |   2 ++
 .../message/events_unhandled_error_subclass.out |   2 ++
 test/message/if-error-has-good-stack.out        |   2 ++
 test/message/internal_assert.out                |   2 ++
 test/message/internal_assert_fail.out           |   2 ++
 test/message/nexttick_throw.out                 |   2 ++
 test/message/promise_always_throw_unhandled.out |   2 ++
 test/message/source_map_disabled_by_api.out     |   2 ++
 test/message/source_map_enabled_by_api.out      |   2 ++
 test/message/source_map_enclosing_function.out  |   2 ++
 .../message/source_map_reference_error_tabs.out |   2 ++
 test/message/source_map_throw_first_tick.out    |   2 ++
 test/message/source_map_throw_icu.out           |   2 ++
 test/message/source_map_throw_set_immediate.out |   2 ++
 test/message/stack_overflow.out                 |   2 ++
 test/message/stdin_messages.out                 |  12 ++++++++++++
 .../test-no-extra-info-on-fatal-exception.js    |   6 ++++++
 .../test-no-extra-info-on-fatal-exception.out   |  12 ++++++++++++
 test/message/throw_custom_error.out             |   2 ++
 test/message/throw_error_with_getter_throw.out  |   2 ++
 .../throw_error_with_getter_throw_traced.out    |   2 ++
 test/message/throw_in_line_with_tabs.out        |   2 ++
 test/message/throw_non_error.out                |   2 ++
 test/message/throw_null.out                     |   2 ++
 test/message/throw_null_traced.out              |   2 ++
 test/message/throw_undefined.out                |   2 ++
 test/message/throw_undefined_traced.out         |   2 ++
 test/message/timeout_throw.out                  |   2 ++
 .../undefined_reference_in_new_context.out      |   2 ++
 test/message/vm_display_runtime_error.out       |   2 ++
 test/message/vm_display_syntax_error.out        |   2 ++
 test/message/vm_dont_display_runtime_error.out  |   2 ++
 test/message/vm_dont_display_syntax_error.out   |   2 ++
 test/parallel/test-cli-node-options.js          |   1 +
 test/parallel/test-error-reporting.js           |   3 +--
 test/pseudo-tty/test-fatal-error.out            |   2 ++
 57 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 test/message/test-no-extra-info-on-fatal-exception.js
 create mode 100644 test/message/test-no-extra-info-on-fatal-exception.out

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 48bfd090f65ce4..f87b2476e0f6a6 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -605,6 +605,13 @@ added: v0.8.0
 
 Silence deprecation warnings.
 
+### `--no-extra-info-on-fatal-exception`
+<!-- YAML
+added: REPLACEME
+-->
+
+Hide extra information on fatal exception that causes exit.
+
 ### `--no-force-async-hooks-checks`
 <!-- YAML
 added: v9.0.0
@@ -1423,6 +1430,7 @@ Node.js options that are allowed are:
 * `--napi-modules`
 * `--no-deprecation`
 * `--no-experimental-repl-await`
+* `--no-extra-info-on-fatal-exception`
 * `--no-force-async-hooks-checks`
 * `--no-warnings`
 * `--node-memory-debug`
diff --git a/doc/node.1 b/doc/node.1
index 29861a7fab4c86..310de73b89d728 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -273,6 +273,9 @@ It is kept for compatibility.
 .It Fl -no-deprecation
 Silence deprecation warnings.
 .
+.It Fl -no-extra-info-on-fatal-exception
+Hide extra information on fatal exception that causes exit.
+.
 .It Fl -no-force-async-hooks-checks
 Disable runtime checks for `async_hooks`.
 These will still be enabled dynamically when `async_hooks` is enabled.
diff --git a/src/node_errors.cc b/src/node_errors.cc
index 0e4ba26e1bcb70..91f69ef43f2d03 100644
--- a/src/node_errors.cc
+++ b/src/node_errors.cc
@@ -414,6 +414,10 @@ static void ReportFatalException(Environment* env,
     }
   }
 
+  if (env->options()->extra_info_on_fatal_exception) {
+    FPrintF(stderr, "\nNode.js %s\n", NODE_VERSION);
+  }
+
   fflush(stderr);
 }
 
diff --git a/src/node_options.cc b/src/node_options.cc
index 40f8cf8690294e..f66fbc8ed4524f 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -511,6 +511,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "show stack traces on process warnings",
             &EnvironmentOptions::trace_warnings,
             kAllowedInEnvironment);
+  AddOption("--extra-info-on-fatal-exception",
+            "hide extra information on fatal exception that causes exit",
+            &EnvironmentOptions::extra_info_on_fatal_exception,
+            kAllowedInEnvironment,
+            true);
   AddOption("--unhandled-rejections",
             "define unhandled rejections behavior. Options are 'strict' "
             "(always raise an error), 'throw' (raise an error unless "
diff --git a/src/node_options.h b/src/node_options.h
index a751d787d7f189..36b5ed401979f6 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -150,6 +150,7 @@ class EnvironmentOptions : public Options {
   bool trace_tls = false;
   bool trace_uncaught = false;
   bool trace_warnings = false;
+  bool extra_info_on_fatal_exception = true;
   std::string unhandled_rejections;
   std::string userland_loader;
   bool verify_base_objects =
diff --git a/test/message/assert_throws_stack.out b/test/message/assert_throws_stack.out
index 6841630d03b195..06eaa906442440 100644
--- a/test/message/assert_throws_stack.out
+++ b/test/message/assert_throws_stack.out
@@ -32,3 +32,5 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
   expected: { bar: true },
   operator: 'throws'
 }
+
+Node.js *
diff --git a/test/message/core_line_numbers.out b/test/message/core_line_numbers.out
index 97b017f66e2395..54b3b0ac2dc832 100644
--- a/test/message/core_line_numbers.out
+++ b/test/message/core_line_numbers.out
@@ -12,3 +12,5 @@ RangeError: Invalid input
     at Function.Module._load (node:internal/modules/cjs/loader:*:*)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/error_aggregateTwoErrors.out b/test/message/error_aggregateTwoErrors.out
index d1dc13eacc303c..fef3953451ece9 100644
--- a/test/message/error_aggregateTwoErrors.out
+++ b/test/message/error_aggregateTwoErrors.out
@@ -11,3 +11,5 @@ AggregateError: original
     at node:internal/main/run_main_module:*:* {
   code: 'ERR0'
 }
+
+Node.js *
diff --git a/test/message/error_exit.out b/test/message/error_exit.out
index 2ef95b535dafe7..da535b05c105e9 100644
--- a/test/message/error_exit.out
+++ b/test/message/error_exit.out
@@ -20,3 +20,5 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
   expected: 2,
   operator: 'strictEqual'
 }
+
+Node.js *
diff --git a/test/message/error_with_nul.out b/test/message/error_with_nul.out
index 7fbb33f08e8dc342b9efc899e66f5e3350e9489b..4d3172439a915f0bcca90ddc0db3b690bc1aaedb 100644
GIT binary patch
delta 19
acmdnUvWI1ZArm*3Uw%reURJS!78d|I$^}yZ

delta 7
OcmdnPvXNzjArk-#JOWt&

diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out
index f1b7ff4e2290ee..1f8e3861c430ed 100644
--- a/test/message/esm_display_syntax_error.out
+++ b/test/message/esm_display_syntax_error.out
@@ -5,3 +5,5 @@ await async () => 0;
 SyntaxError: Unexpected reserved word
     at Loader.moduleStrategy (node:internal/modules/esm/translators:*:*)
     at async link (node:internal/modules/esm/module_job:*:*)
+
+Node.js *
diff --git a/test/message/esm_display_syntax_error_import.out b/test/message/esm_display_syntax_error_import.out
index ad906af431bf95..16282c009ee577 100644
--- a/test/message/esm_display_syntax_error_import.out
+++ b/test/message/esm_display_syntax_error_import.out
@@ -7,3 +7,5 @@ SyntaxError: The requested module '../fixtures/es-module-loaders/module-named-ex
     at async Loader.import (node:internal/modules/esm/loader:*:*)
     at async Object.loadESM (node:internal/process/esm_loader:*:*)
     at async handleMainPromise (node:internal/modules/run_main:*:*)
+
+Node.js *
diff --git a/test/message/esm_display_syntax_error_import_module.out b/test/message/esm_display_syntax_error_import_module.out
index 60a208d534af40..2e788994016aa0 100644
--- a/test/message/esm_display_syntax_error_import_module.out
+++ b/test/message/esm_display_syntax_error_import_module.out
@@ -7,3 +7,5 @@ SyntaxError: The requested module './module-named-exports.mjs' does not provide
     at async Loader.import (node:internal/modules/esm/loader:*:*)
     at async Object.loadESM (node:internal/process/esm_loader:*:*)
     at async handleMainPromise (node:internal/modules/run_main:*:*)
+
+Node.js *
diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out
index fc0912a96c0d26..48dcbb54647ea8 100644
--- a/test/message/esm_display_syntax_error_module.out
+++ b/test/message/esm_display_syntax_error_module.out
@@ -4,3 +4,5 @@ await async () => 0;
 
 SyntaxError: Malformed arrow function parameter list
     at Loader.moduleStrategy (node:internal/modules/esm/translators:*:*)
+
+Node.js *
diff --git a/test/message/esm_loader_not_found.out b/test/message/esm_loader_not_found.out
index 61b1623cdf176f..660e02ee3303b7 100644
--- a/test/message/esm_loader_not_found.out
+++ b/test/message/esm_loader_not_found.out
@@ -16,3 +16,5 @@ Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'i-dont-exist' imported from *
     at Object.loadESM (node:internal/process/esm_loader:*:*) {
   code: 'ERR_MODULE_NOT_FOUND'
 }
+
+Node.js *
diff --git a/test/message/esm_loader_not_found_cjs_hint_bare.out b/test/message/esm_loader_not_found_cjs_hint_bare.out
index aaeed40ed60013..07d708db32db10 100644
--- a/test/message/esm_loader_not_found_cjs_hint_bare.out
+++ b/test/message/esm_loader_not_found_cjs_hint_bare.out
@@ -14,3 +14,5 @@ Did you mean to import some_module/obj.js?
     at link (node:internal/modules/esm/module_job:*:*) {
   code: 'ERR_MODULE_NOT_FOUND'
 }
+
+Node.js *
diff --git a/test/message/esm_loader_not_found_cjs_hint_relative.out b/test/message/esm_loader_not_found_cjs_hint_relative.out
index 89b8d56133ce3a..2a197417828867 100644
--- a/test/message/esm_loader_not_found_cjs_hint_relative.out
+++ b/test/message/esm_loader_not_found_cjs_hint_relative.out
@@ -18,3 +18,5 @@ Did you mean to import ./test/common/fixtures.js?
     at Object.loadESM (node:internal/process/esm_loader:*:*) {
   code: 'ERR_MODULE_NOT_FOUND'
 }
+
+Node.js *
diff --git a/test/message/esm_loader_syntax_error.out b/test/message/esm_loader_syntax_error.out
index de6014add667bc..bfaa8588f739a2 100644
--- a/test/message/esm_loader_syntax_error.out
+++ b/test/message/esm_loader_syntax_error.out
@@ -7,3 +7,5 @@ await async () => 0;
 SyntaxError: Malformed arrow function parameter list
     at Loader.moduleStrategy (node:internal/modules/esm/translators:*:*)
     at async link (node:internal/modules/esm/module_job:*:*)
+
+Node.js *
diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out
index 55efb8793104ba..d34869586cf6db 100644
--- a/test/message/eval_messages.out
+++ b/test/message/eval_messages.out
@@ -10,6 +10,8 @@ SyntaxError: Strict mode code may not include a with statement
     at [eval]-wrapper:*:*
     at evalScript (node:internal/process/execution:*:*)
     at node:internal/main/eval_string:*:*
+
+Node.js *
 42
 42
 [eval]:1
@@ -25,6 +27,8 @@ Error: hello
     at evalScript (node:internal/process/execution:*:*)
     at node:internal/main/eval_string:*:*
 
+Node.js *
+
 [eval]:1
 throw new Error("hello")
 ^
@@ -37,6 +41,8 @@ Error: hello
     at [eval]-wrapper:*:*
     at evalScript (node:internal/process/execution:*:*)
     at node:internal/main/eval_string:*:*
+
+Node.js *
 100
 [eval]:1
 var x = 100; y = x;
@@ -51,15 +57,21 @@ ReferenceError: y is not defined
     at evalScript (node:internal/process/execution:*:*)
     at node:internal/main/eval_string:*:*
 
+Node.js *
+
 [eval]:1
 var ______________________________________________; throw 10
                                                     ^
 10
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
 
+Node.js *
+
 [eval]:1
 var ______________________________________________; throw 10
                                                     ^
 10
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
+
+Node.js *
 done
diff --git a/test/message/events_unhandled_error_common_trace.out b/test/message/events_unhandled_error_common_trace.out
index 19e89869ba74fa..0c10dd53fa2fdf 100644
--- a/test/message/events_unhandled_error_common_trace.out
+++ b/test/message/events_unhandled_error_common_trace.out
@@ -18,3 +18,5 @@ Emitted 'error' event at:
     at Module._compile (node:internal/modules/cjs/loader:*:*)
     [... lines matching original stack trace ...]
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/events_unhandled_error_nexttick.out b/test/message/events_unhandled_error_nexttick.out
index 3e0d4697504e49..533b3ae463e560 100644
--- a/test/message/events_unhandled_error_nexttick.out
+++ b/test/message/events_unhandled_error_nexttick.out
@@ -13,3 +13,5 @@ Error
 Emitted 'error' event at:
     at *events_unhandled_error_nexttick.js:*:*
     at processTicksAndRejections (node:internal/process/task_queues:*:*)
+
+Node.js *
diff --git a/test/message/events_unhandled_error_sameline.out b/test/message/events_unhandled_error_sameline.out
index c027275033941d..62feb784663565 100644
--- a/test/message/events_unhandled_error_sameline.out
+++ b/test/message/events_unhandled_error_sameline.out
@@ -15,3 +15,5 @@ Emitted 'error' event at:
     at Module._compile (node:internal/modules/cjs/loader:*:*)
     [... lines matching original stack trace ...]
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/events_unhandled_error_subclass.out b/test/message/events_unhandled_error_subclass.out
index 5b8131970d50d5..4eddce9baf9858 100644
--- a/test/message/events_unhandled_error_subclass.out
+++ b/test/message/events_unhandled_error_subclass.out
@@ -15,3 +15,5 @@ Emitted 'error' event on Foo instance at:
     at Module._compile (node:internal/modules/cjs/loader:*:*)
     [... lines matching original stack trace ...]
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/if-error-has-good-stack.out b/test/message/if-error-has-good-stack.out
index d87581cd767534..32ec6de3e596c4 100644
--- a/test/message/if-error-has-good-stack.out
+++ b/test/message/if-error-has-good-stack.out
@@ -33,3 +33,5 @@ AssertionError [ERR_ASSERTION]: ifError got unwanted exception: test error
   expected: null,
   operator: 'ifError'
 }
+
+Node.js *
diff --git a/test/message/internal_assert.out b/test/message/internal_assert.out
index 131eb6584853cf..bd25c879478083 100644
--- a/test/message/internal_assert.out
+++ b/test/message/internal_assert.out
@@ -16,3 +16,5 @@ Please open an issue with this stack trace at https://github.com/nodejs/node/iss
     at * {
   code: 'ERR_INTERNAL_ASSERTION'
 }
+
+Node.js *
diff --git a/test/message/internal_assert_fail.out b/test/message/internal_assert_fail.out
index f3e2446ab14547..408d6d3364470d 100644
--- a/test/message/internal_assert_fail.out
+++ b/test/message/internal_assert_fail.out
@@ -17,3 +17,5 @@ Please open an issue with this stack trace at https://github.com/nodejs/node/iss
     at * {
   code: 'ERR_INTERNAL_ASSERTION'
 }
+
+Node.js *
diff --git a/test/message/nexttick_throw.out b/test/message/nexttick_throw.out
index 955bcda6a26da0..4efaed978a57f8 100644
--- a/test/message/nexttick_throw.out
+++ b/test/message/nexttick_throw.out
@@ -5,3 +5,5 @@
 ReferenceError: undefined_reference_error_maker is not defined
     at *test*message*nexttick_throw.js:*:*
     at processTicksAndRejections (node:internal/process/task_queues:*:*)
+
+Node.js *
diff --git a/test/message/promise_always_throw_unhandled.out b/test/message/promise_always_throw_unhandled.out
index 8d030268565355..bc2949391c16d7 100644
--- a/test/message/promise_always_throw_unhandled.out
+++ b/test/message/promise_always_throw_unhandled.out
@@ -11,3 +11,5 @@ Error: One
     at *
     at *
     at *
+
+Node.js *
diff --git a/test/message/source_map_disabled_by_api.out b/test/message/source_map_disabled_by_api.out
index d2cca7da5297e3..1b8d3d7a2e06b6 100644
--- a/test/message/source_map_disabled_by_api.out
+++ b/test/message/source_map_disabled_by_api.out
@@ -24,3 +24,5 @@ Error: an error!
     at Module.load (node:internal/modules/cjs/loader:*)
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Module.require (node:internal/modules/cjs/loader:*)
+
+Node.js *
diff --git a/test/message/source_map_enabled_by_api.out b/test/message/source_map_enabled_by_api.out
index 525ceccec12e4b..2f902e90371ad6 100644
--- a/test/message/source_map_enabled_by_api.out
+++ b/test/message/source_map_enabled_by_api.out
@@ -28,3 +28,5 @@ Error: an error!
     at Module.load (node:internal/modules/cjs/loader:*)
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Module.require (node:internal/modules/cjs/loader:*)
+
+Node.js *
diff --git a/test/message/source_map_enclosing_function.out b/test/message/source_map_enclosing_function.out
index 3eb76ecbbef31c..50e8e553494b53 100644
--- a/test/message/source_map_enclosing_function.out
+++ b/test/message/source_map_enclosing_function.out
@@ -13,3 +13,5 @@ Error: an error!
     at Module.load (node:internal/modules/cjs/loader:*)
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Module.require (node:internal/modules/cjs/loader:*)
+
+Node.js *
diff --git a/test/message/source_map_reference_error_tabs.out b/test/message/source_map_reference_error_tabs.out
index bce1b5f8911d4b..9dfcf846372098 100644
--- a/test/message/source_map_reference_error_tabs.out
+++ b/test/message/source_map_reference_error_tabs.out
@@ -13,3 +13,5 @@ ReferenceError: alert is not defined
     at require (node:internal/modules/cjs/helpers:*
     at Object.<anonymous> (*source_map_reference_error_tabs.js:*
     at Module._compile (node:internal/modules/cjs/loader:*
+
+Node.js *
diff --git a/test/message/source_map_throw_first_tick.out b/test/message/source_map_throw_first_tick.out
index efa97a1d9f56dd..c4eb64aa8e3f9d 100644
--- a/test/message/source_map_throw_first_tick.out
+++ b/test/message/source_map_throw_first_tick.out
@@ -13,3 +13,5 @@ Error: an exception
     at require (node:internal/modules/cjs/helpers:*)
     at Object.<anonymous> (*source_map_throw_first_tick.js:5:1)
     at Module._compile (node:internal/modules/cjs/loader:*)
+
+Node.js *
diff --git a/test/message/source_map_throw_icu.out b/test/message/source_map_throw_icu.out
index 78482d73ddf037..0e95691a23d339 100644
--- a/test/message/source_map_throw_icu.out
+++ b/test/message/source_map_throw_icu.out
@@ -13,3 +13,5 @@ Error: an error
     at require (node:internal/modules/cjs/helpers:*
     at Object.<anonymous> (*source_map_throw_icu.js:*
     at Module._compile (node:internal/modules/cjs/loader:*
+
+Node.js *
diff --git a/test/message/source_map_throw_set_immediate.out b/test/message/source_map_throw_set_immediate.out
index c735e23cb955c5..42a595c302ed6a 100644
--- a/test/message/source_map_throw_set_immediate.out
+++ b/test/message/source_map_throw_set_immediate.out
@@ -6,3 +6,5 @@ Error: goodbye
     at Hello *uglify-throw-original.js:5:9*
     at *uglify-throw-original.js:9:3*
     at processImmediate (node:internal/timers:*)
+
+Node.js *
diff --git a/test/message/stack_overflow.out b/test/message/stack_overflow.out
index d7a2c3eef06e01..fb378994672288 100644
--- a/test/message/stack_overflow.out
+++ b/test/message/stack_overflow.out
@@ -4,3 +4,5 @@ JSON.stringify(array);
      ^
 
 [RangeError: Maximum call stack size exceeded]
+
+Node.js *
diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out
index 3ce4ba0c5b6fe5..eb150d8eaf33f6 100644
--- a/test/message/stdin_messages.out
+++ b/test/message/stdin_messages.out
@@ -14,6 +14,8 @@ SyntaxError: Strict mode code may not include a with statement
     at Socket.<anonymous> (node:internal/process/execution:*:*)
     at Socket.emit (node:events:*:*)
     at endReadableNT (node:internal/streams/readable:*:*)
+
+Node.js *
 42
 42
 [stdin]:1
@@ -31,6 +33,8 @@ Error: hello
     at Socket.<anonymous> (node:internal/process/execution:*:*)
     at Socket.emit (node:events:*:*)
     at endReadableNT (node:internal/streams/readable:*:*)
+
+Node.js *
 [stdin]:1
 throw new Error("hello")
 ^
@@ -46,6 +50,8 @@ Error: hello
     at Socket.<anonymous> (node:internal/process/execution:*:*)
     at Socket.emit (node:events:*:*)
     at endReadableNT (node:internal/streams/readable:*:*)
+
+Node.js *
 100
 [stdin]:1
 let x = 100; y = x;
@@ -63,15 +69,21 @@ ReferenceError: y is not defined
     at Socket.emit (node:events:*:*)
     at endReadableNT (node:internal/streams/readable:*:*)
 
+Node.js *
+
 [stdin]:1
 let ______________________________________________; throw 10
                                                     ^
 10
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
 
+Node.js *
+
 [stdin]:1
 let ______________________________________________; throw 10
                                                     ^
 10
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
+
+Node.js *
 done
diff --git a/test/message/test-no-extra-info-on-fatal-exception.js b/test/message/test-no-extra-info-on-fatal-exception.js
new file mode 100644
index 00000000000000..948274d2bb5491
--- /dev/null
+++ b/test/message/test-no-extra-info-on-fatal-exception.js
@@ -0,0 +1,6 @@
+// Flags: --no-extra-info-on-fatal-exception
+
+'use strict';
+require('../common');
+
+throw new Error('foo');
diff --git a/test/message/test-no-extra-info-on-fatal-exception.out b/test/message/test-no-extra-info-on-fatal-exception.out
new file mode 100644
index 00000000000000..840ee0e65a75d2
--- /dev/null
+++ b/test/message/test-no-extra-info-on-fatal-exception.out
@@ -0,0 +1,12 @@
+*:6
+throw new Error('foo');
+^
+
+Error: foo
+    at Object.<anonymous> (*:6:7)
+    at Module._compile (node:internal/modules/cjs/loader:*:*)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+    at Module.load (node:internal/modules/cjs/loader:*:*)
+    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+    at node:internal/main/run_main_module:*:*
diff --git a/test/message/throw_custom_error.out b/test/message/throw_custom_error.out
index a1fa8c6c5b71ff..920cbf62310f39 100644
--- a/test/message/throw_custom_error.out
+++ b/test/message/throw_custom_error.out
@@ -2,3 +2,5 @@
 throw ({ name: 'MyCustomError', message: 'This is a custom message' });
 ^
 { name: 'MyCustomError', message: 'This is a custom message' }
+
+Node.js *
diff --git a/test/message/throw_error_with_getter_throw.out b/test/message/throw_error_with_getter_throw.out
index 2162185e7845fc..565acfe9e6bf06 100644
--- a/test/message/throw_error_with_getter_throw.out
+++ b/test/message/throw_error_with_getter_throw.out
@@ -4,3 +4,5 @@ throw {  // eslint-disable-line no-throw-literal
 ^
 [object Object]
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
+
+Node.js *
diff --git a/test/message/throw_error_with_getter_throw_traced.out b/test/message/throw_error_with_getter_throw_traced.out
index f5106b8c3fc00b..87310042ad2213 100644
--- a/test/message/throw_error_with_getter_throw_traced.out
+++ b/test/message/throw_error_with_getter_throw_traced.out
@@ -11,3 +11,5 @@ Thrown at:
     at Module._load (node:internal/modules/cjs/loader:*:*)
     at executeUserEntryPoint (node:internal/modules/run_main:*:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/throw_in_line_with_tabs.out b/test/message/throw_in_line_with_tabs.out
index 9392ef5cca279a..0d71e91b75c2e7 100644
--- a/test/message/throw_in_line_with_tabs.out
+++ b/test/message/throw_in_line_with_tabs.out
@@ -3,3 +3,5 @@ before
 	throw ({ foo: 'bar' });
 	^
 { foo: 'bar' }
+
+Node.js *
diff --git a/test/message/throw_non_error.out b/test/message/throw_non_error.out
index a744f786ca6dee..665c9b4fd1d0c3 100644
--- a/test/message/throw_non_error.out
+++ b/test/message/throw_non_error.out
@@ -2,3 +2,5 @@
 throw ({ foo: 'bar' });
 ^
 { foo: 'bar' }
+
+Node.js *
diff --git a/test/message/throw_null.out b/test/message/throw_null.out
index c97dcbfe134a22..0fe2a49d050b18 100644
--- a/test/message/throw_null.out
+++ b/test/message/throw_null.out
@@ -4,3 +4,5 @@ throw null;
 ^
 null
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
+
+Node.js *
diff --git a/test/message/throw_null_traced.out b/test/message/throw_null_traced.out
index e1b471827f449a..0344dc27e0a428 100644
--- a/test/message/throw_null_traced.out
+++ b/test/message/throw_null_traced.out
@@ -11,3 +11,5 @@ Thrown at:
     at Module._load (node:internal/modules/cjs/loader:*:*)
     at executeUserEntryPoint (node:internal/modules/run_main:*:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/throw_undefined.out b/test/message/throw_undefined.out
index 4b2bfdbc590708..56b0cac4259d6d 100644
--- a/test/message/throw_undefined.out
+++ b/test/message/throw_undefined.out
@@ -4,3 +4,5 @@ throw undefined;
 ^
 undefined
 (Use `* --trace-uncaught ...` to show where the exception was thrown)
+
+Node.js *
diff --git a/test/message/throw_undefined_traced.out b/test/message/throw_undefined_traced.out
index fa89312ed4d9cf..148085f094a8d0 100644
--- a/test/message/throw_undefined_traced.out
+++ b/test/message/throw_undefined_traced.out
@@ -11,3 +11,5 @@ Thrown at:
     at Module._load (node:internal/modules/cjs/loader:*:*)
     at executeUserEntryPoint (node:internal/modules/run_main:*:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/timeout_throw.out b/test/message/timeout_throw.out
index 66e495eb84d0bd..bc20cc7762f844 100644
--- a/test/message/timeout_throw.out
+++ b/test/message/timeout_throw.out
@@ -5,3 +5,5 @@ ReferenceError: undefined_reference_error_maker is not defined
     at Timeout._onTimeout (*test*message*timeout_throw.js:*:*)
     at listOnTimeout (node:internal/timers:*:*)
     at processTimers (node:internal/timers:*:*)
+
+Node.js *
diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out
index 61dee9f6d4fba3..259bb6d1bc1362 100644
--- a/test/message/undefined_reference_in_new_context.out
+++ b/test/message/undefined_reference_in_new_context.out
@@ -14,3 +14,5 @@ ReferenceError: foo is not defined
     at Module.load (node:internal/modules/cjs/loader:*)
     at Function.Module._load (node:internal/modules/cjs/loader:*:*)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+
+Node.js *
diff --git a/test/message/vm_display_runtime_error.out b/test/message/vm_display_runtime_error.out
index 8f1e9c37967f25..403ad365451e96 100644
--- a/test/message/vm_display_runtime_error.out
+++ b/test/message/vm_display_runtime_error.out
@@ -29,3 +29,5 @@ Error: spooky!
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/vm_display_syntax_error.out b/test/message/vm_display_syntax_error.out
index b0b70fcd759668..4501ae7e81f272 100644
--- a/test/message/vm_display_syntax_error.out
+++ b/test/message/vm_display_syntax_error.out
@@ -27,3 +27,5 @@ SyntaxError: Unexpected number
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/vm_dont_display_runtime_error.out b/test/message/vm_dont_display_runtime_error.out
index 2ff2e8355ab90c..4ffe3cf4dc2e6b 100644
--- a/test/message/vm_dont_display_runtime_error.out
+++ b/test/message/vm_dont_display_runtime_error.out
@@ -15,3 +15,5 @@ Error: boo!
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/message/vm_dont_display_syntax_error.out b/test/message/vm_dont_display_syntax_error.out
index d46dce2993f863..b9e8c24dd97791 100644
--- a/test/message/vm_dont_display_syntax_error.out
+++ b/test/message/vm_dont_display_syntax_error.out
@@ -15,3 +15,5 @@ SyntaxError: Unexpected number
     at Function.Module._load (node:internal/modules/cjs/loader:*)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
     at node:internal/main/run_main_module:*:*
+
+Node.js *
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
index 0e824fe073dc94..2d34a56e03c1a0 100644
--- a/test/parallel/test-cli-node-options.js
+++ b/test/parallel/test-cli-node-options.js
@@ -26,6 +26,7 @@ expect('--no-deprecation', 'B\n');
 expect('--no-warnings', 'B\n');
 expect('--no_warnings', 'B\n');
 expect('--trace-warnings', 'B\n');
+expect('--no-extra-info-on-fatal-exception', 'B\n');
 expect('--redirect-warnings=_', 'B\n');
 expect('--trace-deprecation', 'B\n');
 expect('--trace-sync-io', 'B\n');
diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js
index 75574641ec7b79..c9dd6110aeb387 100644
--- a/test/parallel/test-error-reporting.js
+++ b/test/parallel/test-error-reporting.js
@@ -77,6 +77,5 @@ errExec('throws_error6.js', common.mustCall((err, stdout, stderr) => {
 
 // Object that throws in toString() doesn't print garbage
 errExec('throws_error7.js', common.mustCall((err, stdout, stderr) => {
-  assert.match(stderr,
-               /throw {\r?\n\^\r?\n{ toString: \[Function: toString] }\r?\n$/);
+  assert.match(stderr, /throw {\r?\n\^\r?\n{ toString: \[Function: toString] }\r?\n\nNode\.js \S+\r?\n$/);
 }));
diff --git a/test/pseudo-tty/test-fatal-error.out b/test/pseudo-tty/test-fatal-error.out
index b6eeca17f55246..72e2bbba04e573 100644
--- a/test/pseudo-tty/test-fatal-error.out
+++ b/test/pseudo-tty/test-fatal-error.out
@@ -12,3 +12,5 @@ TypeError: foobar
 *[90m    at *[39m {
   bla: *[33mtrue*[39m
 }
+
+Node.js *

From 4725e66bfcc13afec5cd12b5ac872180a58ff9ff Mon Sep 17 00:00:00 2001
From: Divlo <contact@divlo.fr>
Date: Fri, 3 Sep 2021 18:00:32 +0200
Subject: [PATCH 2/2] fixup!: errors: update
 test/parallel/test-error-reporting.js

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-error-reporting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js
index c9dd6110aeb387..6977c5f023cefa 100644
--- a/test/parallel/test-error-reporting.js
+++ b/test/parallel/test-error-reporting.js
@@ -77,5 +77,5 @@ errExec('throws_error6.js', common.mustCall((err, stdout, stderr) => {
 
 // Object that throws in toString() doesn't print garbage
 errExec('throws_error7.js', common.mustCall((err, stdout, stderr) => {
-  assert.match(stderr, /throw {\r?\n\^\r?\n{ toString: \[Function: toString] }\r?\n\nNode\.js \S+\r?\n$/);
+  assert.match(stderr, /throw {\r?\n\^\r?\n{ toString: \[Function: toString] }\r?\n\r?\nNode\.js \S+\r?\n$/);
 }));