[#231] Support ChildTrace

Author: feelform

lib/context/trace-context.js

@@ -131,9 +131,8 @@ class TraceContext {
   // DefaultAsyncContext.java: newAsyncContextTrace
   // DefaultBaseTraceFactory.java: continueAsyncContextTraceObject
   // AsyncContextSpanEventEndPointApiAwareInterceptor.java : before
-  continueAsyncContextTraceObject(traceRoot, asyncId) {
-    const localAsyncId = asyncId.nextLocalAsyncId2()
-    
+  continueAsyncContextTraceObject(traceRoot, localAsyncId) {
+    const spanChunkBuilder = new SpanChunkBuilder(traceRoot)
   }
 }
 

lib/context/trace/span-event-builder.js

@@ -7,6 +7,7 @@
 'use strict'
 
 const StackId = require('./stack-id')
+const AsyncId = require('../async-id')
 
 class SpanEvent {
     static nullObject = new SpanEvent(0, 0)
@@ -44,7 +45,7 @@ class SpanEventBuilder {
         if (stackId === StackId.default) {
             return SpanEventBuilder.default()
         }
-        
+
         return new SpanEventBuilder(stackId)
     }
 
@@ -87,11 +88,19 @@ class SpanEventBuilder {
         return this
     }
 
+    // WrappedSpanEventRecorder.java: getNextAsyncId
+    getAsyncId() {
+        if (!this.asyncId) {
+            this.asyncId = AsyncId.make()
+        }
+        return this.asyncId
+    }
+
     setAsyncId(asyncId) {
         this.asyncId = asyncId
         return this
     }
-    
+
     markAfterTime() {
         this.setAfterTime(Date.now())
         return this

lib/context/trace/span-event-recorder2.js

@@ -15,7 +15,7 @@ class SpanEventRecorder {
     static nullObject() {
         return new SpanEventRecorder(SpanEventBuilder.nullObject())
     }
-    
+
     constructor(spanEventBuilder) {
         this.spanEventBuilder = spanEventBuilder
     }
@@ -49,18 +49,7 @@ class SpanEventRecorder {
     }
 
     recordNextAsyncId() {
-        this.asyncId = this.asyncId.sequenceNextLocalAsyncId()
-        this.spanEventBuilder.setNextAsyncId(this.asyncId.getAsyncId())
-    }
-
-    getNextAsyncId() {
-        const nextAsyncId = this.spanEventBuilder.getAsyncId()
-        if (!nextAsyncId) {
-            const asyncId = AsyncId.make()
-            this.spanEventBuilder.setAsyncId(asyncId)
-            return asyncId
-        }
-        return nextAsyncId
+        return this.spanEventBuilder.getAsyncId()
     }
 }
 

lib/context/trace/trace-id-builder.js

@@ -6,7 +6,7 @@
 
 'use strict'
 
-const spanIdGenerator = require('../span-id')
+const spanId = require('../span-id')
 
 // DefaultTraceId.java
 class TraceId {
@@ -53,7 +53,7 @@ class TraceIdBuilder {
     constructor(agentInfo, transactionId) {
         this.agentInfo = agentInfo
         this.transactionId = transactionId
-        this.parentSpanId = spanIdGenerator.nullSpanId()
+        this.parentSpanId = spanId.nullSpanId()
     }
 
     make(transactionId) {
@@ -71,8 +71,8 @@ class TraceIdBuilder {
     }
 
     build() {
-        const spanId = this.spanId ?? spanIdGenerator.newSpanId()
-        return new TraceId(this.agentInfo.getAgentId(), this.agentInfo.getAgentStartTime(), this.transactionId, this.parentSpanId, spanId, 0)
+        return new TraceId(this.agentInfo.getAgentId(), this.agentInfo.getAgentStartTime()
+                , this.transactionId, this.parentSpanId, this.spanId ?? spanId.newSpanId(), 0)
     }
 }
 

lib/instrumentation/http-shared.js

@@ -171,7 +171,6 @@ exports.traceOutgoingRequest = function (agent, moduleName) {
       return req
 
       function onresponse(res) {
-        log.debug('intercepted http.ClientcRequest response event %o', { id: httpURL })
         // Inspired by:
         // https://github.com/nodejs/node/blob/9623ce572a02632b7596452e079bba066db3a429/lib/events.js#L258-L274
         if (res.prependListener) {
@@ -191,7 +190,6 @@ exports.traceOutgoingRequest = function (agent, moduleName) {
       }
 
       function onEnd() {
-        log.debug('intercepted http.IncomingMessage end event %o', { id: httpURL })
         if (asyncTrace) {
           asyncEventRecorder.recordAttribute(annotationKey.HTTP_STATUS_CODE, this.statusCode)
           asyncTrace.traceAsyncEnd(asyncEventRecorder)

lib/instrumentation/http/http-outgoing-request-trace-builder.js

@@ -8,29 +8,62 @@
 
 const samplingFlag = require('../../sampler/sampling-flag')
 const Header = require('./pinpoint-header')
+const ServiceType = require('../../context/service-type')
 
 class HttpOutgoingRequestTrace {
-    constructor(trace, spanEventRecorder, request) {
-        this.trace = trace
-        this.spanEventRecorder = spanEventRecorder
+    static nullObject = new HttpOutgoingRequestTrace()
+
+    constructor(childTraceBuilder) {
+        this.childTraceBuilder = childTraceBuilder
+    }
+
+    close() {
+        if (HttpOutgoingRequestTrace.nullObject === this) {
+            return
+        }
+    }
+}
+
+class HttpClientRequestWriter {
+    constructor(request) {
         this.request = request
     }
 
-    
+    writeSampledHeaderFalse() {
+        this.setHeader(Header.sampled, samplingFlag.samplingRateFalse())
+    }
+
+    setHeader(name, value) {
+        this.request.setHeader?.(name, value)
+    }
 }
 
 class HttpOutgoingRequestTraceBuilder {
     constructor(context, request) {
-        this.context = context
-        this.request = request
+        this.traceContext = context
+        this.request = new HttpClientRequestWriter(request)
     }
 
     build() {
-        const trace = this.context.currentTraceObject()
+        const trace = this.traceContext.currentTraceObject()
+        if (!trace) {
+            return HttpOutgoingRequestTrace.nullObject
+        }
 
-    }
-    writeSampledHeaderFalse() {
-        this.request.setHeader(Header.sampled, samplingFlag.samplingRateFalse())
+        if (!trace.canSampled()) {
+            this.request.writeSampledHeaderFalse()
+            return HttpOutgoingRequestTrace.nullObject
+        }
+
+        const spanEventRecorder = trace.traceBlockBegin()
+        spanEventRecorder.recordServiceType(ServiceType.asyncHttpClientInternal)
+        spanEventRecorder.recordApiDesc('http.request')
+        const asyncId = spanEventRecorder.recordNextAsyncId()
+        trace.traceBlockEnd(spanEventRecorder)
+
+        // DefaultAsyncContext.java: newAsyncContextTrace
+        const childTraceBuilder = this.traceContext.continueAsyncContextTraceObject(trace.getTraceRoot(), asyncId.nextLocalAsyncId2())
+        return new HttpOutgoingRequestTrace(childTraceBuilder)
     }
 }