@codefresh-io/cf-telemetry 2.0.0-alpha.20 → 2.0.0-alpha.22

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * Initializes telemetry services. Should be called once as early as possible in the application lifecycle.
- * Preferred method of initialization is to add `--import=@codefresh-io/cf-telemetry/init` Node.js flag,
- * instead of calling this function directly.
+ * Initializaton of OpenTelemetry autoinstrumentation should be done separately
+ * by adding --require=@codefresh-io/cf-telemetry/otel/init to the node command.
  */
 export declare const init: () => Promise<void>;
 export declare const terminate: () => Promise<void>;

package/dist/index.js

@@ -34,24 +34,20 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.terminate = exports.init = void 0;
-// ↓ Should be imported first
-const otel = __importStar(require("./otel"));
-// ↑ Should be imported first
 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.
- * Preferred method of initialization is to add `--import=@codefresh-io/cf-telemetry/init` Node.js flag,
- * instead of calling this function directly.
+ * Initializaton of OpenTelemetry autoinstrumentation should be done separately
+ * by adding --require=@codefresh-io/cf-telemetry/otel/init to the node command.
  */
 const init = async () => {
     if (isInitialized)
         return;
     const logger = new logs.Logger('telemetry');
     logger.info('Initializing telemetry services');
-    await otel.init(logger).catch(logger.error);
     await Promise.all([
         prometheus.init(logger).catch(logger.error),
         profiles.init(logger).catch(logger.error),
@@ -64,7 +60,6 @@ const terminate = async () => {
     const logger = new logs.Logger('telemetry');
     try {
         logger.info('Terminating telemetry services');
-        await otel.terminate(logger).catch(logger.error);
         isInitialized = false;
         logger.info('Telemetry services terminated');
     }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAC7B,6CAA+B;AAC/B,6BAA6B;AAE7B,6CAA+B;AAC/B,iEAAmD;AACnD,qDAAuC;AAEvC,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B;;;;GAIG;AACI,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;IAC5C,IAAI,aAAa;QAAE,OAAO;IAE1B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3C,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;KAC1C,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,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,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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,iEAAmD;AACnD,qDAAuC;AAEvC,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B;;;;GAIG;AACI,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;IAC5C,IAAI,aAAa;QAAE,OAAO;IAE1B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC/C,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3C,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;KAC1C,CAAC,CAAC;IACH,aAAa,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC,CAAC;AAXW,QAAA,IAAI,QAWf;AAEK,MAAM,SAAS,GAAG,KAAK,IAAmB,EAAE;IACjD,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,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;AATW,QAAA,SAAS,aASpB"}

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.terminate = exports.init = void 0;
-const config_1 = require("./config");
 const sdk_1 = require("./sdk");
-const init = async (logger) => {
-    logger = logger.child('otel');
+const logs_1 = require("../logs");
+const config_1 = require("./config");
+const logger = new logs_1.Logger('telemetry:otel');
+const init = () => {
     try {
         if (!config_1.config.enabled) {
             logger.info('OpenTelemetry is disabled. Set CF_TELEMETRY_OTEL_ENABLE=true to enable it');
@@ -19,9 +19,7 @@ const init = async (logger) => {
         logger.error('Failed to initialize OpenTelemetry', exception);
     }
 };
-exports.init = init;
-const terminate = async (logger) => {
-    logger = logger.child('otel');
+const terminate = async () => {
     try {
         logger.info('Terminating OpenTelemetry');
         await sdk_1.sdk.shutdown();
@@ -31,5 +29,7 @@ const terminate = async (logger) => {
         logger.error('Failed to terminate OpenTelemetry', exception);
     }
 };
-exports.terminate = terminate;
-//# sourceMappingURL=index.js.map
+init();
+process.on('SIGTERM', terminate);
+process.once('beforeExit', terminate);
+//# sourceMappingURL=init.js.map

package/dist/otel/init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/otel/init.ts"],"names":[],"mappings":";;AAAA,+BAA4B;AAE5B,kCAAiC;AACjC,qCAAkC;AAElC,MAAM,MAAM,GAAG,IAAI,aAAM,CAAC,gBAAgB,CAAC,CAAC;AAE5C,MAAM,IAAI,GAAG,GAAS,EAAE;IACtB,IAAI,CAAC;QACH,IAAI,CAAC,eAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC;YACzF,OAAO;QACT,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,eAAM,CAAC,CAAC;QACpD,SAAG,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,IAAmB,EAAE;IAC1C,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACzC,MAAM,SAAG,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC;AAEF,IAAI,EAAE,CAAC;AAEP,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACjC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC"}

package/dist/public.d.mts

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

package/dist/public.d.ts

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

package/dist/public.js

@@ -0,0 +1,19 @@
+"use strict";
+// Public API (CommonJS)
+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("./index"), exports);
+//# sourceMappingURL=public.js.map

package/dist/public.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../src/public.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;;;;;;;;;;;;;;AAExB,0CAAwB"}

package/dist/public.mjs

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

package/dist/public.mjs.map

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

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@codefresh-io/cf-telemetry",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.22",
   "exports": {
-    "./init": "./dist/init.mjs",
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "import": "./dist/public.mjs",
+      "require": "./dist/public.js"
     },
     "./logs": {
       "import": "./dist/logs/public.mjs",
@@ -30,6 +29,9 @@
     "./otel": {
       "import": "./dist/otel/public.mjs",
       "require": "./dist/otel/public.js"
+    },
+    "./otel/init": {
+      "require": "./dist/otel/init.js"
     }
   },
   "files": [

package/dist/index.d.mts

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

package/dist/index.mjs

@@ -1,2 +0,0 @@
-export * from './index.js';
-//# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

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

package/dist/init.mjs

@@ -1,5 +0,0 @@
-import { init } from './index.js';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-await init();
-//# sourceMappingURL=init.mjs.map

package/dist/init.mjs.map

@@ -1 +0,0 @@
-{"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/index.d.ts

@@ -1,3 +0,0 @@
-import type { Logger } from '../logs';
-export declare const init: (logger: Logger) => Promise<void>;
-export declare const terminate: (logger: Logger) => Promise<void>;

package/dist/otel/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/otel/index.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAClC,+BAA4B;AAErB,MAAM,IAAI,GAAG,KAAK,EAAE,MAAc,EAAiB,EAAE;IAC1D,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,IAAI,CAAC,eAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC;YACzF,OAAO;QACT,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,eAAM,CAAC,CAAC;QACpD,SAAG,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,IAAI,QAcf;AAEK,MAAM,SAAS,GAAG,KAAK,EAAE,MAAc,EAAiB,EAAE;IAC/D,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACzC,MAAM,SAAG,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC;AATW,QAAA,SAAS,aASpB"}