@nsshunt/stsappframework 3.0.22 → 3.0.24

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.
Files changed (17) hide show
  1. package/dist/influxdb/influxDBManagerAgent.js +27 -4
  2. package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
  3. package/dist/influxdb/influxDBManagerService.js +26 -4
  4. package/dist/influxdb/influxDBManagerService.js.map +1 -1
  5. package/dist/instrumentationsubscriber.js +62 -58
  6. package/dist/instrumentationsubscriber.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/commonTypes.ts +11 -13
  9. package/src/influxdb/influxDBManagerAgent.ts +28 -5
  10. package/src/influxdb/influxDBManagerService.ts +27 -4
  11. package/src/instrumentationsubscriber.ts +83 -63
  12. package/types/commonTypes.d.ts +10 -11
  13. package/types/commonTypes.d.ts.map +1 -1
  14. package/types/influxdb/influxDBManagerAgent.d.ts.map +1 -1
  15. package/types/influxdb/influxDBManagerService.d.ts.map +1 -1
  16. package/types/instrumentationsubscriber.d.ts +15 -3
  17. package/types/instrumentationsubscriber.d.ts.map +1 -1
package/dist/influxdb/influxDBManagerAgent.js CHANGED
@@ -125,7 +125,12 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
125
125
  catch (error) {
126
126
  console.error(`${_logPrefix}GetInfluxDBResultsRootAgent: Error: [${error}]`.red);
127
127
  }
128
- return { topic: commonTypes_1.SubscriptionTopic.AllAgentsCombined, data: retVal };
128
+ return {
129
+ subscriptionKey: {
130
+ topic: commonTypes_1.SubscriptionTopic.AllAgentsCombined
131
+ },
132
+ data: retVal
133
+ };
129
134
  }
130
135
  // Service level metrics
131
136
  async GetInfluxDBResultsAgent() {
@@ -140,7 +145,12 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
140
145
  catch (error) {
141
146
  console.error(`${_logPrefix}GetInfluxDBResultsAgent: Error: [${error}]`.red);
142
147
  }
143
- return { topic: commonTypes_1.SubscriptionTopic.Agents, data: retVal };
148
+ return {
149
+ subscriptionKey: {
150
+ topic: commonTypes_1.SubscriptionTopic.Agents
151
+ },
152
+ data: retVal
153
+ };
144
154
  }
145
155
  // Service instance metrics for a particular service type
146
156
  async GetInfluxDBResultsAgentThreads(agentName) {
@@ -155,7 +165,13 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
155
165
  catch (error) {
156
166
  console.error(`${_logPrefix}GetInfluxDBResultsAgentThreads: Error: [${error}]`.red);
157
167
  }
158
- return { topic: commonTypes_1.SubscriptionTopic.AgentWorkers, key: agentName, data: retVal };
168
+ return {
169
+ subscriptionKey: {
170
+ topic: commonTypes_1.SubscriptionTopic.AgentWorkers,
171
+ key: agentName
172
+ },
173
+ data: retVal
174
+ };
159
175
  }
160
176
  // Service instance thread metrics for a particular service instance
161
177
  async GetInfluxDBResultsAgentThread(agentName, threadId) {
@@ -170,7 +186,14 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
170
186
  catch (error) {
171
187
  console.error(`${_logPrefix}GetInfluxDBResultsAgentThread: Error: [${error}]`.red);
172
188
  }
173
- return { topic: commonTypes_1.SubscriptionTopic.AgentWorker, key: agentName, subkey: threadId, data: retVal };
189
+ return {
190
+ subscriptionKey: {
191
+ topic: commonTypes_1.SubscriptionTopic.AgentWorker,
192
+ key: agentName,
193
+ subkey: threadId
194
+ },
195
+ data: retVal
196
+ };
174
197
  }
175
198
  // Agent context payload
176
199
  // {"nid":"somehost@e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent|MainProcess|0","id":"somehost@e58f5d75-6ff6-4e04-92a4-f2bcd722fec0-someuseragent|MainProcess|0","hostName":"somehost"
package/dist/influxdb/influxDBManagerAgent.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"influxDBManagerAgent.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"influxDBManagerAgent.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"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"}
package/dist/influxdb/influxDBManagerService.js CHANGED
@@ -140,7 +140,12 @@ class InfluxDBManagerService extends influxDBManagerBase_1.InfluxDBManagerBase {
140
140
  catch (error) {
141
141
  console.error(`${_logPrefix}GetInfluxDBResultsRoot: Error: [${error}]`.red);
142
142
  }
143
- return { topic: commonTypes_1.SubscriptionTopic.AllServicesCombined, data: retVal };
143
+ return {
144
+ subscriptionKey: {
145
+ topic: commonTypes_1.SubscriptionTopic.AllServicesCombined
146
+ },
147
+ data: retVal
148
+ };
144
149
  }
145
150
  // Service level metrics
