Refactor trace context tests; update trace ID handling and improve assertions

Author: feelform

test/context/trace-context.test.js

@@ -14,23 +14,21 @@ const RequestHeaderUtils = require('../../lib/instrumentation/request-header-uti
 const defaultPredefinedMethodDescriptorRegistry = require('../../lib/constant/default-predefined-method-descriptor-registry')
 const localStorage = require('../../lib/instrumentation/context/local-storage')
 const agent = require('../support/agent-singleton-mock')
+const TraceIdBuilder = require('../../lib/context/trace/trace-id-builder')
 
 test('Should create continued trace and add span info', function (t) {
   t.plan(2)
 
-  const transactionId = fixture.getTransactionId()
-  const traceId = fixture.getTraceId(transactionId)
-  traceId.sampled = true
   const traceContext = new TraceContext(agent.agentInfo, dataSenderMock(), agent.config)
-
-  const trace = traceContext.continueTraceObject(traceId)
+  const traceId = new TraceIdBuilder(agent.agentInfo.getAgentId(), agent.agentInfo.getAgentStartTime(), '9').build()
+  const trace = traceContext.continueTraceObject2(traceId)
   localStorage.run(trace, () => {
-    t.equal(traceContext.currentTraceObject().traceId.transactionId.toString(), transactionId.toString())
-  
+    t.equal(traceContext.currentTraceObject().getTraceId(), traceId, `traceId is ${traceId}`)
+
     trace.spanRecorder.recordServiceType(ServiceType.express)
     trace.spanRecorder.recordApi(defaultPredefinedMethodDescriptorRegistry.nodeServerMethodDescriptor)
-  
-    t.equal(traceContext.currentTraceObject().span.serviceType, ServiceType.express)
+
+    t.equal(traceContext.currentTraceObject().spanBuilder.serviceType, ServiceType.express.getCode())
     traceContext.completeTraceObject(trace)
   })
 })
@@ -40,45 +38,41 @@ test('Should begin/end trace block asynchronously', async function (t) {
 
   // start trace and write span info
   const traceContext = new TraceContext(agent.agentInfo, dataSenderMock(), agent.config)
-  const startedTrace = traceContext.newTraceObject(true)
+  const startedTrace = traceContext.newTraceObject2('/')
 
   localStorage.run(startedTrace, () => {
     const spanRecorder = startedTrace.spanRecorder
     spanRecorder.recordServiceType(ServiceType.express)
-  
+
     const currentTrace = traceContext.currentTraceObject()
     const spanEventRecorder = currentTrace.traceBlockBegin()
     spanEventRecorder.recordServiceType(ServiceType.express)
     spanEventRecorder.recordApi(defaultPredefinedMethodDescriptorRegistry.nodeServerMethodDescriptor)
-  
-    t.equal(traceContext.currentTraceObject().callStack.length, 1)
-  
+
+    t.equal(traceContext.currentTraceObject().callStack.stack.length, 1)
+
     const anotherContext = traceContext.currentTraceObject()
     t.equal(anotherContext.traceId, currentTrace.traceId)
-  
+
     const spanEventRecorder2 = anotherContext.traceBlockBegin()
-    t.equal(traceContext.currentTraceObject().callStack.length, 2)
-  
+    t.equal(traceContext.currentTraceObject().callStack.stack.length, 2)
+
     anotherContext.traceBlockEnd(spanEventRecorder2)
-  
+
     currentTrace.traceBlockEnd(spanEventRecorder)
-    t.equal(traceContext.currentTraceObject().callStack.length, 0, "traceBolckEnd callstack length is zero")
+    t.equal(traceContext.currentTraceObject().callStack.stack.length, 0, "traceBolckEnd callstack length is zero")
   })
 })
 
 test('Should complete trace ', async function (t) {
   t.plan(1)
-
-  const transactionId = fixture.getTransactionId()
-  const traceId = fixture.getTraceId(transactionId)
   const traceContext = new TraceContext(agent.agentInfo, dataSenderMock(), agent.config)
-
-  const trace = traceContext.newTraceObject(traceId)
+  const trace = traceContext.newTraceObject2('/')
 
   await util.sleep(501)
 
   traceContext.completeTraceObject(trace)
-  t.ok(trace.spanRecorder.span.elapsedTime > 0)
+  t.ok(trace.spanRecorder.spanBuilder.elapsedTime > 0)
 })
 
 test('new Trace', (t) => {

test/fixture.js

@@ -16,7 +16,7 @@ const localStorage = require('../lib/instrumentation/context/local-storage')
 const getTransactionId = () => {
   const agentId = config.agentId
   const agentStartTime = Date.now()
-  return new TransactionId(agentId, agentStartTime.toString(), "99")
+  return new TransactionId(agentId, agentStartTime.toString(), '99')
 }
 
 const getTraceId = (transactionId) => {

test/support/agent-singleton-mock.js

@@ -13,15 +13,16 @@ const Agent = require('../../lib/agent')
 const dataSenderMock = require('./data-sender-mock')
 const shimmer = require('@pinpoint-apm/shimmer')
 const httpShared = require('../../lib/instrumentation/http-shared')
+const TraceContext = require('../../lib/context/trace-context')
 const activeTrace = require('../../lib/metric/active-trace')
 const apiMetaService = require('../../lib/context/api-meta-service')
 const localStorage = require('../../lib/instrumentation/context/local-storage')
+const { cleanup } = require('../fixture')
 const sqlMetaDataService = require('../../lib/instrumentation/sql/sql-metadata-service')
 const SimpleCache = require('../../lib/utils/simple-cache')
 const sampler = require('../../lib/sampler/sampler')
 const transactionIdGenerator = require('../../lib/context/sequence-generators').transactionIdGenerator
 const closedTraceWrapped = Symbol('closedTraceWrapped')
-const TraceContext = require('../../lib/context/trace-context')
 
 class MockAgent extends Agent {
     startSchedule(agentId, agentStartTime) {
@@ -72,12 +73,13 @@ class MockAgent extends Agent {
         })
 
         this.dataSender = dataSender
-        this.traceContext = new TraceContext(this.agentInfo, this.dataSender, this.config)
+        this.traceContext.dataSender = dataSender
 
         this.closedTraces = []
     }
 
     cleanHttp() {
+        cleanup()
         const http = require('http')
         shimmer.unwrap(http && http.Server && http.Server.prototype, 'emit')
         shimmer.unwrap(http, 'request')