[#214] handleCommandV2

lib/agent.js

@@ -13,16 +13,18 @@ const stringMetaService = require('./context/string-meta-service')
 const apiMetaService = require('./context/api-meta-service')
 const Scheduler = require('./utils/scheduler')
 const AgentStatsMonitor = require('./metric/agent-stats-monitor')
-const getConfig = require('./config').getConfig
+const { initializeConfig, getConfig } = require('./config')
 const PinpointClient = require('./client/pinpoint-client')
 const dataSenderFactory = require('./client/data-sender-factory')
 const AgentInfo = require('./data/dto/agent-info')
 const PinScheduler = require('./metric/ping-scheduler')
 
 class Agent {
   constructor(initOptions) {
-    this.config = getConfig(initOptions)
+    initializeConfig(initOptions)
+    this.config = getConfig()
 
+    log.init(this.config.logLevel)
     log.warn('[Pinpoint Agent] Configuration', this.config)
 
     if (!this.config || !this.config.enable || this.config.enable.toString() !== 'true') {

lib/client/grpc-data-sender.js

@@ -61,6 +61,9 @@ class GrpcDataSender {
     if (this.profilerClient) {
       this.profilerClient.close()
     }
+    if (this.profilerStream) {
+      this.profilerStream.grpcStream.end()
+    }
   }
 
   initializeClients(collectorIp, collectorTcpPort, config) {
@@ -125,6 +128,7 @@ class GrpcDataSender {
       profilerBuilder.setGrpcServiceConfig(config.grpcServiceConfig.getProfiler())
     }
     this.profilerClient = new services.ProfilerCommandServiceClient(collectorIp + ":" + collectorTcpPort, grpc.credentials.createInsecure(), profilerBuilder.build())
+    this.profilerStream = new GrpcBidirectionalStream('profilerStream', this.profilerClient, this.profilerClient.handleCommandV2)
   }
 
   agentInfoRefreshInterval() {

lib/config.js

@@ -89,8 +89,6 @@ const CONFIG_FILE_MAP = {
   profilerSqlStat: 'profiler-sql-stat'
 }
 
-let agentConfig = null
-
 const REQUIRE_CONFIG = {
   agentId: 'an Agent ID',
   applicationName: 'an Application Name'
@@ -237,6 +235,11 @@ const getConfig = (initOptions) => {
   return agentConfig
 }
 
+const initializeConfig = (initOptions) => {
+  clear()
+  init(initOptions)
+}
+
 const clear = () => agentConfig && (agentConfig = null)
 
 //https://github.com/sindresorhus/is-docker
@@ -261,11 +264,14 @@ function hasDockerCGroup() {
   }
 }
 
+let agentConfig = readConfigJson(defaultConfig)
+
 module.exports = {
   getConfig,
   clear,
   readConfigJson,
   readRootConfigFile,
   getMainModulePath,
-  isContainerEnvironment
+  isContainerEnvironment,
+  initializeConfig,
 }

lib/context/transaction-id.js

@@ -8,7 +8,7 @@
 
 const transactionIdGenerator = require('./sequence-generators').transactionIdGenerator
 
-const DELIMETER = '^'
+const delimiter = '^'
 
 class TransactionId {
   constructor (agentId, agentStartTime, sequence) {
@@ -23,12 +23,12 @@ class TransactionId {
   }
 
   toString () {
-    return [this.agentId, this.agentStartTime, this.sequence].join(DELIMETER)
+    return [this.agentId, this.agentStartTime, this.sequence].join(delimiter)
   }
 
   static toTransactionId(str) {
     if (str !== null && str !== undefined) {
-      const r = str.split(DELIMETER)
+      const r = str.split(delimiter)
       if (r.length === 3) {
         return new TransactionId(r[0], r[1], r[2])
       }

lib/instrumentation/context/span-builder.js

@@ -4,13 +4,16 @@
  * Apache License v2.0
  */
 
+const TransactionId = require("../../context/transaction-id")
+const TraceId = require("../../context/trace-id")
+
 class SpanBuilder {
-    constructor(traceId, agentId, applicationName, applicationServiceType, agentStartTime, serviceType, host, parentApplicationName, parentApplicationType) {
+    constructor(traceId, agentInfo) {
         this.traceId = traceId
-        this.agentId = agentId
-        this.applicationName = applicationName
-        this.agentStartTime = agentStartTime
-        this.serviceType = serviceType
+        this.agentId = agentInfo.agentId
+        this.applicationName = agentInfo.applicationName
+        this.agentStartTime = agentInfo.agentStartTime
+        this.serviceType = agentInfo.serviceType
         this.spanId = traceId.spanId
         this.parentSpanId = traceId.parentSpanId
         this.startTime = Date.now()
@@ -24,12 +27,19 @@ class SpanBuilder {
         this.spanEventList = []
         this.apiId = null
         this.exceptionInfo = null
-        this.applicationServiceType = applicationServiceType
+        this.applicationServiceType = agentInfo.applicationServiceType
         this.loggingTransactionInfo = null
         this.version = 1
-        this.acceptorHost = host
-        this.parentApplicationName = parentApplicationName
-        this.parentApplicationType = parentApplicationType
+        this.acceptorHost = undefined
+        this.parentApplicationName = undefined
+        this.parentApplicationType = undefined
+    }
+
+    static makeSpanBuilderWithSpanId(spanId, agentInfo, parentSpanId = '-1') {
+        const transactionId = new TransactionId(agentInfo.agentId, agentInfo.agentStartTime)
+        const traceId = new TraceId(transactionId, spanId, parentSpanId)
+        const builder = new SpanBuilder(traceId, agentInfo)
+        return builder
     }
 
     static valueOf(span) {