Skip to content

Commit b113e4f

Browse files
kirrg001kirrg001
authored
test: added ping endpoint for agentStub (#2172)
refs https://jsw.ibm.com/browse/INSTA-43861 - `agentHostLookup` executes a host check on the actual agent and receives a version back - This is part of the agent host lookup mechanmisn. - In our test env though, we currently use `/` for three cases: - is instance up? - exit span http request in apps - normal agent host lookup - To be able to add use cases like "delayed agent host lookup response", we have to use two different endpoints - "/" = agent host lookup - "/ping" = instance up + http example requests in apps
1 parent 9144184 commit b113e4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+257
-251
lines changed

‎packages/collector/test/apps/agentStub.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,16 @@ app.use(
6565
})
6666
);
6767

68+
// Use this endpoint for the "checkHost" (agentHostLookup) functionality.
6869
app.get('/', (req, res) => {
6970
res.json({ version: '1.1.999' });
7071
});
7172

73+
// Use this endpoint to check if the instance is up or to send an exit request.
74+
app.get('/ping', (req, res) => {
75+
res.json({ msg: 'pong' });
76+
});
77+
7278
app.put('/com.instana.plugin.nodejs.discovery', (req, res) => {
7379
const pid = req.body.pid;
7480

‎packages/collector/test/apps/agentStubControls.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class AgentStubControls {
8080
}
8181

8282
async waitUntilAgentHasStarted() {
83-
const url = `http://127.0.0.1:${this.agentPort}`;
83+
const url = `http://127.0.0.1:${this.agentPort}/ping`;
8484

8585
// eslint-disable-next-line no-console
8686
console.log(`[AgentStubControls] starting: ${url}`);

‎packages/collector/test/tracing/cloud/aws-sdk/v2/combined_products.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const AWSAPI = {
8686
return reject(err);
8787
} else {
8888
setTimeout(() => {
89-
fetch(`http://127.0.0.1:${agentPort}`)
89+
fetch(`http://127.0.0.1:${agentPort}/ping`)
9090
.then(() => resolve(data))
9191
.catch(err2 => {
9292
log(
@@ -109,7 +109,7 @@ const AWSAPI = {
109109
promiseData = data;
110110
return delay(200);
111111
})
112-
.then(() => fetch(`http://127.0.0.1:${agentPort}`))
112+
.then(() => fetch(`http://127.0.0.1:${agentPort}/ping`))
113113
.then(() => {
114114
resolve(promiseData);
115115
})
@@ -130,7 +130,7 @@ const AWSAPI = {
130130
log(`/${operation}/${method} got data from AWS SDK`);
131131

132132
await delay(200);
133-
await fetch(`http://127.0.0.1:${agentPort}`);
133+
await fetch(`http://127.0.0.1:${agentPort}/ping`);
134134

135135
return resolve(data);
136136
} catch (err) {

‎packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const DynamoDBApi = {
136136
} else {
137137
setTimeout(async () => {
138138
try {
139-
const response = await fetch(`http://127.0.0.1:${agentPort}`);
139+
const response = await fetch(`http://127.0.0.1:${agentPort}/ping`);
140140
const jsonData = await response.json();
141141
resolve(jsonData);
142142
} catch (err2) {
@@ -155,7 +155,7 @@ const DynamoDBApi = {
155155
return delay(200);
156156
})
157157
.then(async () => {
158-
const response = await fetch(`http://127.0.0.1:${agentPort}`);
158+
const response = await fetch(`http://127.0.0.1:${agentPort}/ping`);
159159
const jsonData = await response.json();
160160
return jsonData;
161161
})
@@ -179,7 +179,7 @@ const DynamoDBApi = {
179179
}
180180

181181
await delay(200);
182-
const response = await fetch(`http://127.0.0.1:${agentPort}`);
182+
const response = await fetch(`http://127.0.0.1:${agentPort}/ping`);
183183
const jsonData = await response.json();
184184
resolve(jsonData);
185185
} catch (err) {

‎packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.mjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const DynamoDBApi = {
138138
return reject(data);
139139
} else {
140140
setTimeout(() => {
141-
fetch(`http://127.0.0.1:${agentPort}`)
141+
fetch(`http://127.0.0.1:${agentPort}/ping`)
142142
.then(() => resolve(data))
143143
.catch(err2 => reject(err2));
144144
});
@@ -153,7 +153,7 @@ const DynamoDBApi = {
153153
promiseData = data;
154154
return delay(200);
155155
})
156-
.then(() => fetch(`http://127.0.0.1:${agentPort}`))
156+
.then(() => fetch(`http://127.0.0.1:${agentPort}/ping`))
157157
.then(() => {
158158
if (promiseData && promiseData.code) {
159159
reject(promiseData);
@@ -174,7 +174,7 @@ const DynamoDBApi = {
174174
}
175175

176176
await delay(200);
177-
await fetch(`http://127.0.0.1:${agentPort}`);
177+
await fetch(`http://127.0.0.1:${agentPort}/ping`);
178178

179179
return resolve(data);
180180
} catch (err) {

‎packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ operationNames.forEach(operation => {
169169
httpError(res, err);
170170
} else {
171171
setTimeout(() => {
172-
fetch(`http://127.0.0.1:${agentPort}`)
172+
fetch(`http://127.0.0.1:${agentPort}/ping`)
173173
.then(() => {
174174
httpSuccess(res, data);
175175
})
@@ -185,7 +185,7 @@ operationNames.forEach(operation => {
185185
} else if (method === 'Promise') {
186186
execOperation(operation, null, null, withError)
187187
.then(data => {
188-
fetch(`http://127.0.0.1:${agentPort}`)
188+
fetch(`http://127.0.0.1:${agentPort}/ping`)
189189
.then(() => {
190190
httpSuccess(res, data);
191191
})

‎packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ operationNames.forEach(operation => {
172172
httpError(res, err);
173173
} else {
174174
setTimeout(() => {
175-
fetch(`http://127.0.0.1:${agentPort}`)
175+
fetch(`http://127.0.0.1:${agentPort}/ping`)
176176
.then(() => {
177177
httpSuccess(res, data);
178178
})
@@ -188,7 +188,7 @@ operationNames.forEach(operation => {
188188
} else if (method === 'Promise') {
189189
execOperation(operation, null, null, withError)
190190
.then(data => {
191-
fetch(`http://127.0.0.1:${agentPort}`)
191+
fetch(`http://127.0.0.1:${agentPort}/ping`)
192192
.then(() => {
193193
httpSuccess(res, data);
194194
})

‎packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const S3Api = {
114114
return reject(err);
115115
} else {
116116
setTimeout(() => {
117-
fetch(`http://127.0.0.1:${agentPort}`)
117+
fetch(`http://127.0.0.1:${agentPort}/ping`)
118118
.then(() => resolve(data))
119119
.catch(err2 => {
120120
log(
@@ -137,7 +137,7 @@ const S3Api = {
137137
promiseData = data;
138138
return delay(200);
139139
})
140-
.then(() => fetch(`http://127.0.0.1:${agentPort}`))
140+
.then(() => fetch(`http://127.0.0.1:${agentPort}/ping`))
141141
.then(() => {
142142
resolve(promiseData);
143143
})
@@ -158,7 +158,7 @@ const S3Api = {
158158
log(`/${operation}/${method} got data from AWS SDK`);
159159

160160
await delay(200);
161-
await fetch(`http://127.0.0.1:${agentPort}`);
161+
await fetch(`http://127.0.0.1:${agentPort}/ping`);
162162

163163
return resolve(data);
164164
} catch (err) {

‎packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.mjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const S3Api = {
115115
return reject(err);
116116
} else {
117117
setTimeout(() => {
118-
fetch(`http://127.0.0.1:${agentPort}`)
118+
fetch(`http://127.0.0.1:${agentPort}/ping`)
119119
.then(() => resolve(data))
120120
.catch(err2 => {
121121
logger(
@@ -138,7 +138,7 @@ const S3Api = {
138138
promiseData = data;
139139
return delay(200);
140140
})
141-
.then(() => fetch(`http://127.0.0.1:${agentPort}`))
141+
.then(() => fetch(`http://127.0.0.1:${agentPort}/ping`))
142142
.then(() => {
143143
resolve(promiseData);
144144
})
@@ -159,7 +159,7 @@ const S3Api = {
159159
logger(`/${operation}/${method} got data from AWS SDK`);
160160

161161
await delay(200);
162-
await fetch(`http://127.0.0.1:${agentPort}`);
162+
await fetch(`http://127.0.0.1:${agentPort}/ping`);
163163

164164
return resolve(data);
165165
} catch (err) {

‎packages/collector/test/tracing/cloud/aws-sdk/v2/sns/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const SNSApi = {
8181
return reject(data);
8282
} else {
8383
setTimeout(() => {
84-
fetch(`http://127.0.0.1:${agentPort}`)
84+
fetch(`http://127.0.0.1:${agentPort}/ping`)
8585
.then(() => resolve(data))
8686
.catch(err2 => reject(err2));
8787
});
@@ -96,7 +96,7 @@ const SNSApi = {
9696
promiseData = data;
9797
return delay(200);
9898
})
99-
.then(() => fetch(`http://127.0.0.1:${agentPort}`))
99+
.then(() => fetch(`http://127.0.0.1:${agentPort}/ping`))
100100
.then(() => {
101101
if (promiseData && promiseData.code) {
102102
reject(promiseData);
@@ -117,7 +117,7 @@ const SNSApi = {
117117
}
118118

119119
await delay(200);
120-
await fetch(`http://127.0.0.1:${agentPort}`);
120+
await fetch(`http://127.0.0.1:${agentPort}/ping`);
121121

122122
return resolve(data);
123123
} catch (err) {

0 commit comments

Comments
 (0)