@lucaapp/service-utils 1.2.3 → 1.3.0

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './lib/kafka';
 export * from './lib/serviceIdentity';
+export * from './lib/metrics';

package/dist/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/kafka"), exports);
 __exportStar(require("./lib/serviceIdentity"), exports);
+__exportStar(require("./lib/metrics"), exports);

package/dist/lib/kafka/kafkaClient.js

@@ -30,7 +30,24 @@ const util_1 = require("util");
 const serviceIdentity_1 = require("../serviceIdentity");
 const events_1 = require("./events");
 const utils_1 = require("../../utils/utils");
+const metrics_1 = require("../metrics");
 const KEY_ALG = 'ES256';
+const messageProducedSizeCounter = new metrics_1.metricsClient.Histogram({
+    name: 'kafka_message_produce_size_bytes',
+    help: 'Size of messages produced',
+    labelNames: ['topic'],
+    buckets: [64, 128, 256, 512, 1024, 2048, 4096, 8182],
+});
+const messageConsumedCounter = new metrics_1.metricsClient.Counter({
+    name: 'kafka_message_consume_count',
+    help: 'Total number of messages consumed',
+    labelNames: ['topic', 'groupId'],
+});
+const messageAcknowledgedCounter = new metrics_1.metricsClient.Counter({
+    name: 'kafka_message_consume_ack_count',
+    help: 'Total number of messages acknowledged',
+    labelNames: ['topic', 'groupId'],
+});
 const getIssuer = (kafkaTopic) => {
     return events_1.MessageIssuer[kafkaTopic].valueOf();
 };
@@ -46,7 +63,7 @@ class KafkaClient {
             }
         };
         this.getTopic = async (kafkaTopic) => {
-            const topic = `${this.environment}_${this.serviceIdentity.identityName}_${kafkaTopic}`;
+            const topic = `${this.environment}_${getIssuer(kafkaTopic)}_${kafkaTopic}`;
             await this.ensureTopics(topic);
             return topic;
         };
@@ -136,9 +153,15 @@ class KafkaClient {
                 await consumer.run({
                     autoCommit: true,
                     eachMessage: async ({ message }) => {
+                        messageConsumedCounter
+                            .labels({ topic: kafkaTopic.valueOf(), groupId })
+                            .inc();
                         const decryptedValue = await this.decryptValue(kafkaTopic, message.value);
                         await this.verifySignature(kafkaTopic, decryptedValue, message.headers);
                         const value = this.parseValue(decryptedValue);
+                        messageAcknowledgedCounter
+                            .labels({ topic: kafkaTopic.valueOf(), groupId })
+                            .inc();
                         this.logger.debug({ key: message.key, value, timestamp: message.timestamp }, 'Record received');
                         await handler({ ...message, value });
                     },
@@ -167,6 +190,9 @@ class KafkaClient {
                 };
                 await this.producer.send(producerRecord);
                 this.logger.debug(producerRecord, 'Record sent');
+                messageProducedSizeCounter
+                    .labels({ topic })
+                    .observe(Buffer.byteLength(encryptedValue));
             }
             catch (error) {
                 throw (0, utils_1.logAndGetError)(this.logger, `Could not create producer for topic=${topic}`, error);

package/dist/lib/metrics/index.d.ts

@@ -0,0 +1 @@
+export * from './metricsClient';

package/dist/lib/metrics/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./metricsClient"), exports);

package/dist/lib/metrics/metricsClient.d.ts

@@ -0,0 +1 @@
+export * as metricsClient from 'prom-client';

package/dist/lib/metrics/metricsClient.js

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.metricsClient = void 0;
+exports.metricsClient = __importStar(require("prom-client"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -34,11 +34,12 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@types/express": "4.17.13",
     "@hapi/boom": "^10.0.0",
+    "@types/express": "4.17.13",
     "axios": "^0.27.2",
     "jose": "4.9.2",
     "kafkajs": "2.1.0",
-    "moment": "^2.29.4"
+    "moment": "^2.29.4",
+    "prom-client": "14.1.0"
   }
 }