146
151
  async GetInfluxDBResultsService() {
@@ -155,7 +160,12 @@ class InfluxDBManagerService extends influxDBManagerBase_1.InfluxDBManagerBase {
155
160
  catch (error) {
156
161
  console.error(`${_logPrefix}GetInfluxDBResultsService: Error: [${error}]`.red);
157
162
  }
158
- return { topic: commonTypes_1.SubscriptionTopic.Services, data: retVal };
163
+ return {
164
+ subscriptionKey: {
165
+ topic: commonTypes_1.SubscriptionTopic.Services
166
+ },
167
+ data: retVal
168
+ };
159
169
  }
160
170
  // Service instance metrics for a particular service type
161
171
  async GetInfluxDBResultsServiceInstances(serviceId) {
@@ -170,7 +180,13 @@ class InfluxDBManagerService extends influxDBManagerBase_1.InfluxDBManagerBase {
170
180
  catch (error) {
171
181
  console.error(`${_logPrefix}GetInfluxDBResultsServiceInstances: Error: [${error}]`.red);
172
182
  }
173
- return { topic: commonTypes_1.SubscriptionTopic.ServiceInstances, key: serviceId, data: retVal };
183
+ return {
184
+ subscriptionKey: {
185
+ topic: commonTypes_1.SubscriptionTopic.ServiceInstances,
186
+ key: serviceId
187
+ },
188
+ data: retVal
189
+ };
174
190
  }
175
191
  // Service instance thread metrics for a particular service instance
176
192
  async GetInfluxDBResultsServiceInstance(serviceInstanceId) {
@@ -185,7 +201,13 @@ class InfluxDBManagerService extends influxDBManagerBase_1.InfluxDBManagerBase {
185
201
  catch (error) {
186
202
  console.error(`${_logPrefix}GetInfluxDBResultsServiceInstance: Error: [${error}]`.red);
187
203
  }
188
- return { topic: commonTypes_1.SubscriptionTopic.ServiceInstance, key: serviceInstanceId, data: retVal };
204
+ return {
205
+ subscriptionKey: {
206
+ topic: commonTypes_1.SubscriptionTopic.ServiceInstance,
207
+ key: serviceInstanceId
208
+ },
209
+ data: retVal
210
+ };
189
211
  }
190
212
  // Write data points ----------------------------------------------------------------------------------------------
191
213
  // Agent context payload
package/dist/influxdb/influxDBManagerService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"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"}
package/dist/instrumentationsubscriber.js CHANGED
@@ -48,15 +48,15 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
48
48
  console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Unsubscribe from Kafka topc: [${kafka.kafkaTopic}] Completed.`.yellow);
49
49
  }
50
50
  else {
51
- console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Kafka details do not eixsting for this topc: [${subscription.topic}].`.magenta);
51
+ console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Kafka details do not exist for this topc: [${JSON.stringify(subscription.subscriptionKey)}].`.magenta);
52
52
  }
53
53
  };
54
54
  return unsubscribeKafka();
55
55
  }
56
56
  async #SubscribeKafka(subscription) {
57
57
  const kafkaSubscribe = async () => {
58
- if (subscription.key) {
59
- const kafkaSafeKey = `${this.#KAFKA_PREFIX}_${subscription.key}`.replace(/@/g, '_');
58
+ if (subscription.combinedKey) {
59
+ const kafkaSafeKey = `${this.#KAFKA_PREFIX}_${subscription.combinedKey}`.replace(/@/g, '_');
60
60
  const kafkaGroupId = (0, uuid_1.v4)();
61
61
  subscription.kafka = {
62
62
  kafkaTopic: kafkaSafeKey,
@@ -73,8 +73,7 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
73
73
  if (key != "" && value != "") {
74
74
  if (topic.localeCompare(key) === 0) {
75
75
  subscription.cb({
76
- topic: commonTypes_1.SubscriptionTopic.LogProcessing,
77
- key: subscription.key,
76
+ subscriptionKey: subscription.subscriptionKey,
78
77
  data: {
79
78
  kafkaTopic: kafka.kafkaTopic,
80
79
  kafkaGroupId: kafka.kafkaGroupId,
@@ -100,33 +99,33 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
100
99
  console.log(`InstrumentationSubscriber:#SubscribeKafka(): Subscribe to Kafka topc: [${kafka.kafkaTopic}] Completed`.yellow);
101
100
  }
102
101
  else {
103
- console.log(`InstrumentationSubscriber:#SubscribeKafka(): Could not subscribe to Kafka topc, missing key for topic: [${subscription.topic}]`.magenta);
102
+ console.log(`InstrumentationSubscriber:#SubscribeKafka(): Could not subscribe to Kafka topc, missing combinedKey for topic: [${JSON.stringify(subscription.subscriptionKey)}]`.magenta);
104
103
  }
105
104
  };
106
105
  return kafkaSubscribe();
107
106
  }
108
107
  async #OutputSubscription(subscription) {
109
108
  // Service subscriptions
110
- const { topic, key, subkey } = subscription;
111
- switch (topic) {
109
+ const { subscriptionKey } = subscription;
110
+ switch (subscriptionKey.topic) {
112
111
  // Services -------------------------------------------------------------------------------------------
113
112
  case commonTypes_1.SubscriptionTopic.AllServicesCombined:
114
113
  return this.#influxDBManager.serviceManager.GetInfluxDBResultsRootService();
115
114
  case commonTypes_1.SubscriptionTopic.Services:
116
115
  return this.#influxDBManager.serviceManager.GetInfluxDBResultsService();
117
116
  case commonTypes_1.SubscriptionTopic.ServiceInstances:
118
- if (key) { // key = service_id
119
- return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstances(key);
117
+ if (subscriptionKey.key) { // key = service_id
118
+ return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstances(subscriptionKey.key);
120
119
  }
121
120
  else {
122
- throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
121
+ throw new Error(`#OutputSubscription: key not provided for subscription: [${subscriptionKey.topic}]`);
123
122
  }
124
123
  case commonTypes_1.SubscriptionTopic.ServiceInstance:
125
- if (key) { // key = service instance id
126
- return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstance(key);
124
+ if (subscriptionKey.key) { // key = service instance id
125
+ return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstance(subscriptionKey.key);
127
126
  }
128
127
  else {
129
- throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
128
+ throw new Error(`#OutputSubscription: key not provided for subscription: [${subscriptionKey.topic}]`);
130
129
  }
131
130
  // User Agents -------------------------------------------------------------------------------------------
132
131
  case commonTypes_1.SubscriptionTopic.AllAgentsCombined:
@@ -134,25 +133,25 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
134
133
  case commonTypes_1.SubscriptionTopic.Agents:
135
134
  return this.#influxDBManager.agentManager.GetInfluxDBResultsAgent();
136
135
  case commonTypes_1.SubscriptionTopic.AgentWorkers:
137
- if (key) { // key = agent instance id
138
- return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThreads(key);
136
+ if (subscriptionKey.key) { // key = agent instance id
137
+ return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThreads(subscriptionKey.key);
139
138
  }
140
139
  else {
141
- throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
140
+ throw new Error(`#OutputSubscription: key not provided for subscription: [${subscriptionKey.topic}]`);
142
141
  }
143
142
  case commonTypes_1.SubscriptionTopic.AgentWorker:
144
- if (key && subkey) { // key = agent instance id, subkey = agent instance worker id
145
- return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThread(key, subkey);
143
+ if (subscriptionKey.key && subscriptionKey.subkey) { // key = agent instance id, subkey = agent instance worker id
144
+ return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThread(subscriptionKey.key, subscriptionKey.subkey);
146
145
  }
147
146
  else {
148
- throw new Error(`#OutputSubscription: key and/or subkey not provided for subscription: [${topic}]`);
147
+ throw new Error(`#OutputSubscription: key and/or subkey not provided for subscription: [${subscriptionKey.topic}]`);
149
148
  }
150
149
  // Logging (both service and agent) -----------------------------------------------------------------------
151
150
  case commonTypes_1.SubscriptionTopic.LogProcessing:
152
151
  // Kafka processing will be handled by a dedicated kafka run consumer
153
- return { topic, data: null };
152
+ return { subscriptionKey, data: null };
154
153
  default:
155
- return { topic, data: null };
154
+ return { subscriptionKey, data: null };
156
155
  }
157
156
  }
158
157
  #ExecuteSubscriptions = async () => {
@@ -169,45 +168,57 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
169
168
  }
170
169
  }
171
170
  catch (error) {
172
- console.log(`${error} -- ${JSON.stringify(retVal)}`.red);
171
+ console.log(`InstrumentationSubscriber:#ExecuteSubscriptions(): Error: [${error}], [${JSON.stringify(retVal)}]`.red);
173
172
  }
174
173
  };
175
- Subscribe(subscriptions) {
174
+ #GetInternalSubscriptionKey(subscriptionKey) {
175
+ let internalKey = subscriptionKey.topic.toString();
176
+ if (subscriptionKey.key) {
177
+ internalKey += `_${subscriptionKey.key}`;
178
+ if (subscriptionKey.subkey) {
179
+ internalKey += `_${subscriptionKey.subkey}`;
180
+ }
181
+ }
182
+ return internalKey;
183
+ }
184
+ Subscribe(subscriptionKey, cb) {
176
185
  if (this.#interval) {
177
186
  clearInterval(this.#interval);
178
187
  }
179
- for (let i = 0; i < subscriptions.length; i++) {
180
- if (this.#subscriptions[subscriptions[i].topic]) {
181
- // Subscription already exists - ignoring
182
- console.log(`InstrumentationSubscriber.Subscribe(): Subscription already exists - ignoring.`.magenta);
183
- }
184
- else {
185
- this.#subscriptions[subscriptions[i].topic] = subscriptions[i];
186
- console.log(`InstrumentationSubscriber.Subscribe(): topicKey: [${subscriptions[i].topic}] successfully subscribed.`.grey);
187
- if (subscriptions[i].topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
188
- this.#SubscribeKafka(subscriptions[i]);
189
- }
190
- }
188
+ // Create a combined key
189
+ const combinedKey = this.#GetInternalSubscriptionKey(subscriptionKey);
190
+ if (this.#subscriptions[combinedKey]) {
191
+ // Subscription already exists - ignoring
192
+ console.log(`InstrumentationSubscriber.Subscribe(): Subscription already exists: [${combinedKey}] - ignoring.`.magenta);
191
193
  }
192
- if (!this.#interval) {
193
- // Output subscription immediately and then iterate ...
194
- this.#ExecuteSubscriptions();
195
- let interval = 1000; // default
196
- if (this.options) {
197
- interval = this.options.SubscriptionInterval;
194
+ else {
195
+ this.#subscriptions[combinedKey] = {
196
+ combinedKey,
197
+ subscriptionKey,
198
+ cb
199
+ };
200
+ if (subscriptionKey.topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
201
+ this.#SubscribeKafka(this.#subscriptions[combinedKey]);
198
202
  }
199
- this.#interval = setInterval(() => {
203
+ console.log(`InstrumentationSubscriber.Subscribe(): topicKey: [${combinedKey}] successfully subscribed.`.grey);
204
+ if (!this.#interval) {
205
+ // Output subscription immediately and then iterate ...
200
206
  this.#ExecuteSubscriptions();
201
- }, interval);
207
+ let interval = 1000; // default
208
+ if (this.options) {
209
+ interval = this.options.SubscriptionInterval;
210
+ }
211
+ this.#interval = setInterval(() => {
212
+ this.#ExecuteSubscriptions();
213
+ }, interval);
214
+ }
202
215
  }
203
216
  }
204
- UnSubscribe(subscriptions) {
205
- for (let i = 0; i < subscriptions.length; i++) {
206
- if (subscriptions[i].topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
207
- this.#UnSubscribeKafka(subscriptions[i]);
208
- }
209
- delete this.#subscriptions[subscriptions[i].topic];
217
+ UnSubscribe(subscription) {
218
+ if (subscription.subscriptionKey.topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
219
+ this.#UnSubscribeKafka(subscription);
210
220
  }
221
+ delete this.#subscriptions[subscription.combinedKey];
211
222
  if (Object.keys(this.#subscriptions).length === 0) {
212
223
  if (this.#interval) {
213
224
  clearInterval(this.#interval);
@@ -216,16 +227,9 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
216
227
  }
217
228
  }
218
229
  #UnSubscribeAll() {
219
- if (this.#interval) {
220
- clearInterval(this.#interval);
221
- this.#interval = null;
222
- }
223
230
  for (const [, subscription] of Object.entries(this.#subscriptions)) {
224
- if (subscription.topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
225
- this.#UnSubscribeKafka(subscription);
226
- }
231
+ this.UnSubscribe(subscription);
227
232
  }
228
- this.#subscriptions = {};
229
233
  }
230
234
  async Start() {
231
235
  return this.#influxDBManager.Start();
package/dist/instrumentationsubscriber.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentationsubscriber.js","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instrumentationsubscriber.js","sourceRoot":"","sources":["../src/instrumentationsubscriber.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.22",
3
+ "version": "3.0.24",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
package/src/commonTypes.ts CHANGED
@@ -252,26 +252,24 @@ export interface IKafkaConsumer {
252
252
  StartConsumingMessages: (cb: (topic: string, key: string, partition: number, value: string, headers: IHeaders | undefined) => void) => Promise<void>
253
253
  }
254
254
 
255
- export interface ISubscriptionPayload {
255
+ export interface ISubscriptionKey {
256
256
  topic: SubscriptionTopic
257
257
  key?: string
258
258
  subkey?: string
259
- data: any
260
259
  }
261
260
 
262
- export interface IKafkaSubscription {
261
+ export interface IKafkaData {
263
262
  kafkaTopic: string
264
263
  kafkaGroupId: string
265
- kafkaConsumer: IKafkaConsumer
266
- }
267
-
268
- export interface ISubscription {
269
- topic: SubscriptionTopic
270
- key?: string
271
- subkey?: string
272
- kafka?: IKafkaSubscription
273
- cb: (payload: ISubscriptionPayload) => void
264
+ partition: number,
265
+ topic: string
266
+ key: string
267
+ value: string
274
268
  }
275
269
 
276
- export type ISubscriptions = ISubscription[]
270
+ export type IInfluxData = any;
277
271
 
272
+ export interface ISubscriptionPayload {
273
+ subscriptionKey: ISubscriptionKey
274
+ data: IKafkaData | IInfluxData | null
275
+ }
package/src/influxdb/influxDBManagerAgent.ts CHANGED
@@ -5,7 +5,7 @@ import { Gauge, InstrumentVelocity } from '@nsshunt/stsinstrumentation'
5
5
 
6
6
  import { InfluxDBManagerBase } from './influxDBManagerBase'
7
7
 
8
- import { IInfluxDBManagerOptions, InstrumentPayload, ISubscriptionPayload, SubscriptionTopic } from './../commonTypes'
8
+ import { IInfluxData, IInfluxDBManagerOptions, InstrumentPayload, ISubscriptionPayload, SubscriptionTopic } from './../commonTypes'
9
9
 
10
10
  const _logPrefix = 'InfluxDBManagerService:'
11
11
 
@@ -133,7 +133,12 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
133
133
  } catch (error) {
134
134
  console.error(`${_logPrefix}GetInfluxDBResultsRootAgent: Error: [${error}]`.red);
135
135
  }
136
- return { topic: SubscriptionTopic.AllAgentsCombined, data: retVal };
136
+ return {
137
+ subscriptionKey: {
138
+ topic: SubscriptionTopic.AllAgentsCombined
139
+ },
140
+ data: retVal
141
+ };
137
142
  }
138
143
 
139
144
  // Service level metrics
@@ -148,7 +153,12 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
148
153
  } catch (error) {
149
154
  console.error(`${_logPrefix}GetInfluxDBResultsAgent: Error: [${error}]`.red);
150
155
  }
151
- return { topic: SubscriptionTopic.Agents, data: retVal };
156
+ return {
157
+ subscriptionKey: {
158
+ topic: SubscriptionTopic.Agents
159
+ },
160
+ data: retVal
161
+ };
152
162
  }
153
163
 
154
164
  // Service instance metrics for a particular service type
@@ -163,7 +173,13 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
163
173
  } catch (error) {
164
174
  console.error(`${_logPrefix}GetInfluxDBResultsAgentThreads: Error: [${error}]`.red);
165
175
  }
166
- return { topic: SubscriptionTopic.AgentWorkers, key: agentName, data: retVal };
176
+ return {
177
+ subscriptionKey: {
178
+ topic: SubscriptionTopic.AgentWorkers,
179
+ key: agentName
180
+ },
181
+ data: retVal
182
+ };
167
183
  }
168
184
 
169
185
  // Service instance thread metrics for a particular service instance
@@ -178,7 +194,14 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
178
194
  } catch (error) {
179
195
  console.error(`${_logPrefix}GetInfluxDBResultsAgentThread: Error: [${error}]`.red);
180
196
  }
181
- return { topic: SubscriptionTopic.AgentWorker, key: agentName, subkey: threadId, data: retVal };
197
+ return {
198
+ subscriptionKey: {
199
+ topic: SubscriptionTopic.AgentWorker,
200
+ key: agentName,
201
+ subkey: threadId
202
+ },
203
+ data: retVal
204
+ };
182
205
  }
183
206
 
184
207
  // Agent context payload
package/src/influxdb/influxDBManagerService.ts CHANGED
@@ -148,7 +148,12 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
148
148
  } catch (error) {
149
149
  console.error(`${_logPrefix}GetInfluxDBResultsRoot: Error: [${error}]`.red);
150
150
  }
151
- return { topic: SubscriptionTopic.AllServicesCombined, data: retVal };
151
+ return {
152
+ subscriptionKey: {
153
+ topic: SubscriptionTopic.AllServicesCombined
154
+ },
155
+ data: retVal
156
+ };
152
157
  }
153
158
 
154
159
  // Service level metrics
@@ -163,7 +168,13 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
163
168
  } catch (error) {
164
169
  console.error(`${_logPrefix}GetInfluxDBResultsService: Error: [${error}]`.red);
165
170
  }
166
- return { topic: SubscriptionTopic.Services, data: retVal };
171
+ return {
172
+ subscriptionKey: {
173
+ topic: SubscriptionTopic.Services
174
+ },
175
+ data: retVal
176
+ };
177
+
167
178
  }
168
179
 
169
180
  // Service instance metrics for a particular service type
@@ -178,7 +189,13 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
178
189
  } catch (error) {
179
190
  console.error(`${_logPrefix}GetInfluxDBResultsServiceInstances: Error: [${error}]`.red);
180
191
  }
181
- return { topic: SubscriptionTopic.ServiceInstances, key: serviceId, data: retVal };
192
+ return {
193
+ subscriptionKey: {
194
+ topic: SubscriptionTopic.ServiceInstances,
195
+ key: serviceId
196
+ },
197
+ data: retVal
198
+ };
182
199
  }
183
200
 
184
201
  // Service instance thread metrics for a particular service instance
@@ -193,7 +210,13 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
193
210
  } catch (error) {
194
211
  console.error(`${_logPrefix}GetInfluxDBResultsServiceInstance: Error: [${error}]`.red);
195
212
  }
