[pinpoint-apm#86] trace guard

feelform · Sep 12, 2023 · 7799027 · 7799027
1 parent 035399b
commit 7799027
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/instrumentation/module/express.js b/lib/instrumentation/module/express.js
@@ -137,6 +137,7 @@ module.exports = function (agent, version, express) {
           handle = function (err, req, res, next) {
             const trace = agent.traceContext.currentTraceObject()
             let spanEventRecorder = null
+            let handlerSpanEventRecorder = null
             if (shouldReport(err, trace)) {
               spanEventRecorder = trace.traceBlockBegin()
               spanEventRecorder.recordServiceType(ServiceTypeCode.express)
@@ -147,9 +148,18 @@ module.exports = function (agent, version, express) {
               } else {
                 spanEventRecorder.recordApiDesc(getDescriptionText(objectName, layerName, req.method))
               }
+
+              if (handlerMethodDescriptor) {
+                handlerSpanEventRecorder = trace.traceBlockBegin()
+                handlerSpanEventRecorder.recordServiceType(ServiceTypeCode.node_method)
+                handlerSpanEventRecorder.recordApi(handlerMethodDescriptor)
+              }
             }
             const result = origin.apply(this, arguments)
             if (trace) {
+              if (handlerSpanEventRecorder) {
+                trace.traceBlockEnd(handlerSpanEventRecorder)
+              }
               trace.traceBlockEnd(spanEventRecorder)
             }
             return result