@omen.foundation/node-microservice-runtime 0.1.51 → 0.1.53

package/dist/collector-manager.cjs

@@ -40,6 +40,8 @@ exports.fetchClickHouseCredentials = fetchClickHouseCredentials;
 exports.getClickHouseCredentialsStatus = getClickHouseCredentialsStatus;
 exports.isCollectorRunning = isCollectorRunning;
 exports.addAuthEnvironmentVars = addAuthEnvironmentVars;
+exports.startCollectorAndWaitForReady = startCollectorAndWaitForReady;
+exports.startCollectorAsync = startCollectorAsync;
 exports.setupCollectorBeforeLogging = setupCollectorBeforeLogging;
 exports.startCollector = startCollector;
 exports.getCollectorProcessStatus = getCollectorProcessStatus;
@@ -272,20 +274,24 @@ async function resolveCollector(allowDownload = true, logger) {
     else if ((0, fs_1.existsSync)(configPath)) {
         logger === null || logger === void 0 ? void 0 : logger.info(`[Collector] Config found at: ${configPath}`);
     }
-    for (const item of itemsToDownload) {
-        try {
-            logger === null || logger === void 0 ? void 0 : logger.info(`[Collector] Downloading ${item.url}...`);
-            await downloadAndDecompressGzip(item.url, item.path, item.executable);
-            logger === null || logger === void 0 ? void 0 : logger.info(`[Collector] Downloaded to ${item.path}`);
-        }
-        catch (error) {
-            const errorMsg = error instanceof Error ? error.message : String(error);
-            logger === null || logger === void 0 ? void 0 : logger.error(`[Collector] Failed to download ${item.url}: ${errorMsg}`);
-            if (error instanceof Error && errorMsg.includes(item.url)) {
-                throw error;
+    if (itemsToDownload.length > 0) {
+        logger === null || logger === void 0 ? void 0 : logger.info(`[Collector] Downloading ${itemsToDownload.length} item(s) in parallel...`);
+        const downloadPromises = itemsToDownload.map(async (item) => {
+            try {
+                logger === null || logger === void 0 ? void 0 : logger.info(`[Collector] Downloading ${item.url}...`);
+                await downloadAndDecompressGzip(item.url, item.path, item.executable);
+                logger === null || logger === void 0 ? void 0 : logger.info(`[Collector] Downloaded to ${item.path}`);
             }
-            throw new Error(`Failed to download collector ${item.executable ? 'binary' : 'config'} from ${item.url}: ${errorMsg}`);
-        }
+            catch (error) {
+                const errorMsg = error instanceof Error ? error.message : String(error);
+                logger === null || logger === void 0 ? void 0 : logger.error(`[Collector] Failed to download ${item.url}: ${errorMsg}`);
+                if (error instanceof Error && errorMsg.includes(item.url)) {
+                    throw error;
+                }
+                throw new Error(`Failed to download collector ${item.executable ? 'binary' : 'config'} from ${item.url}: ${errorMsg}`);
+            }
+        });
+        await Promise.all(downloadPromises);
     }
     return {
         binaryPath: (0, fs_1.existsSync)(binaryPath) ? binaryPath : null,
@@ -423,6 +429,69 @@ function addAuthEnvironmentVars(endpoint, username, password) {
         throw new Error(`Failed to set ClickHouse credentials in process.env - this should never happen in Node.js`);
     }
 }
+async function startCollectorAndWaitForReady(env, timeoutMs = 180000) {
+    const isInDocker = process.env.IS_LOCAL !== '1' && process.env.IS_LOCAL !== 'true';
+    const useLocalOtel = !!process.env.BEAM_LOCAL_OTEL;
+    const standardOtelEnabled = (isInDocker || useLocalOtel) && !process.env.BEAM_DISABLE_STANDARD_OTEL;
+    const hasExplicitEndpoint = !!process.env.BEAM_OTEL_EXPORTER_OTLP_ENDPOINT;
+    if (!standardOtelEnabled && !hasExplicitEndpoint) {
+        return null;
+    }
+    const initLogger = (0, pino_1.default)({
+        name: 'beamable-otlp-init',
+        level: 'info',
+    }, process.stdout);
+    initLogger.info('[OTLP] Setting up collector (waiting for readiness before enabling Portal logs)...');
+    const startTime = Date.now();
+    let endpoint = null;
+    let completed = false;
+    const setupPromise = discoverOrStartCollector(initLogger, standardOtelEnabled, env);
+    const timeoutPromise = new Promise((resolve) => {
+        setTimeout(() => {
+            if (!completed) {
+                initLogger.warn(`[OTLP] Collector setup timeout after ${timeoutMs}ms, continuing without Portal logs`);
+                completed = true;
+                resolve(null);
+            }
+        }, timeoutMs);
+    });
+    const result = await Promise.race([setupPromise, timeoutPromise]);
+    if (result && !completed) {
+        endpoint = result;
+        completed = true;
+        const elapsed = Date.now() - startTime;
+        initLogger.info(`[OTLP] Collector ready at ${endpoint} (took ${elapsed}ms). Portal logs now enabled.`);
+        return endpoint;
+    }
+    return null;
+}
+function startCollectorAsync(env) {
+    const isInDocker = process.env.IS_LOCAL !== '1' && process.env.IS_LOCAL !== 'true';
+    const useLocalOtel = !!process.env.BEAM_LOCAL_OTEL;
+    const standardOtelEnabled = (isInDocker || useLocalOtel) && !process.env.BEAM_DISABLE_STANDARD_OTEL;
+    const hasExplicitEndpoint = !!process.env.BEAM_OTEL_EXPORTER_OTLP_ENDPOINT;
+    if (!standardOtelEnabled && !hasExplicitEndpoint) {
+        return;
+    }
+    const initLogger = (0, pino_1.default)({
+        name: 'beamable-otlp-init',
+        level: 'info',
+    }, process.stdout);
+    initLogger.info('[OTLP] Starting collector setup in background (non-blocking)...');
+    discoverOrStartCollector(initLogger, standardOtelEnabled, env)
+        .then((result) => {
+        if (result) {
+            initLogger.info(`[OTLP] Collector setup complete in background, endpoint: ${result}`);
+        }
+        else {
+            initLogger.warn('[OTLP] Collector setup returned null, OTLP logging will be disabled');
+        }
+    })
+        .catch((error) => {
+        const errorMsg = error instanceof Error ? error.message : String(error);
+        initLogger.error(`[OTLP] Failed to setup collector in background: ${errorMsg}`);
+    });
+}
 function setupCollectorBeforeLogging(env, timeoutMs = 60000) {
     const isInDocker = process.env.IS_LOCAL !== '1' && process.env.IS_LOCAL !== 'true';
     const useLocalOtel = !!process.env.BEAM_LOCAL_OTEL;

package/dist/collector-manager.d.ts

@@ -41,10 +41,23 @@ export declare function isCollectorRunning(): Promise<CollectorStatus>;
  */
 export declare function addAuthEnvironmentVars(endpoint: string, username: string, password: string): void;
 /**
- * Sets up the collector BEFORE logging is initialized.
- * This ensures all startup logs are captured via OTLP.
- * Uses a minimal console logger for setup messages.
- * Returns the OTLP endpoint if successful, null otherwise.
+ * Starts the collector and waits for it to be ready before returning.
+ * This ensures Portal logs (structured logs via OTLP) only start appearing AFTER collector is ready.
+ * Returns the OTLP endpoint when ready, or null if it times out or fails.
+ */
+export declare function startCollectorAndWaitForReady(env: EnvironmentConfig, timeoutMs?: number): Promise<string | null>;
+/**
+ * Starts the collector asynchronously in the background (non-blocking).
+ * This allows the service to start immediately while collector downloads/starts.
+ * Returns immediately - collector setup happens in background.
+ * @deprecated Use startCollectorAndWaitForReady() to ensure Portal logs only appear after collector is ready
+ */
+export declare function startCollectorAsync(env: EnvironmentConfig): void;
+/**
+ * Sets up the collector BEFORE logging is initialized (DEPRECATED - blocking approach).
+ * This function is kept for backwards compatibility but is no longer recommended.
+ * Use startCollectorAsync() for non-blocking startup instead.
+ * @deprecated Use startCollectorAsync() for non-blocking startup
  */
 export declare function setupCollectorBeforeLogging(env: EnvironmentConfig, timeoutMs?: number): string | null;
 /**

package/dist/collector-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collector-manager.d.ts","sourceRoot":"","sources":["../src/collector-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAOpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAYpD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAuCD;;GAEG;AACH,UAAU,qBAAqB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAqCD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,qBAAqB,CAAC,CAwChC;AA0OD;;GAEG;AACH,wBAAgB,8BAA8B,IAAI;IAChD,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS,CAAC;CAC3C,CAoBA;AAED;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAyEnE;AA0BD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAYjG;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,iBAAiB,EACtB,SAAS,GAAE,MAAc,GACxB,MAAM,GAAG,IAAI,CA8Ef;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,iBAAiB,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgNtD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI;IAC3C,UAAU,EAAE,OAAO,CAAC;IACpB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CASA;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,OAAO,EAC5B,GAAG,CAAC,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmJxB"}
+{"version":3,"file":"collector-manager.d.ts","sourceRoot":"","sources":["../src/collector-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAOpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAYpD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAuCD;;GAEG;AACH,UAAU,qBAAqB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAqCD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,qBAAqB,CAAC,CAwChC;AAiPD;;GAEG;AACH,wBAAgB,8BAA8B,IAAI;IAChD,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS,CAAC;CAC3C,CAoBA;AAED;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAyEnE;AA0BD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAYjG;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,iBAAiB,EACtB,SAAS,GAAE,MAAe,GACzB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmDxB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAsChE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,iBAAiB,EACtB,SAAS,GAAE,MAAc,GACxB,MAAM,GAAG,IAAI,CA8Ef;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,iBAAiB,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgNtD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI;IAC3C,UAAU,EAAE,OAAO,CAAC;IACpB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CASA;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,OAAO,EAC5B,GAAG,CAAC,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmJxB"}

package/dist/collector-manager.js

@@ -270,22 +270,28 @@ async function resolveCollector(allowDownload = true, logger) {
     else if (existsSync(configPath)) {
         logger?.info(`[Collector] Config found at: ${configPath}`);
     }
-    for (const item of itemsToDownload) {
-        try {
-            logger?.info(`[Collector] Downloading ${item.url}...`);
-            await downloadAndDecompressGzip(item.url, item.path, item.executable);
-            logger?.info(`[Collector] Downloaded to ${item.path}`);
-        }
-        catch (error) {
-            // Don't wrap the error again if it already contains the URL and details
-            const errorMsg = error instanceof Error ? error.message : String(error);
-            logger?.error(`[Collector] Failed to download ${item.url}: ${errorMsg}`);
-            // Only wrap if the error doesn't already contain the URL
-            if (error instanceof Error && errorMsg.includes(item.url)) {
-                throw error; // Error already has URL and context
+    // Download items in parallel for faster startup (binary and config simultaneously)
+    if (itemsToDownload.length > 0) {
+        logger?.info(`[Collector] Downloading ${itemsToDownload.length} item(s) in parallel...`);
+        const downloadPromises = itemsToDownload.map(async (item) => {
+            try {
+                logger?.info(`[Collector] Downloading ${item.url}...`);
+                await downloadAndDecompressGzip(item.url, item.path, item.executable);
+                logger?.info(`[Collector] Downloaded to ${item.path}`);
             }
-            throw new Error(`Failed to download collector ${item.executable ? 'binary' : 'config'} from ${item.url}: ${errorMsg}`);
-        }
+            catch (error) {
+                // Don't wrap the error again if it already contains the URL and details
+                const errorMsg = error instanceof Error ? error.message : String(error);
+                logger?.error(`[Collector] Failed to download ${item.url}: ${errorMsg}`);
+                // Only wrap if the error doesn't already contain the URL
+                if (error instanceof Error && errorMsg.includes(item.url)) {
+                    throw error; // Error already has URL and context
+                }
+                throw new Error(`Failed to download collector ${item.executable ? 'binary' : 'config'} from ${item.url}: ${errorMsg}`);
+            }
+        });
+        // Wait for all downloads to complete (or fail)
+        await Promise.all(downloadPromises);
     }
     return {
         binaryPath: existsSync(binaryPath) ? binaryPath : null,
@@ -462,10 +468,100 @@ export function addAuthEnvironmentVars(endpoint, username, password) {
     }
 }
 /**
- * Sets up the collector BEFORE logging is initialized.
- * This ensures all startup logs are captured via OTLP.
- * Uses a minimal console logger for setup messages.
- * Returns the OTLP endpoint if successful, null otherwise.
+ * Starts the collector and waits for it to be ready before returning.
+ * This ensures Portal logs (structured logs via OTLP) only start appearing AFTER collector is ready.
+ * Returns the OTLP endpoint when ready, or null if it times out or fails.
+ */
+export async function startCollectorAndWaitForReady(env, timeoutMs = 180000 // 3 minutes to allow for download + startup
+) {
+    // Match C# logic: (this.InDocker() || UseLocalOtel) && !BEAM_DISABLE_STANDARD_OTEL
+    const isInDocker = process.env.IS_LOCAL !== '1' && process.env.IS_LOCAL !== 'true';
+    const useLocalOtel = !!process.env.BEAM_LOCAL_OTEL;
+    const standardOtelEnabled = (isInDocker || useLocalOtel) && !process.env.BEAM_DISABLE_STANDARD_OTEL;
+    const hasExplicitEndpoint = !!process.env.BEAM_OTEL_EXPORTER_OTLP_ENDPOINT;
+    // If OTLP is not needed, return immediately
+    if (!standardOtelEnabled && !hasExplicitEndpoint) {
+        return null;
+    }
+    // Create a minimal console logger for initialization messages (no OTLP yet)
+    const initLogger = pino({
+        name: 'beamable-otlp-init',
+        level: 'info',
+    }, process.stdout);
+    initLogger.info('[OTLP] Setting up collector (waiting for readiness before enabling Portal logs)...');
+    // Wait for collector to be ready with timeout
+    const startTime = Date.now();
+    let endpoint = null;
+    let completed = false;
+    // Start collector setup
+    const setupPromise = discoverOrStartCollector(initLogger, standardOtelEnabled, env);
+    // Set timeout
+    const timeoutPromise = new Promise((resolve) => {
+        setTimeout(() => {
+            if (!completed) {
+                initLogger.warn(`[OTLP] Collector setup timeout after ${timeoutMs}ms, continuing without Portal logs`);
+                completed = true;
+                resolve(null);
+            }
+        }, timeoutMs);
+    });
+    // Race between setup and timeout
+    const result = await Promise.race([setupPromise, timeoutPromise]);
+    if (result && !completed) {
+        endpoint = result;
+        completed = true;
+        const elapsed = Date.now() - startTime;
+        initLogger.info(`[OTLP] Collector ready at ${endpoint} (took ${elapsed}ms). Portal logs now enabled.`);
+        return endpoint;
+    }
+    return null;
+}
+/**
+ * Starts the collector asynchronously in the background (non-blocking).
+ * This allows the service to start immediately while collector downloads/starts.
+ * Returns immediately - collector setup happens in background.
+ * @deprecated Use startCollectorAndWaitForReady() to ensure Portal logs only appear after collector is ready
+ */
+export function startCollectorAsync(env) {
+    // Match C# logic: (this.InDocker() || UseLocalOtel) && !BEAM_DISABLE_STANDARD_OTEL
+    const isInDocker = process.env.IS_LOCAL !== '1' && process.env.IS_LOCAL !== 'true';
+    const useLocalOtel = !!process.env.BEAM_LOCAL_OTEL;
+    const standardOtelEnabled = (isInDocker || useLocalOtel) && !process.env.BEAM_DISABLE_STANDARD_OTEL;
+    const hasExplicitEndpoint = !!process.env.BEAM_OTEL_EXPORTER_OTLP_ENDPOINT;
+    // If OTLP is not needed, return immediately
+    if (!standardOtelEnabled && !hasExplicitEndpoint) {
+        return;
+    }
+    // Create a minimal console logger for initialization messages (no OTLP yet)
+    const initLogger = pino({
+        name: 'beamable-otlp-init',
+        level: 'info',
+    }, process.stdout);
+    initLogger.info('[OTLP] Starting collector setup in background (non-blocking)...');
+    // Start collector setup asynchronously - don't wait for it
+    // The service can start immediately, collector will connect when ready
+    discoverOrStartCollector(initLogger, standardOtelEnabled, env)
+        .then((result) => {
+        if (result) {
+            initLogger.info(`[OTLP] Collector setup complete in background, endpoint: ${result}`);
+            // Update the global logger provider if it exists to enable OTLP
+            // The logger will automatically start using OTLP once the provider is set
+        }
+        else {
+            initLogger.warn('[OTLP] Collector setup returned null, OTLP logging will be disabled');
+        }
+    })
+        .catch((error) => {
+        const errorMsg = error instanceof Error ? error.message : String(error);
+        initLogger.error(`[OTLP] Failed to setup collector in background: ${errorMsg}`);
+    });
+    // Return immediately - service can start serving requests
+}
+/**
+ * Sets up the collector BEFORE logging is initialized (DEPRECATED - blocking approach).
+ * This function is kept for backwards compatibility but is no longer recommended.
+ * Use startCollectorAsync() for non-blocking startup instead.
+ * @deprecated Use startCollectorAsync() for non-blocking startup
  */
 export function setupCollectorBeforeLogging(env, timeoutMs = 60000) {
     // Match C# logic: (this.InDocker() || UseLocalOtel) && !BEAM_DISABLE_STANDARD_OTEL