trace_events,async_hooks: use intrinsic trace

Switch to using the intrinsic trace event method for async_hooks.

This is a breaking change because of the switch to a nested data
argument for exec id and trigger id values.

PR-URL: https://github.com/nodejs/node/pull/22127
Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/internal/trace_events_async_hooks.js b/lib/internal/trace_events_async_hooks.js
index 011dc6bbea..f687f1ced8 100644
--- a/lib/internal/trace_events_async_hooks.js
+++ b/lib/internal/trace_events_async_hooks.js
@@ -1,6 +1,7 @@
 'use strict';
 
 exports.setup = function(traceEvents, traceEventCategory) {
+  const { trace } = traceEvents;
   const async_wrap = process.binding('async_wrap');
   const async_hooks = require('async_hooks');
 
@@ -27,34 +28,33 @@ exports.setup = function(traceEvents, traceEventCategory) {
       if (nativeProviders.has(type)) return;
 
       typeMemory.set(asyncId, type);
-      traceEvents.emit(BEFORE_EVENT, traceEventCategory,
-                       type, asyncId,
-                       'triggerAsyncId', triggerAsyncId,
-                       'executionAsyncId', async_hooks.executionAsyncId());
+      trace(BEFORE_EVENT, traceEventCategory,
+            type, asyncId,
+            {
+              triggerAsyncId,
+              executionAsyncId: async_hooks.executionAsyncId()
+            });
     },
 
     before(asyncId) {
       const type = typeMemory.get(asyncId);
       if (type === undefined) return;
 
-      traceEvents.emit(BEFORE_EVENT, traceEventCategory,
-                       type + '_CALLBACK', asyncId);
+      trace(BEFORE_EVENT, traceEventCategory, `${type}_CALLBACK`, asyncId);
     },
 
     after(asyncId) {
       const type = typeMemory.get(asyncId);
       if (type === undefined) return;
 
-      traceEvents.emit(END_EVENT, traceEventCategory,
-                       type + '_CALLBACK', asyncId);
+      trace(END_EVENT, traceEventCategory, `${type}_CALLBACK`, asyncId);
     },
 
     destroy(asyncId) {
       const type = typeMemory.get(asyncId);
       if (type === undefined) return;
 
-      traceEvents.emit(END_EVENT, traceEventCategory,
-                       type, asyncId);
+      trace(END_EVENT, traceEventCategory, type, asyncId);
 
       // cleanup asyncId to type map
       typeMemory.delete(asyncId);