196
- return { topic: SubscriptionTopic.ServiceInstance, key: serviceInstanceId, data: retVal };
213
+ return {
214
+ subscriptionKey: {
215
+ topic: SubscriptionTopic.ServiceInstance,
216
+ key: serviceInstanceId
217
+ },
218
+ data: retVal
219
+ };
197
220
  }
198
221
 
199
222
  // Write data points ----------------------------------------------------------------------------------------------
package/src/instrumentationsubscriber.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ISubscriptions, ISubscription, ISubscriptionPayload, SubscriptionTopic } from './commonTypes'
1
+ import { ISubscriptionPayload, SubscriptionTopic, IKafkaData, IKafkaConsumer, ISubscriptionKey } from './commonTypes'
2
2
  import { KafkaManager, IKafkaManagerConfig } from './kafka/kafkamanager'
3
3
  import { InfluxDBManager } from './influxdb/influxDBManager'
4
4
 
@@ -8,12 +8,27 @@ import { $Options } from '@nsshunt/stsconfig'
8
8
  import { STSOptionsBase } from '@nsshunt/stsutils';
9
9
  const goptions = $Options()
10
10
 
11
+ declare interface IKafkaSubscription {
12
+ kafkaTopic: string
13
+ kafkaGroupId: string
14
+ kafkaConsumer: IKafkaConsumer
15
+ }
16
+
17
+ declare interface ISubscription {
18
+ combinedKey: string
19
+ subscriptionKey: ISubscriptionKey
20
+ kafka?: IKafkaSubscription
21
+ cb: (payload: ISubscriptionPayload) => void
22
+ }
23
+
24
+ declare type ISubscriptions = Record<string, ISubscription>;
25
+
11
26
  export interface IInstrumentationSubscriberOptions {
12
27
  SubscriptionInterval: number
13
28
  }
