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

package/dist/global-config.d.ts

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

package/dist/global-config.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.globalConfig = void 0;
+exports.globalConfig = {
+    serviceName: process.env['CF_TELEMETRY_SERVICE_NAME'],
+    serviceVersion: process.env['CF_TELEMETRY_SERVICE_VERSION'],
+};
+//# 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,QAAA,YAAY,GAAG;IAC1B,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;IACrD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;CACnD,CAAC"}

package/dist/index.d.ts

@@ -1,7 +1,8 @@
+import * as _otel from './otel';
 import * as _logger from './logger';
 import * as _prometheus from './metrics/prometheus';
-import * as _otel from './otel';
 export declare const init: () => Promise<void>;
+export declare const terminate: () => Promise<void>;
 export declare const prometheus: {
     register: _prometheus.client.Registry<"text/plain; version=0.0.4; charset=utf-8">;
     metrics: typeof _prometheus.metrics;

package/dist/index.js

@@ -33,41 +33,42 @@ 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");
+exports.otel = exports.logs = exports.mongodb = exports.prometheus = exports.terminate = exports.init = void 0;
+// ↓ Should be imported first
+const _otel = __importStar(require("./otel"));
+// ↑ Should be imported first
 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"));
 let isInitialized = false;
-const terminate = async () => {
-    const logger = new _logger.Logger('telemetry');
-    try {
-        logger.info('Terminating telemetry services');
-        await _otel.terminate(logger).catch(logger.error);
-        isInitialized = false;
-        logger.info('Telemetry services terminated');
-    }
-    catch (exception) {
-        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 _otel.init(logger).catch(logger.error);
     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;
+const terminate = async () => {
+    const logger = new _logger.Logger('telemetry');
+    try {
+        logger.info('Terminating telemetry services');
+        await _otel.terminate(logger).catch(logger.error);
+        isInitialized = false;
+        logger.info('Telemetry services terminated');
+    }
+    catch (exception) {
+        logger.error('Failed to terminate telemetry services', exception);
+    }
+};
+exports.terminate = terminate;
 exports.prometheus = {
     register: _prometheus.register,
     metrics: _prometheus.metrics,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkC;AAClC,kDAAoC;AACpC,4DAA8C;AAC9C,kEAAoD;AACpD,8CAAgC;AAChC,sDAAwC;AAExC,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B,MAAM,SAAS,GAAG,KAAK,IAAmB,EAAE;IAC1C,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClD,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;AAEK,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;IAC5C,IAAI,aAAa;QAAE,OAAO;IAE1B,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC/C,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B;IACxE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QAC5C,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;KAC3C,CAAC,CAAC;IACH,eAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACzE,aAAa,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC,CAAC;AAbW,QAAA,IAAI,QAaf;AAEW,QAAA,UAAU,GAAG;IACxB,QAAQ,EAAE,WAAW,CAAC,QAAQ;IAC9B,OAAO,EAAE,WAAW,CAAC,OAAO;CAC7B,CAAC;AAEW,QAAA,OAAO,GAAG;IACrB,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;CACpD,CAAC;AAEW,QAAA,IAAI,GAAG;IAClB,MAAM,EAAE,OAAO,CAAC,MAAM;IACtB,YAAY,EAAE,OAAO,CAAC,YAAY;CACnC,CAAC;AAEW,QAAA,IAAI,GAAG;IAClB,GAAG,EAAE,KAAK,CAAC,GAAG;CACf,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAC7B,8CAAgC;AAChC,6BAA6B;AAE7B,kDAAoC;AACpC,4DAA8C;AAC9C,kEAAoD;AACpD,sDAAwC;AAExC,IAAI,aAAa,GAAG,KAAK,CAAC;AAEnB,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;IAC5C,IAAI,aAAa;QAAE,OAAO;IAE1B,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC/C,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QAC5C,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;KAC3C,CAAC,CAAC;IACH,aAAa,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC,CAAC;AAZW,QAAA,IAAI,QAYf;AAEK,MAAM,SAAS,GAAG,KAAK,IAAmB,EAAE;IACjD,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClD,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;AAVW,QAAA,SAAS,aAUpB;AAEW,QAAA,UAAU,GAAG;IACxB,QAAQ,EAAE,WAAW,CAAC,QAAQ;IAC9B,OAAO,EAAE,WAAW,CAAC,OAAO;CAC7B,CAAC;AAEW,QAAA,OAAO,GAAG;IACrB,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;CACpD,CAAC;AAEW,QAAA,IAAI,GAAG;IAClB,MAAM,EAAE,OAAO,CAAC,MAAM;IACtB,YAAY,EAAE,OAAO,CAAC,YAAY;CACnC,CAAC;AAEW,QAAA,IAAI,GAAG;IAClB,GAAG,EAAE,KAAK,CAAC,GAAG;CACf,CAAC"}

package/dist/{import.mjs → init.mjs}

@@ -1,6 +1,6 @@
 "use strict";
-import { init } from './index';
+import { init } from './index.js';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 await init();
-//# sourceMappingURL=import.mjs.map
+//# 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,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,6DAA6D;AAC7D,aAAa;AACb,MAAM,IAAI,EAAE,CAAC"}

package/dist/otel/config.d.ts

@@ -1,4 +1,3 @@
 export declare const config: {
     readonly enabled: boolean;
-    readonly serviceName: string | undefined;
 };

package/dist/otel/config.js

@@ -3,6 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 exports.config = {
     enabled: process.env['CF_TELEMETRY_OTEL_ENABLE'] === 'true',
-    serviceName: process.env['CF_TELEMETRY_SERVICE_NAME'],
 };
 //# sourceMappingURL=config.js.map

package/dist/otel/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/otel/config.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,KAAK,MAAM;IAC3D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;CAC7C,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/otel/config.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,KAAK,MAAM;CACnD,CAAC"}

package/dist/otel/sdk.js

@@ -8,11 +8,17 @@ const core_1 = require("@opentelemetry/core");
 const exporter_prometheus_1 = require("@opentelemetry/exporter-prometheus");
 const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
 const propagator_b3_1 = require("@opentelemetry/propagator-b3");
+const resources_1 = require("@opentelemetry/resources");
 const sdk_node_1 = require("@opentelemetry/sdk-node");
 const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
-const config_1 = require("./config");
+const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const global_config_1 = require("../global-config");
 exports.sdk = new sdk_node_1.NodeSDK({
-    serviceName: config_1.config.serviceName,
+    serviceName: global_config_1.globalConfig.serviceName,
+    resource: new resources_1.Resource({
+        [semantic_conventions_1.ATTR_SERVICE_NAME]: global_config_1.globalConfig.serviceName,
+        [semantic_conventions_1.ATTR_SERVICE_VERSION]: global_config_1.globalConfig.serviceVersion,
+    }),
     metricReader: new exporter_prometheus_1.PrometheusExporter(),
     spanProcessors: [
         new sdk_trace_base_1.BatchSpanProcessor(new exporter_trace_otlp_grpc_1.OTLPTraceExporter()),

package/dist/otel/sdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/otel/sdk.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,kFAAqG;AACrG,4EAAqF;AACrF,8CAA2G;AAC3G,4EAAwE;AACxE,sFAA4E;AAC5E,gEAA8E;AAC9E,sDAAkD;AAClD,kEAAmE;AACnE,qCAAkC;AAErB,QAAA,GAAG,GAAG,IAAI,kBAAO,CAAC;IAC7B,WAAW,EAAE,eAAM,CAAC,WAAW;IAC/B,YAAY,EAAE,IAAI,wCAAkB,EAAE;IACtC,cAAc,EAAE;QACd,IAAI,mCAAkB,CAAC,IAAI,4CAAiB,EAAE,CAAC;QAC/C,wDAAwD;QACxD,IAAI,6CAAoB,CAAC,+CAAsB,CAAC;KACjD;IACD,cAAc,EAAE,IAAI,qDAA+B,EAAE;IACrD,iBAAiB,EAAE,IAAI,0BAAmB,CAAC;QACzC,WAAW,EAAE;YACX,IAAI,gCAAyB,EAAE;YAC/B,IAAI,2BAAoB,EAAE;YAC1B,IAAI,4BAAY,EAAE;YAClB,IAAI,4BAAY,CAAC;gBACf,cAAc,EAAE,gCAAgB,CAAC,YAAY;aAC9C,CAAC;SACH;KACF,CAAC;IACF,gBAAgB,EAAE,CAAC,IAAA,wDAA2B,GAAE,CAAC;CAClD,CAAC,CAAC"}
+{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/otel/sdk.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,kFAAqG;AACrG,4EAAqF;AACrF,8CAA2G;AAC3G,4EAAwE;AACxE,sFAA4E;AAC5E,gEAA8E;AAC9E,wDAAoD;AACpD,sDAAkD;AAClD,kEAAmE;AACnE,8EAA8F;AAC9F,oDAAgD;AAEnC,QAAA,GAAG,GAAG,IAAI,kBAAO,CAAC;IAC7B,WAAW,EAAE,4BAAY,CAAC,WAAW;IACrC,QAAQ,EAAE,IAAI,oBAAQ,CAAC;QACrB,CAAC,wCAAiB,CAAC,EAAE,4BAAY,CAAC,WAAW;QAC7C,CAAC,2CAAoB,CAAC,EAAE,4BAAY,CAAC,cAAc;KACpD,CAAC;IACF,YAAY,EAAE,IAAI,wCAAkB,EAAE;IACtC,cAAc,EAAE;QACd,IAAI,mCAAkB,CAAC,IAAI,4CAAiB,EAAE,CAAC;QAC/C,wDAAwD;QACxD,IAAI,6CAAoB,CAAC,+CAAsB,CAAC;KACjD;IACD,cAAc,EAAE,IAAI,qDAA+B,EAAE;IACrD,iBAAiB,EAAE,IAAI,0BAAmB,CAAC;QACzC,WAAW,EAAE;YACX,IAAI,gCAAyB,EAAE;YAC/B,IAAI,2BAAoB,EAAE;YAC1B,IAAI,4BAAY,EAAE;YAClB,IAAI,4BAAY,CAAC;gBACf,cAAc,EAAE,gCAAgB,CAAC,YAAY;aAC9C,CAAC;SACH;KACF,CAAC;IACF,gBAAgB,EAAE,CAAC,IAAA,wDAA2B,GAAE,CAAC;CAClD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/cf-telemetry",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "main": "dist/index.js",
   "files": [
     "dist/**/*"

package/dist/config.d.ts

@@ -1,3 +0,0 @@
-export declare const config: {
-    readonly terminateSignals: string[];
-};

package/dist/config.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = void 0;
-exports.config = {
-    terminateSignals: process.env['CF_TELEMETRY_TERMINATE_SIGNALS']?.split(',') ?? ['SIGINT', 'SIGTERM'],
-};
-//# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC;CAC5F,CAAC"}

package/dist/import.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"import.mjs","sourceRoot":"","sources":["../src/import.mts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,6DAA6D;AAC7D,aAAa;AACb,MAAM,IAAI,EAAE,CAAC"}