@codefresh-io/cf-telemetry 2.0.0-alpha.3 → 2.0.0-alpha.31

package/README.md

@@ -4,20 +4,28 @@ Base utils for monitoring.
 
 Includes:
 
-* [Logger](./src/logger/README.md).
+* [Logs](./src/logs/README.md).
+* [MongoDB](./src/metrics/mongodb/README.md) client monitoring.
+* [OpenTelemetry](./src/otel/README.md) auto instrumentation.
 * [Prometheus](./src/metrics/prometheus/README.md) server and custom metrics.
-* [MongoDB](./src//metrics/mongodb/README.md) client monitoring.
 * [Pyroscope](./src/profiles/README.md) to profile CPU and memory.
 
 ## Usage
 
-Call `init()` function at the very bootstrap of the app.
+Add `import '@codefresh-io/cf-telemetry/init'` statement at the very beginning of the application lifecycle.
 
 Please refer to the separate docs above for further configuration and usage details.
 
 ```TS
 // index.ts
-import { init } from '@codefresh-io/cf-telemetry';
-
-await init();
+// ↓ Should be imported first
+import '@codefresh-io/cf-telemetry/init'
+// ↓ Keep one blank line below to prevent automatic import reordering
 ```
+
+## Environment variables
+
+| Variable               | Required | Default value                                                     | Description                                 |
+|------------------------| -------- |-------------------------------------------------------------------|---------------------------------------------|
+| `CF_TELEMETRY_SERVICE_NAME` | optional | `unknown_service:node` | Sets service name for OpenTelemetry and Pyroscope. |
+| `CF_TELEMETRY_SERVICE_VERSION` | optional | `unknown` | Sets service version for OpenTelemetry and Pyroscope. |

package/dist/global-config.d.ts

@@ -0,0 +1,4 @@
+export declare const globalConfig: {
+    readonly serviceName: string;
+    readonly serviceVersion: string;
+};

package/dist/global-config.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.globalConfig = void 0;
+/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+exports.globalConfig = {
+    serviceName: process.env['CF_SERVICE_NAME'] || 'unknown_service:node',
+    serviceVersion: process.env['CF_SERVICE_VERSION'] || 'unknown',
+};
+//# sourceMappingURL=global-config.js.map

package/dist/global-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"global-config.js","sourceRoot":"","sources":["../src/global-config.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACpD,QAAA,YAAY,GAAG;IAC1B,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,sBAAsB;IACrE,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,SAAS;CACtD,CAAC"}

package/dist/init.d.mts

@@ -0,0 +1 @@
+import './init.js';

package/dist/{index.js → init.js}

@@ -33,19 +33,41 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.otel = exports.logs = exports.mongodb = exports.prometheus = exports.init = void 0;
-const config_1 = require("./config");
-const _logger = __importStar(require("./logger"));
-const _mongodb = __importStar(require("./metrics/mongodb"));
-const _prometheus = __importStar(require("./metrics/prometheus"));
-const _otel = __importStar(require("./otel"));
-const _profiles = __importStar(require("./profiles"));
+// ↓ Should be imported first
+const otel = __importStar(require("./otel"));
+// ↑ Should be imported first
+const global_config_1 = require("./global-config");
+const logs = __importStar(require("./logs"));
+const prometheus = __importStar(require("./metrics/prometheus"));
+const profiles = __importStar(require("./profiles"));
 let isInitialized = false;
+/**
+ * Initializes telemetry services.
+ * Should be called once as early as possible in the application lifecycle.
+ */
+const init = () => {
+    if (isInitialized)
+        return;
+    try {
+        const logger = new logs.Logger('telemetry');
+        logger.info('Initializing telemetry services');
+        logger.debug('Telemetry configuration', global_config_1.globalConfig);
+        otel.init(logger);
+        profiles.init(logger);
+        prometheus.init(logger).catch(logger.error);
+        isInitialized = true;
+        logger.info('Telemetry services initialized');
+    }
+    catch (error) {
+        console.error('Failed to initialize telemetry services', error);
+    }
+};
 const terminate = async () => {
-    const logger = new _logger.Logger('telemetry');
+    const logger = new logs.Logger('telemetry');
     try {
         logger.info('Terminating telemetry services');
-        await _otel.terminate(logger).catch(logger.error);
+        await otel.terminate(logger).catch(logger.error);
+        await profiles.terminate(logger).catch(logger.error);
         isInitialized = false;
         logger.info('Telemetry services terminated');
     }
@@ -53,33 +75,8 @@ const terminate = async () => {
         logger.error('Failed to terminate telemetry services', exception);
     }
 };
-const init = async () => {
-    if (isInitialized)
-        return;
-    const logger = new _logger.Logger('telemetry');
-    logger.info('Initializing telemetry services');
-    await _otel.init(logger).catch(logger.error); // Should initialize first
-    await Promise.all([
-        _prometheus.init(logger).catch(logger.error),
-        _profiles.init(logger).catch(logger.error),
-    ]);
-    config_1.config.terminateSignals.forEach(signal => process.on(signal, terminate));
-    isInitialized = true;
-    logger.info('Telemetry services initialized');
-};
-exports.init = init;
-exports.prometheus = {
-    register: _prometheus.register,
-    metrics: _prometheus.metrics,
-};
-exports.mongodb = {
-    monitorMongoDBClient: _mongodb.monitorMongoDBClient,
-};
-exports.logs = {
-    Logger: _logger.Logger,
-    runInContext: _logger.runInContext,
-};
-exports.otel = {
-    api: _otel.api,
-};
-//# sourceMappingURL=index.js.map
+init();
+process.on('SIGINT', terminate);
+process.on('SIGTERM', terminate);
+process.once('beforeExit', terminate);
+//# sourceMappingURL=init.js.map

package/dist/init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAC7B,6CAA+B;AAC/B,6BAA6B;AAE7B,mDAA+C;AAC/C,6CAA+B;AAC/B,iEAAmD;AACnD,qDAAuC;AAEvC,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B;;;GAGG;AACH,MAAM,IAAI,GAAG,GAAS,EAAE;IACtB,IAAI,aAAa;QAAE,OAAO;IAE1B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,4BAAY,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5C,aAAa,GAAG,IAAI,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,IAAmB,EAAE;IAC1C,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,aAAa,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;AACH,CAAC,CAAC;AAEF,IAAI,EAAE,CAAC;AAEP,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAChC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACjC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC"}

package/dist/init.mjs

@@ -0,0 +1,2 @@
+import './init.js';
+//# sourceMappingURL=init.mjs.map

package/dist/init.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.mjs","sourceRoot":"","sources":["../src/init.mts"],"names":[],"mappings":"AAAA,OAAO,WAAW,CAAC"}

package/dist/logs/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/logs/config.ts"],"names":[],"mappings":";;;AAAA,mCAA6C;AAE7C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,MAAM,CAAC;AACvE,8DAA8D;AAC9D,MAAM,YAAY,GAAG,aAAK,CAAC,QAAQ,CAAC,aAAoB,CAAC,CAAC;AAC1D,IAAI,CAAC,YAAY;IAAE,OAAO,CAAC,IAAI,CAAC,sBAAsB,aAAa,yBAAyB,CAAC,CAAC;AAEjF,QAAA,MAAM,GAAG;IACpB,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,aAAsB,CAAC,CAAC,CAAC,MAAM;IACrD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,KAAK,MAAM;IACpE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,KAAK,MAAM;IACtD,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAqC;CAC/D,CAAC"}

package/dist/logs/express/http-logger-middleware.d.ts

@@ -0,0 +1,10 @@
+import type { RequestHandler } from 'express';
+import type { Level, Logger } from '../types';
+/**
+ * Factory function to create an HTTP logger middleware for Express.
+ * This middleware logs incoming HTTP requests and their completion status.
+ * @param logger Logger instance.
+ * @param level Log level for HTTP requests logging. Default is "info".
+ * @returns Express middleware function.
+ */
+export declare const httpLoggerMiddlewareFactory: (logger: Logger, level?: Level) => RequestHandler;

package/dist/logs/express/http-logger-middleware.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpLoggerMiddlewareFactory = void 0;
+/**
+ * Factory function to create an HTTP logger middleware for Express.
+ * This middleware logs incoming HTTP requests and their completion status.
+ * @param logger Logger instance.
+ * @param level Log level for HTTP requests logging. Default is "info".
+ * @returns Express middleware function.
+ */
+const httpLoggerMiddlewareFactory = (logger, level = 'info') => {
+    return function httpLoggerMiddleware({ method, path, ip }, response, next) {
+        logger[level]('Incoming HTTP request', {
+            method,
+            path,
+            ip,
+        });
+        response.on('close', () => {
+            logger[level]('HTTP request completed', {
+                method,
+                path,
+                ip,
+                status: response.statusCode,
+            });
+        });
+        next();
+    };
+};
+exports.httpLoggerMiddlewareFactory = httpLoggerMiddlewareFactory;
+//# sourceMappingURL=http-logger-middleware.js.map

package/dist/logs/express/http-logger-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-logger-middleware.js","sourceRoot":"","sources":["../../../src/logs/express/http-logger-middleware.ts"],"names":[],"mappings":";;;AAGA;;;;;;GAMG;AACI,MAAM,2BAA2B,GAAG,CAAC,MAAc,EAAE,QAAe,MAAM,EAAkB,EAAE;IACnG,OAAO,SAAS,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI;QACvE,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,EAAE;YACrC,MAAM;YACN,IAAI;YACJ,EAAE;SACH,CAAC,CAAC;QACH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,CAAC,wBAAwB,EAAE;gBACtC,MAAM;gBACN,IAAI;gBACJ,EAAE;gBACF,MAAM,EAAE,QAAQ,CAAC,UAAU;aAC5B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,2BAA2B,+BAiBtC"}

package/dist/logs/express/index.d.ts

@@ -0,0 +1 @@
+export { httpLoggerMiddlewareFactory } from './http-logger-middleware';

package/dist/logs/express/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpLoggerMiddlewareFactory = void 0;
+var http_logger_middleware_1 = require("./http-logger-middleware");
+Object.defineProperty(exports, "httpLoggerMiddlewareFactory", { enumerable: true, get: function () { return http_logger_middleware_1.httpLoggerMiddlewareFactory; } });
+//# sourceMappingURL=index.js.map

package/dist/logs/express/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logs/express/index.ts"],"names":[],"mappings":";;;AAAA,mEAAuE;AAA9D,qIAAA,2BAA2B,OAAA"}

package/dist/logs/express/public.d.mts

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

package/dist/logs/express/public.d.ts

@@ -0,0 +1 @@
+export { httpLoggerMiddlewareFactory, } from './index';

package/dist/logs/express/public.js

@@ -0,0 +1,7 @@
+"use strict";
+// Public API (CommonJS)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpLoggerMiddlewareFactory = void 0;
+var index_1 = require("./index");
+Object.defineProperty(exports, "httpLoggerMiddlewareFactory", { enumerable: true, get: function () { return index_1.httpLoggerMiddlewareFactory; } });
+//# sourceMappingURL=public.js.map

package/dist/logs/express/public.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/logs/express/public.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;AAExB,iCAEiB;AADf,oHAAA,2BAA2B,OAAA"}

package/dist/logs/express/public.mjs

@@ -0,0 +1,3 @@
+// Public API (ESM)
+export * from './public.js';
+//# sourceMappingURL=public.mjs.map

package/dist/logs/express/public.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.mjs","sourceRoot":"","sources":["../../../src/logs/express/public.mts"],"names":[],"mappings":"AAAA,mBAAmB;AAEnB,cAAc,aAAa,CAAC"}

package/dist/logs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logs/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,mDAAgD;AAAvC,8GAAA,YAAY,OAAA"}

package/dist/{logger → logs}/logger.js

@@ -19,6 +19,19 @@ class Logger {
             formatters: {
                 level: label => ({ level: label }),
             },
+            serializers: {
+                data: (data) => {
+                    if (typeof data === 'object' && data !== null) {
+                        if ('err' in data && data.err instanceof Error) {
+                            data.err = pino_1.default.stdSerializers.err(data.err);
+                        }
+                        else if ('error' in data && data.error instanceof Error) {
+                            data.error = pino_1.default.stdSerializers.err(data.error);
+                        }
+                    }
+                    return data;
+                },
+            },
             ...config_1.config.shouldPrettify && {
                 transport: {
                     target: 'pino-pretty',

package/dist/logs/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logs/logger.ts"],"names":[],"mappings":"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"}

package/dist/logs/metadata-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata-storage.js","sourceRoot":"","sources":["../../src/logs/metadata-storage.ts"],"names":[],"mappings":";;;AAAA,uDAAqD;AAGxC,QAAA,eAAe,GAAG,IAAI,oCAAiB,EAAe,CAAC"}

package/dist/logs/nest/index.d.ts

@@ -0,0 +1,2 @@
+export { Logger, } from './logger';
+export { LoggerModule, } from './logger-module';

package/dist/logs/nest/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerModule = exports.Logger = void 0;
+var logger_1 = require("./logger");
+Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
+var logger_module_1 = require("./logger-module");
+Object.defineProperty(exports, "LoggerModule", { enumerable: true, get: function () { return logger_module_1.LoggerModule; } });
+//# sourceMappingURL=index.js.map

package/dist/logs/nest/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logs/nest/index.ts"],"names":[],"mappings":";;;AAAA,mCAEkB;AADhB,gGAAA,MAAM,OAAA;AAER,iDAEyB;AADvB,6GAAA,YAAY,OAAA"}

package/dist/logs/nest/logger-module.d.ts

@@ -0,0 +1,4 @@
+import { MiddlewareConsumer, NestModule } from '@nestjs/common';
+export declare class LoggerModule implements NestModule {
+    configure(consumer: MiddlewareConsumer): void;
+}

package/dist/logs/nest/logger-module.js

@@ -0,0 +1,69 @@
+"use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerModule = void 0;
+const common_1 = require("@nestjs/common");
+const express_1 = require("../express");
+const logger_1 = require("./logger");
+// TODO: add options to configure the logger
+let LoggerModule = (() => {
+    let _classDecorators = [(0, common_1.Global)(), (0, common_1.Module)({
+            providers: [logger_1.Logger],
+            exports: [logger_1.Logger],
+        })];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var LoggerModule = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            LoggerModule = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        configure(consumer) {
+            const middleware = (0, express_1.httpLoggerMiddlewareFactory)(new logger_1.Logger('http'), 'info');
+            consumer
+                .apply(middleware)
+                .forRoutes({ path: '*', method: common_1.RequestMethod.ALL });
+        }
+    };
+    return LoggerModule = _classThis;
+})();
+exports.LoggerModule = LoggerModule;
+//# sourceMappingURL=logger-module.js.map

package/dist/logs/nest/logger-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger-module.js","sourceRoot":"","sources":["../../../src/logs/nest/logger-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+F;AAC/F,wCAAyD;AACzD,qCAAkC;AAElC,4CAA4C;IAW/B,YAAY;4BATxB,IAAA,eAAM,GAAE,EACR,IAAA,eAAM,EAAC;YACN,SAAS,EAAE,CAAC,eAAM,CAAC;YACnB,OAAO,EAAE,CAAC,eAAM,CAAC;SAClB,CAAC;;;;;;;;YAKF,6KAOC;;;YAPY,uDAAY;;QACvB,SAAS,CAAC,QAA4B;YACpC,MAAM,UAAU,GAAG,IAAA,qCAA2B,EAAC,IAAI,eAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YAC3E,QAAQ;iBACL,KAAK,CAAC,UAAU,CAAC;iBACjB,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;;;;AANU,oCAAY"}

package/dist/logs/nest/logger.d.ts

@@ -0,0 +1,4 @@
+import { Logger as BaseLogger } from '../logger';
+export declare class Logger extends BaseLogger {
+    constructor(...params: ConstructorParameters<typeof BaseLogger>);
+}

package/dist/logs/nest/logger.js

@@ -0,0 +1,69 @@
+"use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../logger");
+let Logger = (() => {
+    let _classDecorators = [(0, common_1.Injectable)({ scope: common_1.Scope.TRANSIENT })];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = logger_1.Logger;
+    var Logger = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            Logger = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        constructor(...params) {
+            let options = params?.at(0);
+            if (typeof options === 'string') {
+                options = { scope: options, useLastArgAsScope: true };
+            }
+            else {
+                options = { ...options, useLastArgAsScope: true };
+            }
+            super(options);
+        }
+    };
+    return Logger = _classThis;
+})();
+exports.Logger = Logger;
+//# sourceMappingURL=logger.js.map

package/dist/logs/nest/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/logs/nest/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAmD;AACnD,sCAAiD;IAGpC,MAAM;4BADlB,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,cAAK,CAAC,SAAS,EAAE,CAAC;;;;sBACX,eAAU;sBAAlB,SAAQ,WAAU;;;;YAAtC,6KAUC;;;YAVY,uDAAM;;QACjB,YAAY,GAAG,MAAgD;YAC7D,IAAI,OAAO,GAAG,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,OAAO,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;YACpD,CAAC;YACD,KAAK,CAAC,OAAO,CAAC,CAAC;QACjB,CAAC;;;;AATU,wBAAM"}

package/dist/logs/nest/public.d.mts

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

package/dist/logs/nest/public.d.ts

@@ -0,0 +1 @@
+export { Logger, LoggerModule, } from './index';

package/dist/logs/nest/public.js

@@ -0,0 +1,8 @@
+"use strict";
+// Public API (CommonJS)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerModule = exports.Logger = void 0;
+var index_1 = require("./index");
+Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return index_1.Logger; } });
+Object.defineProperty(exports, "LoggerModule", { enumerable: true, get: function () { return index_1.LoggerModule; } });
+//# sourceMappingURL=public.js.map

