[#231] Support ChildTrace

Author: feelform

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

@@ -35,12 +35,17 @@ class RemoteTraceRootBuilder {
     }
 
     build(transactionId) {
-        if (this.traceId) {
-            return new RemoteTraceRoot(this.traceId, new TraceRootBuilder(this.agentInfo.agentId).build(transactionId))
+        const agentId = this.agentInfo.getAgentId()
+        if (this.isNewTraceRoot()) {
+            const traceId = new TraceIdBuilder(this.agentInfo, transactionId).build()
+            return new RemoteTraceRoot(traceId, new TraceRootBuilder(agentId, transactionId).build())
         }
 
-        const traceId = new TraceIdBuilder(this.agentInfo, transactionId).build()
-        return new RemoteTraceRoot(traceId, new TraceRootBuilder(this.agentInfo.agentId).build(transactionId))
+        return new RemoteTraceRoot(this.traceId, new TraceRootBuilder(agentId, transactionId).build())
+    }
+
+    isNewTraceRoot() {
+        return !this.traceId
     }
 }
 

lib/context/span-id.js

@@ -8,7 +8,7 @@
 
 // SpanId.java in Java agent
 class SpanId {
-  static nullSpanId = -1
+  static nullSpanId = '-1'
 
   constructor () {
     this.MAX_NUM = Number.MAX_SAFE_INTEGER

lib/context/trace-root-builder.js

@@ -23,12 +23,15 @@ class TraceRoot {
 }
 
 class TraceRootBuilder {
-    constructor(agentId) {
+    constructor(agentId, localTransactionId) {
         this.agentId = agentId
+        this.localTransactionId = localTransactionId
+        this.traceStartTime = Date.now()
     }
 
-    build(transactionId) {
-        return new TraceRoot(this.agentId, Date.now(), transactionId)
+    // DefaultTraceRootFactory.java: newDisableTraceRoot
+    build() {
+        return new TraceRoot(this.agentId, this.traceStartTime, this.localTransactionId)
     }
 }
 

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

@@ -8,6 +8,7 @@
 
 const SpanEventRecorder = require('./span-event-recorder')
 const Trace = require('./trace2')
+const TraceRootSpanRecorder = require('./trace-root-span-recorder')
 
 class ChildTrace extends Trace {
     constructor(spanBuilder, repository, localAsyncId) {
@@ -17,8 +18,10 @@ class ChildTrace extends Trace {
 }
 
 class ChildTraceBuilder {
-    constructor(traceRoot, localAsyncId) {
+    constructor(traceRoot, repository, localAsyncId) {
         this.traceRoot = traceRoot
+        this.repository = repository
+        this.spanRecorder = new TraceRootSpanRecorder(traceRoot)
         this.localAsyncId = localAsyncId
 
         this.callStack = []
@@ -34,6 +37,7 @@ class ChildTraceBuilder {
         }
 
         const spanEventRecorder = this.spanEventRecorder.makeSequenceAndDepthGrowth()
+        this.spanEventRecorder = spanEventRecorder
         this.callStack.push(spanEventRecorder.getSpanEventBuilder())
 
         return spanEventRecorder

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

@@ -6,22 +6,69 @@
 
 'use strict'
 
+const spanId = require('../span-id')
+
+// DefaultTraceId.java
 class TraceId {
-    constructor(agentId, agentStartTime, transactionId) {
+    constructor(agentId, agentStartTime, transactionId, parentSpanId, spanId, flags) {
         this.agentId = agentId
         this.agentStartTime = agentStartTime
         this.transactionId = transactionId
+        this.parentSpanId = parentSpanId
+        this.spanId = spanId
+        this.flags = flags
+    }
+
+    getAgentId() {
+        return this.agentId
+    }
+
+    getAgentStartTime() {
+        return this.agentStartTime
+    }
+
+    getTransactionId() {
+        return this.transactionId
+    }
+
+    getParentSpanId() {
+        return this.parentSpanId
+    }
+
+    getSpanId() {
+        return this.spanId
+    }
+
+    isRoot() {
+        return this.parentSpanId === spanId.nullSpanId
+    }
+
+    toString() {
+        return `TraceId(agentId=${this.agentId}, agentStartTime=${this.agentStartTime}, transactionId=${this.transactionId}, parentSpanId=${this.parentSpanId}
+                    , spanId=${this.spanId}, flags=${this.flags})`
     }
 }
 
 class TraceIdBuilder {
     constructor(agentInfo, transactionId) {
         this.agentInfo = agentInfo
         this.transactionId = transactionId
+        this.parentSpanId = spanId.nullSpanId
+    }
+
+    setSpanId(spanId) {
+        this.spanId = spanId
+        return this
+    }
+
+    setParentSpanId(parentSpanId) {
+        this.parentSpanId = parentSpanId
+        return this
     }
 
     build() {
-        return new TraceId(this.agentInfo.agentId, this.agentInfo.agentStartTime, this.transactionId)
+        const spanId = this.spanId ?? spanId.newSpanId()
+        return new TraceId(this.agentInfo.agentId, this.agentInfo.agentStartTime, this.transactionId, this.parentSpanId, spanId, 0)
     }
 }
 

lib/context/trace/trace-root-span-recorder.js

@@ -0,0 +1,23 @@
+/**
+ * Pinpoint Node.js Agent
+ * Copyright 2020-present NAVER Corp.
+ * Apache License v2.0
+ */
+
+'use strict'
+
+class TraceRootSpanRecorder {
+    constructor(traceRoot) {
+        this.traceRoot = traceRoot
+    }
+
+    canSampled() {
+        return true
+    }
+
+    isRoot() {
+        return this.traceRoot.getTraceId().isRoot()
+    }
+}
+
+module.exports = TraceRootSpanRecorder

lib/context/trace/trace2.js

@@ -37,6 +37,7 @@ class Trace {
 
         // GrpcSpanProcessorV2: postProcess
         const spanEventRecorder = this.spanEventRecorder.makeSequenceAndDepthGrowth()
+        this.spanEventRecorder = spanEventRecorder
         this.callStack.push(spanEventRecorder.getSpanEventBuilder())
 
         return spanEventRecorder