[#231] Support ChildTrace

Author: feelform

lib/context/remote-trace-root-builder.js

@@ -22,6 +22,10 @@ class RemoteTraceRoot {
     isSampled() {
         return true
     }
+
+    getTraceId() {
+        return this.traceId
+    }
 }
 
 class RemoteTraceRootBuilder {

lib/context/span-builder.js

@@ -64,6 +64,10 @@ class SpanBuilder {
         return this
     }
 
+    getTraceRoot() {
+        return this.traceRoot
+    }
+
     build() {
         const span = new Span(this.traceRoot)
         this.startTime = this.startTime || Date.now()

lib/context/trace-context.js

@@ -35,6 +35,10 @@ class TraceContext {
     this.traceSampler = new TraceSampler(agentInfo, config)
   }
 
+  getAgentInfo() {
+    return this.agentInfo
+  }
+
   continueTraceObject(requestData) {
     const traceId = new TraceId(
       requestData.transactionId,
@@ -127,7 +131,7 @@ class TraceContext {
     const spanBuilder = new SpanBuilder(traceRoot)
     const spanChunkBuilder = new SpanChunkBuilder(traceRoot)
     const repository = new SpanRepository(spanChunkBuilder, this.dataSender)
-    return new Trace2(spanBuilder, repository, this.agentInfo.getServiceType())
+    return new Trace2(spanBuilder, repository)
   }
 
   // DefaultAsyncContext.java: newAsyncContextTrace

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

@@ -10,6 +10,7 @@ const SpanEventRecorder = require('./span-event-recorder2')
 const Trace = require('./trace2')
 const TraceRootSpanRecorder = require('./trace-root-span-recorder')
 const StackId = require('./stack-id')
+const CallStack = require('./call-stack')
 
 class ChildTrace extends Trace {
     constructor(spanBuilder, repository, localAsyncId) {
@@ -25,7 +26,7 @@ class ChildTraceBuilder {
         this.spanRecorder = new TraceRootSpanRecorder(traceRoot)
         this.localAsyncId = localAsyncId
 
-        this.callStack = []
+        this.callStack = new CallStack()
         this.closed = false
 
         this.traceBlockBegin(StackId.asyncBeginStackId)
@@ -48,6 +49,14 @@ class ChildTraceBuilder {
         spanEventBuilder.markAfterTime()
         this.repository.storeSpanEvent(spanEventBuilder)
     }
+
+    getTraceRoot() {
+        return this.traceRoot
+    }
+
+    getTraceId() {
+        return this.traceRoot.getTraceId()
+    }
 }
 
 module.exports = ChildTraceBuilder

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

@@ -40,6 +40,10 @@ class TraceId {
         return this.spanId
     }
 
+    getFlags() {
+        return this.flags
+    }
+
     isRoot() {
         return this.parentSpanId == spanId.nullSpanId()
     }

lib/context/trace/trace2.js

@@ -14,7 +14,7 @@ const StackId = require('./stack-id')
 class Trace {
     /**
      * Creates an instance of the Trace class.
-     * 
+     *
      * @constructor
      * @param {SpanBuilder} spanBuilder - The builder for creating spans.
      * @param {Repository} repository - The repository for storing trace data.
@@ -43,7 +43,7 @@ class Trace {
             return
         }
 
-        const spanEventBuilder = this.callStack.pop() 
+        const spanEventBuilder = this.callStack.pop()
         spanEventBuilder.markAfterTime()
         this.repository.storeSpanEvent(spanEventBuilder)
     }

lib/data/dto/agent-info.js

@@ -46,10 +46,14 @@ class AgentInfo {
   getAgentStartTime() {
     return this.agentStartTime
   }
-  
+
   getServiceType() {
     return this.serviceType
   }
+
+  getApplicationName() {
+    return this.applicationName
+  }
 }
 
 module.exports = AgentInfo

lib/instrumentation/http-shared.js

@@ -128,7 +128,7 @@ exports.traceOutgoingRequest2 = function (agent, moduleName) {
       trace.traceBlockEnd(spanEventRecorder)
 
       // DefaultAsyncContext.java: newAsyncContextTrace
-      const childTraceBuilder = this.traceContext.continueAsyncContextTraceObject(trace.getTraceRoot(), asyncId.nextLocalAsyncId2())
+      const childTraceBuilder = agent.traceContext.continueAsyncContextTraceObject(trace.getTraceRoot(), asyncId.nextLocalAsyncId2())
       const recorder = childTraceBuilder.traceBlockBegin()
       recorder.recordServiceType(ServiceType.asyncHttpClient)
       recorder.recordApiDesc(req.method)

lib/instrumentation/http/http-outgoing-request-header.js

@@ -23,12 +23,12 @@ class HttpClientRequest {
 
     // write(T header, final TraceId traceId, final String host)
     write(traceId, agentInfo) {
-        this.setHeader(Header.traceId, traceId.toStringFormatted())
+        this.setHeader(Header.traceId, traceId.toStringDelimiterFormatted())
         this.setHeader(Header.spanId, traceId.getSpanId())
         this.setHeader(Header.parentSpanId, traceId.getParentSpanId())
         this.setHeader(Header.flags, traceId.getFlags())
         this.setHeader(Header.parentApplicationName, agentInfo.getApplicationName())
-        this.setHeader(Header.parentApplicationType, agentInfo.getApplicationType())
+        this.setHeader(Header.parentApplicationType, agentInfo.getServiceType())
 
         if (this.host) {
             this.setHeader(Header.host, this.getHost())
@@ -39,17 +39,17 @@ class HttpClientRequest {
         this.request.setHeader?.(name, value)
     }
 
-    getUrl() {
-        return this.request.url
-    }
-
     getHeader(name) {
         return this.request.getHeader?.(name)
     }
 
     getHost() {
         return this.host
     }
+
+    getUrlPathname() {
+        return new URL(`${this.request.protocol}//${this.getHost()}${this.request.path}`).pathname
+    }
 }
 
 class HttpOutgoingRequestHeader {
@@ -59,7 +59,7 @@ class HttpOutgoingRequestHeader {
     }
 
     getUrlPathname() {
-        return new URL(`${this.getHost()}${this.request.getUrl()}`).pathname
+        return this.request.getUrlPathname()
     }
 
     getHost() {