From e60eed19bee59f7dd171929f3bd3623ccaa91839 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Sun, 20 May 2018 09:07:37 -0700 Subject: [PATCH] trace_events: add version metadata Use `TRACE_EVENT_METADATA1` to include just the node.js version for now. Later this can be expanded to include more version and platform details. PR-URL: https://github.com/nodejs/node/pull/20852 Reviewed-By: Ali Ijaz Sheikh Reviewed-By: Ruben Bridgewater Reviewed-By: Richard Lau --- src/node.cc | 1 + test/parallel/test-trace-events-metadata.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/node.cc b/src/node.cc index 5c22b2962f6..4d8464b9f53 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4322,6 +4322,7 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, Environment env(isolate_data, context, v8_platform.GetTracingAgent()); env.Start(argc, argv, exec_argc, exec_argv, v8_is_profiling); + TRACE_EVENT_METADATA1("__metadata", "version", "node", NODE_VERSION_STRING); TRACE_EVENT_METADATA1("__metadata", "thread_name", "name", "JavaScriptMainThread"); diff --git a/test/parallel/test-trace-events-metadata.js b/test/parallel/test-trace-events-metadata.js index eccec1ecf0f..8b6e97ce35f 100644 --- a/test/parallel/test-trace-events-metadata.js +++ b/test/parallel/test-trace-events-metadata.js @@ -13,7 +13,8 @@ tmpdir.refresh(); process.chdir(tmpdir.path); const proc = cp.spawn(process.execPath, - [ '--trace-events-enabled', '-e', CODE ]); + [ '--trace-event-categories', 'node.perf.usertiming', + '-e', CODE ]); proc.once('exit', common.mustCall(() => { assert(common.fileExists(FILE_NAME)); fs.readFile(FILE_NAME, common.mustCall((err, data) => { @@ -25,5 +26,8 @@ proc.once('exit', common.mustCall(() => { assert(traces.some((trace) => trace.cat === '__metadata' && trace.name === 'thread_name' && trace.args.name === 'BackgroundTaskRunner')); + assert(traces.some((trace) => + trace.cat === '__metadata' && trace.name === 'version' && + trace.args.node === process.versions.node)); })); }));