[pinpoint-apm#251] Functional Test port number

feelform · Dec 24, 2024 · 729bdf4 · 729bdf4
1 parent 0edd15c
commit 729bdf4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/test/support/agent-singleton-mock.js b/test/support/agent-singleton-mock.js
@@ -66,6 +66,14 @@ const getTraceByAsyncId = (asyncId) => {
 }
 
 class MockAgent extends Agent {
+    constructor(initOptions) {
+        initOptions.collector['span-port'] = -1
+        initOptions.collector['stat-port'] = -1
+        initOptions.collector['tcp-port'] = -1
+        initOptions = portProperties(initOptions)
+        super(initOptions)
+    }
+
     startSchedule(agentId, agentStartTime) {
         this.mockAgentId = agentId
         this.mockAgentStartTime = agentStartTime
@@ -80,8 +88,7 @@ class MockAgent extends Agent {
         this.cleanHttp()
         this.dataSender.clear()
 
-        json = this.portProperties(json)
-
+        json = portProperties(json)
         if (!json) {
             json = require('../pinpoint-config-test')
         } else {
@@ -190,20 +197,11 @@ class MockAgent extends Agent {
     }
 
     bindHttpWithCallSite(conf) {
-        conf = this.portProperties(conf)
+        conf = portProperties(conf)
         conf = Object.assign({}, { 'trace-location-and-filename-of-call-site': true }, conf)
         this.bindHttp(conf)
     }
 
-    portProperties(conf) {
-        if (typeof conf !== 'number') {
-            return conf
-        }
-        const testConf = require('../pinpoint-config-test')
-        const collectorConf = Object.assign(testConf.collector, { 'span-port': conf, 'stat-port': conf, 'tcp-port': conf })
-        return Object.assign({}, { collector: collectorConf })
-    }
-
     completeTraceObject(trace) {
         super.completeTraceObject(trace)
     }
@@ -249,5 +247,19 @@ class MockAgent extends Agent {
     }
 }
 
+function portProperties(conf) {
+    if (typeof conf !== 'number') {
+        if (conf.collector) {
+            return conf
+        }
+        const collectorConf = Object.assign({ 'ip': '127.0.0.1', 'span-port': -1, 'stat-port': -1, 'tcp-port': -1 })
+        return Object.assign(conf, { collector: collectorConf })
+    }
+    const portNumber = conf
+    const collectorConf = Object.assign(require('../pinpoint-config-test').collector, { 'span-port': portNumber, 'stat-port': portNumber, 'tcp-port': portNumber })
+    return Object.assign({ collector: collectorConf })
+}
+
+
 const agent = new MockAgent(require('../pinpoint-config-test'))
 module.exports = agent
diff --git a/test/support/data-sender-mock.js b/test/support/data-sender-mock.js
@@ -83,7 +83,7 @@ const dataSender = (conf, agentInfoOrGrpcDataSender) => {
       enabledDataSending: true,
     }, agentInfoOrGrpcDataSender)
   }
-  if (typeof conf?.collectorSpanPort === 'number') {
+  if (conf?.collectorSpanPort > 0) {
     return new MockDataSender({
       enabledDataSending: true,
     }, new GrpcDataSender(conf.collectorIp, conf.collectorSpanPort, conf.collectorStatPort, conf.collectorTcpPort, agentInfoOrGrpcDataSender, conf))