@nsshunt/stsappframework 3.0.15 → 3.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/influxdb/influxDBManagerAgent.js +4 -3
- package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
- package/dist/kafka/IMKafkaManager.js +6 -1
- package/dist/kafka/IMKafkaManager.js.map +1 -1
- package/package.json +3 -3
- package/src/influxdb/influxDBManagerAgent.ts +3 -3
- package/src/kafka/IMKafkaManager.ts +5 -1
- package/types/influxdb/influxDBManagerAgent.d.ts.map +1 -1
- package/types/kafka/IMKafkaManager.d.ts.map +1 -1
|
@@ -37,7 +37,8 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
|
|
|
37
37
|
dostscountex(q: "timer", d: d),
|
|
38
38
|
dostscountex(q: "duration", d: d),
|
|
39
39
|
dostscountex(q: "latency", d: d),
|
|
40
|
-
dostscountex(q: "activeRequestCount", d: d)
|
|
40
|
+
dostscountex(q: "activeRequestCount", d: d),
|
|
41
|
+
dostscountex(q: "childCount", d: d)
|
|
41
42
|
])
|
|
42
43
|
dostscount(d: -5s)`;
|
|
43
44
|
if (showOutput) {
|
|
@@ -146,7 +147,6 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
|
|
|
146
147
|
this.#GetSTSQuantileGenericAgent(`agent`, `and r["agentName"] == "${agentName}"`, 'group(columns: ["agentName", "threadId", "_field"])'),
|
|
147
148
|
this.#GetSTSHistoGenericService('agent', `and r["agentName"] == "${agentName}"`, 'group(columns: ["agentName", "threadId", "_field"])')
|
|
148
149
|
], ['agentName', 'threadId']);
|
|
149
|
-
console.log(`${JSON.stringify(combinedResults)}`.magenta);
|
|
150
150
|
return { SubscriptionType: `ID_Agent_Agent_Threads_${agentName}`, data: combinedResults };
|
|
151
151
|
}
|
|
152
152
|
catch (error) {
|
|
@@ -195,7 +195,8 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
|
|
|
195
195
|
.floatField('timer', instrumentPayload.instruments[stsinstrumentation_1.Gauge.TIMER_GAUGE].val) // s
|
|
196
196
|
.floatField('duration', instrumentPayload.instruments[stsinstrumentation_1.Gauge.DURATION_GAUGE].val) // h
|
|
197
197
|
.floatField('latency', instrumentPayload.instruments[stsinstrumentation_1.Gauge.LATENCY_GAUGE].val) // h
|
|
198
|
-
.intField('activeRequestCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE].val)
|
|
198
|
+
.intField('activeRequestCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE].val) // a
|
|
199
|
+
.intField('childCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CHILD_COUNT].val); // y
|
|
199
200
|
// logger // m
|
|
200
201
|
// duration histo // i
|
|
201
202
|
this.writeClient.writePoint(point);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerAgent.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":";;;AAAA,wFAAwF,CAAE,UAAU;AACpG,iEAAuE;AAEvE,oEAAuE;AAEvE,+DAA2D;AAI3D,MAAM,UAAU,GAAG,yBAAyB,CAAA;AAE5C,MAAa,oBAAqB,SAAQ,yCAAmB;IAEzD,YAAY,OAAgC,EAAE,QAAkB,EAAE,WAAqB;QACnF,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1C,CAAC;IAED,IAAa,SAAS;QAClB,OAAO,OAAO,CAAA;IAClB,CAAC;IAED,mHAAmH;IAEnH,kBAAkB;IAClB,wBAAwB,GAAG,KAAK,EAAE,SAAiB,EAAE,YAAoB,EAAE,WAAmB,EAAE,aAAsB,KAAK,EAAE,EAAE;QAC3H,IAAI;YACA,MAAM,KAAK,GAAG;4BACE,IAAI,CAAC,OAAO,CAAC,MAAM;;qFAEsC,SAAS,KAAK,YAAY;;;iBAG9F,WAAW
|
|
1
|
+
{"version":3,"file":"influxDBManagerAgent.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,12 @@ class IMKafkaManager {
|
|
|
66
66
|
let topic = '';
|
|
67
67
|
if (instrumentPayload.context.agentName) {
|
|
68
68
|
const { agentName, threadId, asyncRunnerId } = instrumentPayload.context;
|
|
69
|
-
|
|
69
|
+
if (asyncRunnerId) {
|
|
70
|
+
topic = `${agentName}_${threadId}_${asyncRunnerId}`.replace(/@/g, '_');
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
topic = `${agentName}_${threadId}`.replace(/@/g, '_');
|
|
74
|
+
}
|
|
70
75
|
topic = topic.replace(/\|/g, '_');
|
|
71
76
|
}
|
|
72
77
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IMKafkaManager.js","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":";;;AAEA,oEAAmD;AAEnD,iDAAkE;AAKlE,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,MAAM,UAAU,GAAG,iBAAiB,CAAA;AAEpC,uDAAuD;AACvD,MAAa,cAAc;IACvB,aAAa,GAAY,KAAK,CAAC;IAC/B,SAAS,GAAyB,IAAI,CAAC;IAEvC,GAAG,CAAe;IAClB,OAAO,GAAe,EAAG,CAAA;IAEzB;QAEI,iBAAiB;QAEjB,MAAM,GAAG,GAAwB;YAC7B,QAAQ,EAAE,QAAQ,CAAC,cAAc;YACjC,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC;YAC1C,SAAS,EAAE,QAAQ,CAAC,gBAAgB;YACpC,YAAY,EAAE,QAAQ,CAAC,mBAAmB;YAC1C,iBAAiB,EAAE,QAAQ,CAAC,wBAAwB;YACpD,QAAQ,EAAE,QAAQ,CAAC,eAAe;YAClC,MAAM,EAAE,QAAQ,CAAC,aAAa;YAC9B,cAAc,EAAE,QAAQ,CAAC,qBAAqB;SACjD,CAAA;QACD,IAAI,QAAQ,CAAC,aAAa,EAAE;YACxB,GAAG,CAAC,GAAG,GAAG;gBACN,kBAAkB,EAAE,QAAQ,CAAC,4BAA4B;gBACzD,MAAM,EAAE,QAAQ,CAAC,gBAAgB;gBACjC,YAAY,EAAE,QAAQ,CAAC,kBAAkB;gBACzC,OAAO,EAAE,QAAQ,CAAC,iBAAiB;aACtC,CAAA;SACJ;QAED,IAAI,CAAC,GAAG,GAAG,IAAI,2BAAY,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAED,KAAK,GAAG,KAAK,IAAmB,EAAE;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC,CAAA;IAED,SAAS,GAAG,KAAK,IAAmB,EAAE;QAClC,IAAI;YACA,IAAI,IAAI,CAAC,aAAa,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,MAAM,CAAC,CAAC;aACvF;iBAAM;gBACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,IAAI,CAAC,SAAS,EAAE;oBAChB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;iBACrC;aACJ;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,GAAG,UAAU,uBAAuB,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;SACnE;IACL,CAAC,CAAA;IAED,KAAK,CAAC,UAAU,CAAC,iBAAoC;QACjD,IAAI;YACA,IAAI,IAAI,CAAC,aAAa,EAAE;gBACpB,OAAO,KAAK,CAAC;aAChB;YAED,IAAI,KAAK,GAAW,EAAE,CAAC;YAEvB,IAAI,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE;gBACrC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC;gBAEzE,KAAK,GAAG,GAAG,SAAS,IAAI,QAAQ,IAAI,aAAa,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"IMKafkaManager.js","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.17",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
"@influxdata/influxdb-client": "^1.33.2",
|
|
50
50
|
"@nsshunt/stsconfig": "^1.25.57",
|
|
51
51
|
"@nsshunt/stsdatamanagement": "^1.17.126",
|
|
52
|
-
"@nsshunt/stsinstrumentation": "^7.0.
|
|
53
|
-
"@nsshunt/stspublisherserver": "^2.0.
|
|
52
|
+
"@nsshunt/stsinstrumentation": "^7.0.2",
|
|
53
|
+
"@nsshunt/stspublisherserver": "^2.0.17",
|
|
54
54
|
"@nsshunt/stssocketio-client": "^0.0.23",
|
|
55
55
|
"@nsshunt/stsutils": "^1.16.11",
|
|
56
56
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
@@ -44,7 +44,8 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
44
44
|
dostscountex(q: "timer", d: d),
|
|
45
45
|
dostscountex(q: "duration", d: d),
|
|
46
46
|
dostscountex(q: "latency", d: d),
|
|
47
|
-
dostscountex(q: "activeRequestCount", d: d)
|
|
47
|
+
dostscountex(q: "activeRequestCount", d: d),
|
|
48
|
+
dostscountex(q: "childCount", d: d)
|
|
48
49
|
])
|
|
49
50
|
dostscount(d: -5s)`;
|
|
50
51
|
|
|
@@ -160,8 +161,6 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
160
161
|
this.#GetSTSHistoGenericService('agent', `and r["agentName"] == "${agentName}"`, 'group(columns: ["agentName", "threadId", "_field"])')],
|
|
161
162
|
['agentName', 'threadId'])
|
|
162
163
|
|
|
163
|
-
console.log(`${JSON.stringify(combinedResults)}`.magenta);
|
|
164
|
-
|
|
165
164
|
return { SubscriptionType: `ID_Agent_Agent_Threads_${agentName}`, data: combinedResults};
|
|
166
165
|
} catch (error) {
|
|
167
166
|
console.error(`${_logPrefix}GetInfluxDBResultsAgentThreads: Error: [${error}]`.red);
|
|
@@ -214,6 +213,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
214
213
|
.floatField('duration', instrumentPayload.instruments[Gauge.DURATION_GAUGE].val) // h
|
|
215
214
|
.floatField('latency', instrumentPayload.instruments[Gauge.LATENCY_GAUGE].val) // h
|
|
216
215
|
.intField('activeRequestCount', instrumentPayload.instruments[Gauge.ACTIVE_REQUEST_GAUGE].val) // a
|
|
216
|
+
.intField('childCount', instrumentPayload.instruments[Gauge.CHILD_COUNT].val) // y
|
|
217
217
|
// logger // m
|
|
218
218
|
// duration histo // i
|
|
219
219
|
this.writeClient.writePoint(point);
|
|
@@ -82,7 +82,11 @@ export class IMKafkaManager {
|
|
|
82
82
|
if (instrumentPayload.context.agentName) {
|
|
83
83
|
const { agentName, threadId, asyncRunnerId } = instrumentPayload.context;
|
|
84
84
|
|
|
85
|
-
|
|
85
|
+
if (asyncRunnerId) {
|
|
86
|
+
topic = `${agentName}_${threadId}_${asyncRunnerId}`.replace(/@/g, '_');
|
|
87
|
+
} else {
|
|
88
|
+
topic = `${agentName}_${threadId}`.replace(/@/g, '_');
|
|
89
|
+
}
|
|
86
90
|
topic = topic.replace(/\|/g, '_')
|
|
87
91
|
} else {
|
|
88
92
|
const { serviceInstanceId, serviceInstanceProcessId } = instrumentPayload.context;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerAgent.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAI7E,qBAAa,oBAAqB,SAAQ,mBAAmB;;gBAE7C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;
|
|
1
|
+
{"version":3,"file":"influxDBManagerAgent.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAI7E,qBAAa,oBAAqB,SAAQ,mBAAmB;;gBAE7C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAyGK,2BAA2B;;;;IAe3B,uBAAuB;;;;IAevB,8BAA8B,CAAC,SAAS,EAAE,MAAM;;;;IAgBhD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;IAiBjE,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsC/E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IMKafkaManager.d.ts","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGpD,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAA;AAWlE,qBAAa,cAAc;;;IAiCvB,IAAI,EAAE,IAAI,YAAY,CAErB;IAED,KAAK,QAAa,QAAQ,IAAI,CAAC,CAG9B;IAED,SAAS,QAAa,QAAQ,IAAI,CAAC,CAclC;IAEK,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"IMKafkaManager.d.ts","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGpD,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAA;AAWlE,qBAAa,cAAc;;;IAiCvB,IAAI,EAAE,IAAI,YAAY,CAErB;IAED,KAAK,QAAa,QAAQ,IAAI,CAAC,CAG9B;IAED,SAAS,QAAa,QAAQ,IAAI,CAAC,CAclC;IAEK,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsD3E"}
|