async_hooks: rename currentId and triggerId

currentId is renamed to executionAsyncId
triggerId is renamed to triggerAsyncId
AsyncResource.triggerId is renamed to AsyncResource.triggerAsyncId
AsyncHooksGetCurrentId is renamed to AsyncHooksGetExecutionAsyncId
AsyncHooksGetTriggerId is renamed to AsyncHooksGetTriggerAsyncId

PR-URL: https://github.com/nodejs/node/pull/13490
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/test/addons/async-resource/binding.cc b/test/addons/async-resource/binding.cc
index 093adfcba6..372f7a6fa4 100644
--- a/test/addons/async-resource/binding.cc
+++ b/test/addons/async-resource/binding.cc
@@ -93,7 +93,8 @@ void GetResource(const FunctionCallbackInfo<Value>& args) {
 }
 
 void GetCurrentId(const FunctionCallbackInfo<Value>& args) {
-  args.GetReturnValue().Set(node::AsyncHooksGetCurrentId(args.GetIsolate()));
+  args.GetReturnValue().Set(
+    node::AsyncHooksGetExecutionAsyncId(args.GetIsolate()));
 }
 
 void Initialize(Local<Object> exports) {
diff --git a/test/addons/async-resource/test.js b/test/addons/async-resource/test.js
index 34017750ce..b52db61a95 100644
--- a/test/addons/async-resource/test.js
+++ b/test/addons/async-resource/test.js
@@ -14,13 +14,13 @@ let after = 0;
 let destroy = 0;
 
 async_hooks.createHook({
-  init(id, type, triggerId, resource) {
+  init(id, type, triggerAsyncId, resource) {
     assert.strictEqual(typeof id, 'number');
     assert.strictEqual(typeof resource, 'object');
     assert(id > 1);
     if (type === 'foobär') {
       assert.strictEqual(resource.kObjectTag, kObjectTag);
-      assert.strictEqual(triggerId, expectedTriggerId);
+      assert.strictEqual(triggerAsyncId, expectedTriggerId);
       bindingUids.push(id);
     }
   },