[#229] Refactoring Trace, AsyncTrace, DisableTrace and AsyncDisableTr…

…ace With TraceRoot

* continueTrace parent Information header parsing

lib/config.js

@@ -10,8 +10,6 @@ const path = require('path')
 const fs = require('fs')
 const defaultConfig = require('./pinpoint-config-default')
 const log = require('./utils/logger')
-const { setLog } = require('./supports')
-const { makeLogLevelLog } = require('./utils/log/log-level-logger')
 const ServiceConfigBuilder = require('./client/retry/service-config-builder')
 
 const valueOfString = (envName) => {
@@ -147,7 +145,6 @@ const init = (initOptions = {}) => {
     readConfigJson(initOptions))
 
   log.init(agentConfig.logLevel)
-  setLog(makeLogLevelLog(agentConfig.logLevel))
 
   Object.entries(REQUIRE_CONFIG).forEach(([propertyName, description]) => {
     if (agentConfig.enable && !agentConfig[propertyName]) {

lib/context/disable-span-recorder.js

@@ -24,8 +24,6 @@ class DisableSpanRecorder {
     recordRemoteAddr() {}
 
     recordException() {}
-
-    recordSpanEvent() {}
 }
 
 module.exports = DisableSpanRecorder

lib/context/disable-trace.js

@@ -16,6 +16,10 @@ class DisableTrace {
         this.spanRecorder = new DisableSpanRecorder()
     }
 
+    getTraceRoot() {
+        return this.traceRoot
+    }
+
     traceBlockBegin() {
         return new DisableSpanEventRecorder()
     }

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

@@ -6,8 +6,8 @@
 
 'use strict'
 
-const TraceRootBuilder = require("./trace-root-builder")
-const TraceIdBuilder = require("./trace/trace-id-builder")
+const TraceRootBuilder = require('./trace-root-builder')
+const TraceIdBuilder = require('./trace/trace-id-builder')
 
 class RemoteTraceRoot {
     constructor(traceId, traceRoot) {
@@ -18,6 +18,10 @@ class RemoteTraceRoot {
     getTraceStartTime() {
         return this.traceRoot.getTraceStartTime()
     }
+
+    isSampled() {
+        return true
+    }
 }
 
 class RemoteTraceRootBuilder {

lib/context/sequence-generator.js

@@ -24,6 +24,13 @@ class SequenceGenerator {
     return this.next.toString()
   }
 
+  getAndIncrement() {
+    if (this.sequence > this.maxValue) {
+      this.sequence = this.initValue
+    }
+    return this.sequence++
+  }
+
   // for test
   reset() {
     this.sequence = this.initValue

lib/context/span-builder.js

@@ -9,17 +9,74 @@
 class Span {
     constructor(traceRoot) {
         this.traceRoot = traceRoot
-        this.startTime = traceRoot.getTraceStartTime()
     }
 }
 
 class SpanBuilder {
     constructor(traceRoot) {
         this.traceRoot = traceRoot
+        this.annotations = []
+        this.startTime = traceRoot.getTraceStartTime()
+    }
+
+    setApiId(apiId) {
+        this.apiId = apiId
+        return this
+    }
+
+    setRpc(rpc) {
+        this.rpc = rpc
+        return this
+    }
+
+    setEndPoint(endPoint) {
+        this.endPoint = endPoint
+        return this
+    }
+
+    setRemoteAddress(remoteAddress) {
+        this.remoteAddress = remoteAddress
+        return this
+    }
+
+    addAnnotation(annotation) {
+        this.annotations.push(annotation)
+        return this
+    }
+
+    setExceptionInfo(id, message) {
+        this.exceptionInfo = { id, message }
+        return this
+    }
+
+    setAcceptorHost(acceptorHost) {
+        this.acceptorHost = acceptorHost
+        return this
+    }
+
+    setParentApplicationName(parentApplicationName) {
+        this.parentApplicationName = parentApplicationName
+        return this
+    }
+
+    setParentApplicationType(parentApplicationType) {
+        this.parentApplicationType = parentApplicationType
+        return this
     }
 
     build() {
-        return new Span(this.traceRoot)
+        const span = new Span(this.traceRoot)
+        this.startTime = this.startTime || Date.now()
+        span.apiId = this.apiId
+        span.rpc = this.rpc
+        span.endPoint = this.endPoint
+        span.remoteAddress = this.remoteAddress
+        span.annotations = this.annotations
+        span.exceptionInfo = this.exceptionInfo
+        span.acceptorHost = this.acceptorHost
+        span.parentApplicationName = this.parentApplicationName
+        span.parentApplicationType = this.parentApplicationType
+        return span
     }
 }
 

lib/context/span-id.js

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

lib/context/span-recorder.js

@@ -77,12 +77,6 @@ class SpanRecorder {
       this.span.err = 1
     }
   }
-
-  recordSpanEvent(spanEvent) {
-    if (this.span && spanEvent) {
-      this.span.spanEventList.push(spanEvent)
-    }
-  }
 }
 
 module.exports = SpanRecorder

lib/context/trace-context.js

@@ -15,15 +15,12 @@ const sampler = require('../sampler/sampler')
 const DisableTrace = require('./disable-trace')
 const localStorage = require('../instrumentation/context/local-storage')
 const TraceRootBuilder = require('./trace-root-builder')
-const RemoteTraceRootBuilder = require('./remote-trace-root-builder')
 const activeRequestRepository = require('./trace/active-request-repository')
 const TraceSampler = require('./trace/trace-sampler')
 const SpanBuilder = require('./span-builder')
 const SpanChunkBuilder = require('./span-chunk-builder')
 const SpanRepository = require('./trace/span-repository')
-const SpanRecorder = require('./span-recorder')
-const SpanEventRecorderBuilder = require('./trace/span-event-recorder-builder')
-const TraceBuilder = require('./trace-builder')
+const Trace2 = require('./trace/trace2')
 
 class TraceContext {
   constructor(agentInfo, dataSender, config) {
@@ -34,7 +31,7 @@ class TraceContext {
       this.isSampling = sampler.getIsSampling(config.sampling, config.sampleRate)
       this.enableSampling = config.sampling
     }
-    this.traceSampler = new TraceSampler(config)
+    this.traceSampler = new TraceSampler(agentInfo, config)
     this.localTraceRootBuilder = new TraceRootBuilder(agentInfo.agentId)
   }
 
@@ -111,31 +108,26 @@ class TraceContext {
 
   // disableSampling() method in DefaultBaseTraceFactory.java
   disableSampling() {
-    const state = this.traceSampler.getContinueDisabledState()
-    return this.newLocalTrace(state.nextId())
+    const traceRoot = this.traceSampler.makeContinueDisableTraceRoot()
+    return this.newLocalTrace(traceRoot)
   }
 
-  newLocalTrace(nextDisabledId) {
-    const traceRoot = this.localTraceRootBuilder.build(nextDisabledId)
+  newLocalTrace(traceRoot) {
     activeRequestRepository.registry(traceRoot)
     return new DisableTrace(traceRoot)
   }
 
   // newTraceObject method in DefaultBaseTraceFactory.java
   newTraceObject2(urlPath) {
-    const state = this.traceSampler.newState(urlPath)
-    if (!state.isSampled()) {
-      return this.newLocalTrace(state.nextId())
+    const traceRoot = this.traceSampler.makeNewTraceRoot(urlPath)
+    if (!traceRoot.isSampled()) {
+      return this.newLocalTrace(traceRoot)
     }
 
-    const traceRoot = new RemoteTraceRootBuilder(this.agentInfo).build(state.nextId())
-    const span = new SpanBuilder(traceRoot).build()
+    const spanBuilder = new SpanBuilder(traceRoot)
     const spanChunkBuilder = new SpanChunkBuilder(traceRoot)
     const repository = new SpanRepository(spanChunkBuilder, this.dataSender)
-
-    const spanRecorder = new SpanRecorder(span)
-    const spanEventRecorder = new SpanEventRecorderBuilder(traceRoot).build()
-    return new TraceBuilder(span, repository, spanRecorder, spanEventRecorder).build()
+    return new Trace2(spanBuilder, repository, this.agentInfo.getServiceType())
   }
 }
 

lib/context/trace-root-builder.js

@@ -16,6 +16,10 @@ class TraceRoot {
     getTraceStartTime() {
         return this.traceStartTime
     }
+
+    isSampled() {
+        return false
+    }
 }
 
 class TraceRootBuilder {

lib/context/trace/continue-disabled-id.js

@@ -6,7 +6,7 @@
 
 'use strict'
 
-const LongIdGenerator = require("./long-id-generator")
+const LongIdGenerator = require('./long-id-generator')
 
 // INITIAL_CONTINUED_DISABLED_ID in AtomicIdGenerator.java
 const continueDisabledId = new LongIdGenerator(-1003)

lib/context/trace/id-generator.js

@@ -6,7 +6,7 @@
 
 'use strict'
 
-const LongIdGenerator = require("./long-id-generator")
+const LongIdGenerator = require('./long-id-generator')
 
 // INITIAL_TRANSACTION_ID
 const transactionId = new LongIdGenerator(1)

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

@@ -0,0 +1,61 @@
+/**
+ * Pinpoint Node.js Agent
+ * Copyright 2020-present NAVER Corp.
+ * Apache License v2.0
+ */
+
+'use strict'
+
+class SpanEvent {
+    constructor(sequence) {
+        this.sequence = sequence
+    }
+}
+
+class SpanEventBuilder {
+    // DefaultCallStack.java: push sequence 0 start value, depth 1 start value
+    static nullObject = new SpanEventBuilder(-1, 0)
+
+    constructor(sequence, depth) {
+        this.sequence = sequence
+        this.depth = depth
+        this.annotations = []
+        this.startTime = Date.now()
+    }
+
+    markElapsedTime() {
+        this.elapsedTime = Date.now() - this.startTime
+        return this
+    }
+
+    addAnnotation(annotation) {
+        this.annotations.push(annotation)
+        return this
+    }
+
+    setApiId(apiId) {
+        this.apiId = apiId
+        return this
+    }
+
+    setNextAsyncId(asyncId) {
+        this.asyncId = asyncId
+        return this
+    }
+
+    makeSequenceAndDepthGrowth() {
+        return new SpanEventBuilder(this.sequence + 1, this.depth + 1)
+    }
+
+    build() {
+        const spanEvent = new SpanEvent(this.sequence)
+        spanEvent.apiId = this.apiId
+        spanEvent.depth = this.depth
+        spanEvent.annotations = this.annotations
+        spanEvent.startTime = this.startTime
+        spanEvent.elapsedTime = this.elapsedTime
+        return spanEvent
+    }
+}
+
+module.exports = SpanEventBuilder