package/dist/logs/nest/public.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/logs/nest/public.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;AAExB,iCAGiB;AAFf,+FAAA,MAAM,OAAA;AACN,qGAAA,YAAY,OAAA"}

package/dist/logs/nest/public.mjs

@@ -0,0 +1,3 @@
+// Public API (ESM)
+export * from './public.js';
+//# sourceMappingURL=public.mjs.map

package/dist/logs/nest/public.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.mjs","sourceRoot":"","sources":["../../../src/logs/nest/public.mts"],"names":[],"mappings":"AAAA,mBAAmB;AAEnB,cAAc,aAAa,CAAC"}

package/dist/logs/public.d.mts

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

package/dist/logs/public.d.ts

@@ -0,0 +1 @@
+export { Logger, runInContext, } from './index';

package/dist/logs/public.js

@@ -0,0 +1,8 @@
+"use strict";
+// Public API (CommonJS)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runInContext = exports.Logger = void 0;
+var index_1 = require("./index");
+Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return index_1.Logger; } });
+Object.defineProperty(exports, "runInContext", { enumerable: true, get: function () { return index_1.runInContext; } });
+//# sourceMappingURL=public.js.map

package/dist/logs/public.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/logs/public.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;AAExB,iCAGiB;AAFf,+FAAA,MAAM,OAAA;AACN,qGAAA,YAAY,OAAA"}

