[pinpoint-apm#140] Support nested async trace

feelform · Nov 22, 2023 · 598fe60 · 598fe60
1 parent 5db9558
commit 598fe60
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 7,888 deletions.
diff --git a/lib/agent.js b/lib/agent.js
@@ -26,13 +26,10 @@ class Agent {
 
     log.warn('[Pinpoint Agent] Configuration', this.config)
 
-    if (!this.config.enable || this.config.enable.toString() !== 'true') {
-      global.__PINPOINT_ENABLED__ = false
+    if (!this.config || !this.config.enable || this.config.enable.toString() !== 'true') {
       log.warn('[Pinpoint Agent][' + this.config.agentId + '] Disabled')
       return
     }
-
-    global.__PINPOINT_ENABLED__ = true
     log.warn('[Pinpoint Agent][' + this.config.agentId + '] Init Started')
 
     const agentId = this.config.agentId

diff --git a/lib/context/context-manager.js b/lib/context/context-manager.js
@@ -7,7 +7,6 @@
 'use strict'
 
 const async_hooks = require('async_hooks')
-
 const traceObjectMap = new Map()
 
 const init = (asyncId, type, triggerAsyncId, resource) => {
@@ -24,9 +23,7 @@ const destroy = (asyncId) => {
 }
 
 const start = () => {
-  if (global.__PINPOINT_ENABLED__) {
-    async_hooks.createHook({init, destroy}).enable()
-  }
+  async_hooks.createHook({init, destroy}).enable()
 }
 
 const getObject = () => {

diff --git a/lib/instrumentation/context/local-storage.js b/lib/instrumentation/context/local-storage.js
@@ -9,13 +9,18 @@
 const semver = require('semver')
 const AsyncContextLocalStorage = require('./async-context-local-storage')
 const AsyncHooksLocalStorage = require('./async-hooks-local-storage')
-
+const { getConfig } = require('../../config')
 class LocalStorage {
     constructor() {
         this.storage = this.createLocalStorage()
     }
 
     createLocalStorage() {
+        const config = getConfig()
+        if (config && !config.enable) {
+            return new EmptyLocalStorage()
+        }
+
         if (!semver.satisfies(process.version, '>=16.4.0')) {
             return new AsyncHooksLocalStorage()
         }
@@ -35,4 +40,15 @@ class LocalStorage {
     }
 }
 
+class EmptyLocalStorage {
+    run() {
+    }
+
+    getStore() {
+    }
+
+    disable() {
+    }
+}
+
 module.exports = new LocalStorage()