14
29
 
15
30
  export class InstrumentationSubscriber extends STSOptionsBase {
16
- #subscriptions: Record<string, ISubscription> = { };
31
+ #subscriptions: ISubscriptions = { };
17
32
  #influxDBManager: InfluxDBManager;
18
33
  #interval: NodeJS.Timer | null = null;
19
34
  #km: KafkaManager;
@@ -55,7 +70,7 @@ export class InstrumentationSubscriber extends STSOptionsBase {
55
70
  await kafka.kafkaConsumer?.Disconnect();
56
71
  console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Unsubscribe from Kafka topc: [${kafka.kafkaTopic}] Completed.`.yellow)
57
72
  } else {
58
- console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Kafka details do not eixsting for this topc: [${subscription.topic}].`.magenta)
73
+ console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Kafka details do not exist for this topc: [${JSON.stringify(subscription.subscriptionKey)}].`.magenta)
59
74
  }
60
75
  };
61
76
  return unsubscribeKafka();
@@ -63,8 +78,8 @@ export class InstrumentationSubscriber extends STSOptionsBase {
63
78
 
64
79
  async #SubscribeKafka(subscription: ISubscription): Promise<void> {
65
80
  const kafkaSubscribe = async () => {
66
- if (subscription.key) {
67
- const kafkaSafeKey = `${this.#KAFKA_PREFIX}_${subscription.key}`.replace(/@/g, '_');
81
+ if (subscription.combinedKey) {
82
+ const kafkaSafeKey = `${this.#KAFKA_PREFIX}_${subscription.combinedKey}`.replace(/@/g, '_');
68
83
  const kafkaGroupId = uuidv4();
69
84
  subscription.kafka = {
70
85
  kafkaTopic: kafkaSafeKey,
@@ -82,8 +97,7 @@ export class InstrumentationSubscriber extends STSOptionsBase {
82
97
  if (key != "" && value != "") {
83
98
  if (topic.localeCompare(key) === 0) {
84
99
  subscription.cb({
85
- topic: SubscriptionTopic.LogProcessing,
86
- key: subscription.key, // Original requested topic (may be kafka un-safe)
100
+ subscriptionKey: subscription.subscriptionKey,// Original requested topic (may be kafka un-safe)
87
101
  data: {
88
102
  kafkaTopic: kafka.kafkaTopic, // Safe kafka topic key with prefix. kafkaTopic, topic and key should be same value
89
103
  kafkaGroupId: kafka.kafkaGroupId,
@@ -91,7 +105,7 @@ export class InstrumentationSubscriber extends STSOptionsBase {
91
105
  topic, // kafkaTopic, topic and key should be same value
92
106
  key, // kafkaTopic, topic and key should be same value
93
107
  value
94
- }
108
+ } as IKafkaData
95
109
  });
96
110
  } else {
97
111
  console.log(`InstrumentationSubscriber:#SubscribeKafka(): Invalid message format from Kafka data, topic: [${topic}] and key: [${key}] do not match`.red);
@@ -105,7 +119,7 @@ export class InstrumentationSubscriber extends STSOptionsBase {
105
119
  });
106
120
  console.log(`InstrumentationSubscriber:#SubscribeKafka(): Subscribe to Kafka topc: [${kafka.kafkaTopic}] Completed`.yellow)
107
121
  } else {
108
- console.log(`InstrumentationSubscriber:#SubscribeKafka(): Could not subscribe to Kafka topc, missing key for topic: [${subscription.topic}]`.magenta);
122
+ console.log(`InstrumentationSubscriber:#SubscribeKafka(): Could not subscribe to Kafka topc, missing combinedKey for topic: [${JSON.stringify(subscription.subscriptionKey)}]`.magenta);
109
123
  }
110
124
  }
111
125
  return kafkaSubscribe();
@@ -113,24 +127,24 @@ export class InstrumentationSubscriber extends STSOptionsBase {
113
127
 
114
128
  async #OutputSubscription(subscription: ISubscription): Promise<ISubscriptionPayload> {
115
129
  // Service subscriptions
116
- const { topic, key, subkey } = subscription;
117
- switch (topic) {
130
+ const { subscriptionKey } = subscription;
131
+ switch (subscriptionKey.topic) {
118
132
  // Services -------------------------------------------------------------------------------------------
119
133
  case SubscriptionTopic.AllServicesCombined :
120
134
  return this.#influxDBManager.serviceManager.GetInfluxDBResultsRootService();
121
135
  case SubscriptionTopic.Services :
122
136
  return this.#influxDBManager.serviceManager.GetInfluxDBResultsService();
123
137
  case SubscriptionTopic.ServiceInstances :
124
- if (key) { // key = service_id
125
- return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstances(key);
138
+ if (subscriptionKey.key) { // key = service_id
139
+ return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstances(subscriptionKey.key);
126
140
  } else {
127
- throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
141
+ throw new Error(`#OutputSubscription: key not provided for subscription: [${subscriptionKey.topic}]`);
128
142
  }
129
143
  case SubscriptionTopic.ServiceInstance :
130
- if (key) { // key = service instance id
131
- return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstance(key);
144
+ if (subscriptionKey.key) { // key = service instance id
145
+ return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstance(subscriptionKey.key);
132
146
  } else {
133
- throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
147
+ throw new Error(`#OutputSubscription: key not provided for subscription: [${subscriptionKey.topic}]`);
134
148
  }
135
149
 
136
150
  // User Agents -------------------------------------------------------------------------------------------
@@ -139,30 +153,30 @@ export class InstrumentationSubscriber extends STSOptionsBase {
139
153
  case SubscriptionTopic.Agents :
140
154
  return this.#influxDBManager.agentManager.GetInfluxDBResultsAgent();
141
155
  case SubscriptionTopic.AgentWorkers :
142
- if (key) { // key = agent instance id
143
- return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThreads(key);
156
+ if (subscriptionKey.key) { // key = agent instance id
157
+ return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThreads(subscriptionKey.key);
144
158
  } else {
145
- throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
159
+ throw new Error(`#OutputSubscription: key not provided for subscription: [${subscriptionKey.topic}]`);
146
160
  }
147
161
  case SubscriptionTopic.AgentWorker :
148
- if (key && subkey) { // key = agent instance id, subkey = agent instance worker id
149
- return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThread(key, subkey);
162
+ if (subscriptionKey.key && subscriptionKey.subkey) { // key = agent instance id, subkey = agent instance worker id
163
+ return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThread(subscriptionKey.key, subscriptionKey.subkey);
150
164
  } else {
151
- throw new Error(`#OutputSubscription: key and/or subkey not provided for subscription: [${topic}]`);
165
+ throw new Error(`#OutputSubscription: key and/or subkey not provided for subscription: [${subscriptionKey.topic}]`);
152
166
  }
153
167
 
154
168
  // Logging (both service and agent) -----------------------------------------------------------------------
155
169
  case SubscriptionTopic.LogProcessing :
156
170
  // Kafka processing will be handled by a dedicated kafka run consumer
157
- return { topic, data: null };
171
+ return { subscriptionKey, data: null };
158
172
  default :
159
- return { topic, data: null };
173
+ return { subscriptionKey, data: null };
160
174
  }
161
175
  }
162
176
 
163
177
  #ExecuteSubscriptions = async () => {
164
178
  const promArray: Promise<ISubscriptionPayload>[] = [ ];
165
- const indexArray: ISubscriptions = [ ];
179
+ const indexArray: ISubscription[] = [ ];
166
180
 
167
181
  for (const [, subscription] of Object.entries(this.#subscriptions)) {
168
182
  promArray.push(this.#OutputSubscription(subscription));
@@ -174,47 +188,61 @@ export class InstrumentationSubscriber extends STSOptionsBase {
174
188
  indexArray[i].cb(retVal[i]);
175
189
  }
176
190
  } catch (error) {
177
- console.log(`${error} -- ${JSON.stringify(retVal)}`.red);
191
+ console.log(`InstrumentationSubscriber:#ExecuteSubscriptions(): Error: [${error}], [${JSON.stringify(retVal)}]`.red);
192
+ }
193
+ }
194
+
195
+ #GetInternalSubscriptionKey(subscriptionKey: ISubscriptionKey): string {
196
+ let internalKey: string = subscriptionKey.topic.toString();
197
+ if (subscriptionKey.key) {
198
+ internalKey += `_${subscriptionKey.key}`;
199
+ if (subscriptionKey.subkey) {
200
+ internalKey += `_${subscriptionKey.subkey}`;
201
+ }
178
202
  }
203
+ return internalKey;
179
204
  }
180
205
 
181
- Subscribe(subscriptions: ISubscriptions) {
206
+ Subscribe(subscriptionKey: ISubscriptionKey, cb: (payload: ISubscriptionPayload) => void) {
182
207
  if (this.#interval) {
183
208
  clearInterval(this.#interval);
184
209
  }
185
- for (let i=0; i < subscriptions.length; i++) {
186
- if (this.#subscriptions[subscriptions[i].topic]) {
187
- // Subscription already exists - ignoring
188
- console.log(`InstrumentationSubscriber.Subscribe(): Subscription already exists - ignoring.`.magenta);
189
- } else {
190
- this.#subscriptions[subscriptions[i].topic] = subscriptions[i];
191
- console.log(`InstrumentationSubscriber.Subscribe(): topicKey: [${subscriptions[i].topic}] successfully subscribed.`.grey);
192
- if (subscriptions[i].topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
193
- this.#SubscribeKafka(subscriptions[i]);
194
- }
210
+ // Create a combined key
211
+ const combinedKey = this.#GetInternalSubscriptionKey(subscriptionKey);
212
+ if (this.#subscriptions[combinedKey]) {
213
+ // Subscription already exists - ignoring
214
+ console.log(`InstrumentationSubscriber.Subscribe(): Subscription already exists: [${combinedKey}] - ignoring.`.magenta);
215
+ } else {
216
+ this.#subscriptions[combinedKey] = {
217
+ combinedKey,
218
+ subscriptionKey,
219
+ cb
195
220
  }
196
- }
197
-
198
- if (!this.#interval) {
199
- // Output subscription immediately and then iterate ...
200
- this.#ExecuteSubscriptions();
201
- let interval = 1000; // default
202
- if (this.options) {
203
- interval = this.options.SubscriptionInterval
221
+ if (subscriptionKey.topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
222
+ this.#SubscribeKafka(this.#subscriptions[combinedKey]);
204
223
  }
205
- this.#interval = setInterval(() => {
224
+ console.log(`InstrumentationSubscriber.Subscribe(): topicKey: [${combinedKey}] successfully subscribed.`.grey);
225
+
226
+ if (!this.#interval) {
227
+ // Output subscription immediately and then iterate ...
206
228
  this.#ExecuteSubscriptions();
207
- }, interval);
229
+ let interval = 1000; // default
230
+ if (this.options) {
231
+ interval = this.options.SubscriptionInterval
232
+ }
233
+ this.#interval = setInterval(() => {
234
+ this.#ExecuteSubscriptions();
235
+ }, interval);
236
+ }
208
237
  }
209
238
  }
210
239
 
211
- UnSubscribe(subscriptions: ISubscriptions) {
212
- for (let i=0; i < subscriptions.length; i++) {
213
- if (subscriptions[i].topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
214
- this.#UnSubscribeKafka(subscriptions[i]);
215
- }
216
- delete this.#subscriptions[subscriptions[i].topic];
240
+ UnSubscribe(subscription: ISubscription) {
241
+ if (subscription.subscriptionKey.topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
242
+ this.#UnSubscribeKafka(subscription);
217
243
  }
244
+ delete this.#subscriptions[subscription.combinedKey];
245
+
218
246
  if (Object.keys(this.#subscriptions).length === 0) {
219
247
  if (this.#interval) {
220
248
  clearInterval(this.#interval);
@@ -224,17 +252,9 @@ export class InstrumentationSubscriber extends STSOptionsBase {
224
252
  }
225
253
 
226
254
  #UnSubscribeAll() {
227
- if (this.#interval) {
228
- clearInterval(this.#interval);
229
- this.#interval = null;
230
- }
231
255
  for (const [, subscription] of Object.entries(this.#subscriptions)) {
232
- if (subscription.topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
233
- this.#UnSubscribeKafka(subscription);
234
- }
256
+ this.UnSubscribe(subscription);
235
257
  }
236
-
237
- this.#subscriptions = { };
238
258
  }
239
259
 
240
260
  async Start() {
package/types/commonTypes.d.ts CHANGED
@@ -183,23 +183,22 @@ export interface IKafkaConsumer {
183
183
  Stop: () => Promise<void>;
184
184
  StartConsumingMessages: (cb: (topic: string, key: string, partition: number, value: string, headers: IHeaders | undefined) => void) => Promise<void>;
185
185
  }
186
- export interface ISubscriptionPayload {
186
+ export interface ISubscriptionKey {
187
187
  topic: SubscriptionTopic;
188
188
  key?: string;
189
189
  subkey?: string;
190
- data: any;
191
190
  }
192
- export interface IKafkaSubscription {
191
+ export interface IKafkaData {
193
192
  kafkaTopic: string;
194
193
  kafkaGroupId: string;
195
- kafkaConsumer: IKafkaConsumer;
194
+ partition: number;
195
+ topic: string;
196
+ key: string;
197
+ value: string;
196
198
  }
197
- export interface ISubscription {
198
- topic: SubscriptionTopic;
199
- key?: string;
200
- subkey?: string;
201
- kafka?: IKafkaSubscription;
202
- cb: (payload: ISubscriptionPayload) => void;
199
+ export type IInfluxData = any;
200
+ export interface ISubscriptionPayload {
201
+ subscriptionKey: ISubscriptionKey;
202
+ data: IKafkaData | IInfluxData | null;
203
203
  }
204
- export type ISubscriptions = ISubscription[];
205
204
  //# sourceMappingURL=commonTypes.d.ts.map
package/types/commonTypes.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}
package/types/influxdb/influxDBManagerAgent.d.ts.map CHANGED
@@ -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,oBAAoB,EAAqB,MAAM,kBAAkB,CAAA;AAItH,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,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAe5D,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAexD,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAehF,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAiBjG,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsC/E"}
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,oBAAoB,EAAqB,MAAM,kBAAkB,CAAA;AAInI,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,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAoB5D,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAoBxD,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAqBhF,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAwBjG,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsC/E"}
package/types/influxdb/influxDBManagerService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.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,oBAAoB,EAAqB,MAAM,kBAAkB,CAAA;AAItH,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAwHK,6BAA6B,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAe9D,yBAAyB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAe1D,kCAAkC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAepF,iCAAiC,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAiB3F,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsD/E"}
1
+ {"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.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,oBAAoB,EAAqB,MAAM,kBAAkB,CAAA;AAItH,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAwHK,6BAA6B,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAoB9D,yBAAyB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAqB1D,kCAAkC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAqBpF,iCAAiC,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAuB3F,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsD/E"}
package/types/instrumentationsubscriber.d.ts CHANGED
@@ -1,14 +1,26 @@
1
- import { ISubscriptions } from './commonTypes';
1
+ import { ISubscriptionPayload, IKafkaConsumer, ISubscriptionKey } from './commonTypes';
2
2
  import { STSOptionsBase } from '@nsshunt/stsutils';
3
+ declare interface IKafkaSubscription {
4
+ kafkaTopic: string;
5
+ kafkaGroupId: string;
6
+ kafkaConsumer: IKafkaConsumer;
7
+ }
8
+ declare interface ISubscription {
9
+ combinedKey: string;
10
+ subscriptionKey: ISubscriptionKey;
11
+ kafka?: IKafkaSubscription;
12
+ cb: (payload: ISubscriptionPayload) => void;
13
+ }
3
14
  export interface IInstrumentationSubscriberOptions {
4
15
  SubscriptionInterval: number;
5
16
  }
6
17
  export declare class InstrumentationSubscriber extends STSOptionsBase {
7
18
  #private;
8
19
  constructor(options: IInstrumentationSubscriberOptions);
9
- Subscribe(subscriptions: ISubscriptions): void;
10
- UnSubscribe(subscriptions: ISubscriptions): void;
20
+ Subscribe(subscriptionKey: ISubscriptionKey, cb: (payload: ISubscriptionPayload) => void): void;
21
+ UnSubscribe(subscription: ISubscription): void;
11
22
  Start(): Promise<void>;
12
23
  Stop(): Promise<void>;
13
24
  }
25
+ export {};
14
26
  //# sourceMappingURL=instrumentationsubscriber.d.ts.map
package/types/instrumentationsubscriber.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentationsubscriber.d.ts","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0D,MAAM,eAAe,CAAA;AAOtG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,WAAW,iCAAiC;IAC9C,oBAAoB,EAAE,MAAM,CAAA;CAC/B;AAED,qBAAa,yBAA0B,SAAQ,cAAc;;gBAO7C,OAAO,EAAE,iCAAiC;IA+JtD,SAAS,CAAC,aAAa,EAAE,cAAc;IA8BvC,WAAW,CAAC,aAAa,EAAE,cAAc;IA6BnC,KAAK;IAIL,IAAI;CAIb"}
1
+ {"version":3,"file":"instrumentationsubscriber.d.ts","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAiC,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAOrH,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,WAAW,kBAAkB;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,cAAc,CAAA;CAChC;AAED,OAAO,WAAW,aAAa;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,gBAAgB,CAAA;IACjC,KAAK,CAAC,EAAE,kBAAkB,CAAA;IAC1B,EAAE,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;CAC9C;AAID,MAAM,WAAW,iCAAiC;IAC9C,oBAAoB,EAAE,MAAM,CAAA;CAC/B;AAED,qBAAa,yBAA0B,SAAQ,cAAc;;gBAO7C,OAAO,EAAE,iCAAiC;IAyKtD,SAAS,CAAC,eAAe,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI;IAkCxF,WAAW,CAAC,YAAY,EAAE,aAAa;IAoBjC,KAAK;IAIL,IAAI;CAIb"}