package/dist/logs/public.mjs

@@ -0,0 +1,3 @@
+// Public API (ESM)
+export * from './public.js';
+//# sourceMappingURL=public.mjs.map

package/dist/logs/public.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.mjs","sourceRoot":"","sources":["../../src/logs/public.mts"],"names":[],"mappings":"AAAA,mBAAmB;AAEnB,cAAc,aAAa,CAAC"}

package/dist/{logger → logs}/run-in-context.d.ts

@@ -6,4 +6,4 @@ import type { LogMetadata } from './types';
  *
  * Nested calls of `runInContext` will merge metadata except for `initiator` key which can be provided only once.
  */
-export declare const runInContext: <R, TArgs extends unknown[]>({ initiator, target, account_id }: LogMetadata, callback: (...args: TArgs) => R, ...args: TArgs) => R;
+export declare const runInContext: <R, TArgs extends unknown[]>({ initiator, target, context }: LogMetadata, callback: (...args: TArgs) => R, ...args: TArgs) => R;

package/dist/{logger → logs}/run-in-context.js

@@ -9,12 +9,12 @@ const metadata_storage_1 = require("./metadata-storage");
  *
  * Nested calls of `runInContext` will merge metadata except for `initiator` key which can be provided only once.
  */
-const runInContext = ({ initiator, target, account_id }, callback, ...args) => {
+const runInContext = ({ initiator, target, context }, callback, ...args) => {
     return metadata_storage_1.metadataStorage.run({
-        ...initiator && { initiator },
+        ...initiator && { initiator }, // initiator can be provided only once, so it should not be merged
         ...metadata_storage_1.metadataStorage.getStore(),
         ...target && { target },
-        ...account_id && { account_id },
+        ...context && { context },
     }, callback, ...args);
 };
 exports.runInContext = runInContext;

package/dist/logs/run-in-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-in-context.js","sourceRoot":"","sources":["../../src/logs/run-in-context.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AAGrD;;;;;;GAMG;AACI,MAAM,YAAY,GAAG,CAC1B,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAe,EAC3C,QAA+B,EAC/B,GAAG,IAAW,EACX,EAAE;IACL,OAAO,kCAAe,CAAC,GAAG,CACxB;QACE,GAAG,SAAS,IAAI,EAAE,SAAS,EAAE,EAAE,kEAAkE;QACjG,GAAG,kCAAe,CAAC,QAAQ,EAAE;QAC7B,GAAG,MAAM,IAAI,EAAE,MAAM,EAAE;QACvB,GAAG,OAAO,IAAI,EAAE,OAAO,EAAE;KAC1B,EACD,QAAQ,EACR,GAAG,IAAI,CACR,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,YAAY,gBAevB"}

package/dist/{logger → logs}/types.d.ts

@@ -50,11 +50,11 @@ export interface LogMetadata {
         id?: string;
     };
     /**
-     * Codefresh business entity affected by the action. E.g. v1_build, v2_runtime, etc.
+     * Codefresh business entity affected by the action. E.g. classic_build, gitops_runtime, etc.
      */
     target?: {
         /**
-         * Type of the target. E.g. v1_build, v2_runtime, etc.
+         * Type of the target. E.g. classic_build, gitops_runtime, etc.
          */
         type: string;
         /**
@@ -63,9 +63,14 @@ export interface LogMetadata {
         id?: string;
     };
     /**
-     * Codefresh Account ID affected by the action.
+     * Additional context for the action.
      */
-    account_id?: string;
+    context?: {
+        /**
+         * Codefresh Account ID affected by the action.
+         */
+        account_id?: string;
+    };
 }
 export interface LogBody {
     msg?: LogMessage;

package/dist/logs/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/logs/types.ts"],"names":[],"mappings":";;;AAEa,QAAA,KAAK,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAqBhE,CAAC;AAQD,CAAC;AAWD,CAAC;AAsCD,CAAC"}

package/dist/metrics/mongodb/monitor-mongodb-client.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.monitorMongoDBClient = void 0;
 const mongodb_driver_prometheus_exporter_1 = require("@christiangalsterer/mongodb-driver-prometheus-exporter");
-const logger_1 = require("../../logger");
+const logs_1 = require("../../logs");
 const prometheus_1 = require("../prometheus");
 const WarningCauses = {
     AlreadyMonitored: 'client_already_monitored',
@@ -27,7 +27,7 @@ const monitoredClientsByPool = new Map();
  * @param [connectionPool] Unique per application connection pool name, default is `"main"`. Required if you have multiple clients to monitor.
  */
 const monitorMongoDBClient = (client, connectionPool = 'main') => {
-    const logger = new logger_1.Logger('monitoring:mongodb');
+    const logger = new logs_1.Logger('monitoring:mongodb');
     logger.info(`Initializing MongoDB monitoring for connection pool: ${connectionPool}`);
     if (monitoredClients.has(client)) {
         instrumentationWarnings.inc({ cause: WarningCauses.AlreadyMonitored, connection_pool: connectionPool });