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

package/dist/collector-manager.cjs

@@ -82,6 +82,7 @@ let globalCollectorProcess = null;
 let globalCollectorStartError = null;
 let globalCollectorExitCode = null;
 let globalCollectorStderr = [];
+let globalCollectorStartupPromise = null;
 let globalCollectorInitError = null;
 function calculateSignature(pid, secret, uriPathAndQuery, body = null, version = '1') {
     let dataToSign = `${secret}${pid}${version}${uriPathAndQuery}`;
@@ -640,6 +641,18 @@ async function discoverOrStartCollector(logger, standardOtelEnabled, env) {
     if (!standardOtelEnabled) {
         return null;
     }
+    if (globalCollectorStartupPromise) {
+        logger.info('[Collector] Collector startup already in progress, waiting for existing startup to complete...');
+        try {
+            const result = await globalCollectorStartupPromise;
+            globalCollectorStartupPromise = null;
+            return result;
+        }
+        catch (error) {
+            logger.error(`[Collector] Existing startup promise failed: ${error instanceof Error ? error.message : String(error)}`);
+            globalCollectorStartupPromise = null;
+        }
+    }
     let existingEndpoint;
     if (globalCollectorProcess) {
         const processAlive = globalCollectorProcess.exitCode === null &&
@@ -664,59 +677,66 @@ async function discoverOrStartCollector(logger, standardOtelEnabled, env) {
             return `http://${status.otlpEndpoint}`;
         }
     }
-    try {
-        globalCollectorInitError = null;
-        let endpoint;
-        if (existingEndpoint) {
-            endpoint = existingEndpoint;
-            logger.info(`[Collector] Waiting for existing collector to become ready at ${endpoint}...`);
-        }
-        else {
-            logger.info('[Collector] Starting OpenTelemetry collector...');
-            const startResult = await startCollector(logger, undefined, env);
-            endpoint = startResult.endpoint;
-            await new Promise(resolve => setTimeout(resolve, 200));
-            if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
-                const errorMsg = `Collector process exited immediately with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
-                globalCollectorInitError = errorMsg;
-                logger.error(`[Collector] ${errorMsg}`);
-                return null;
+    const startupPromise = (async () => {
+        try {
+            globalCollectorInitError = null;
+            let endpoint;
+            if (existingEndpoint) {
+                endpoint = existingEndpoint;
+                logger.info(`[Collector] Waiting for existing collector to become ready at ${endpoint}...`);
+            }
+            else {
+                logger.info('[Collector] Starting OpenTelemetry collector...');
+                const startResult = await startCollector(logger, undefined, env);
+                endpoint = startResult.endpoint;
+                await new Promise(resolve => setTimeout(resolve, 200));
+                if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
+                    const errorMsg = `Collector process exited immediately with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+                    globalCollectorInitError = errorMsg;
+                    logger.error(`[Collector] ${errorMsg}`);
+                    return null;
+                }
+            }
+            const maxWaitTime = 60000;
+            const checkInterval = 500;
+            const maxChecks = Math.floor(maxWaitTime / checkInterval);
+            logger.info('[Collector] Waiting for collector to become ready...');
+            for (let i = 0; i < maxChecks; i++) {
+                await new Promise(resolve => setTimeout(resolve, checkInterval));
+                if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
+                    const errorMsg = `Collector process exited during startup with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+                    globalCollectorInitError = errorMsg;
+                    logger.error(`[Collector] ${errorMsg}`);
+                    return null;
+                }
+                const newStatus = await isCollectorRunning();
+                if (newStatus.isRunning && newStatus.isReady) {
+                    logger.info(`[Collector] Collector is ready at ${newStatus.otlpEndpoint || endpoint}`);
+                    return newStatus.otlpEndpoint ? `http://${newStatus.otlpEndpoint}` : endpoint;
+                }
+                if (i > 0 && i % 4 === 0) {
+                    logger.info(`[Collector] Still waiting for collector to become ready... (${(i * checkInterval) / 1000}s elapsed)`);
+                }
             }
-        }
-        const maxWaitTime = 60000;
-        const checkInterval = 500;
-        const maxChecks = Math.floor(maxWaitTime / checkInterval);
-        logger.info('[Collector] Waiting for collector to become ready...');
-        for (let i = 0; i < maxChecks; i++) {
-            await new Promise(resolve => setTimeout(resolve, checkInterval));
             if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
-                const errorMsg = `Collector process exited during startup with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+                const errorMsg = `Collector process exited with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
                 globalCollectorInitError = errorMsg;
                 logger.error(`[Collector] ${errorMsg}`);
                 return null;
             }
-            const newStatus = await isCollectorRunning();
-            if (newStatus.isRunning && newStatus.isReady) {
-                logger.info(`[Collector] Collector is ready at ${newStatus.otlpEndpoint || endpoint}`);
-                return newStatus.otlpEndpoint ? `http://${newStatus.otlpEndpoint}` : endpoint;
-            }
-            if (i > 0 && i % 4 === 0) {
-                logger.info(`[Collector] Still waiting for collector to become ready... (${(i * checkInterval) / 1000}s elapsed)`);
-            }
+            logger.error(`[Collector] Collector did not become ready within ${maxWaitTime / 1000} seconds`);
+            return null;
         }
-        if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
-            const errorMsg = `Collector process exited with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+        catch (err) {
+            const errorMsg = err instanceof Error ? err.message : String(err);
             globalCollectorInitError = errorMsg;
-            logger.error(`[Collector] ${errorMsg}`);
+            logger.error(`[Collector] Failed to start collector: ${errorMsg}`);
             return null;
         }
-        logger.error(`[Collector] Collector did not become ready within ${maxWaitTime / 1000} seconds`);
-        return null;
-    }
-    catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
-        globalCollectorInitError = errorMsg;
-        logger.error(`[Collector] Failed to start collector: ${errorMsg}`);
-        return null;
-    }
+    })();
+    globalCollectorStartupPromise = startupPromise;
+    startupPromise.finally(() => {
+        globalCollectorStartupPromise = null;
+    });
+    return await startupPromise;
 }

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;AAqCD;;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,CAmHxB"}
+{"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"}

package/dist/collector-manager.js

@@ -41,6 +41,8 @@ let globalCollectorProcess = null;
 let globalCollectorStartError = null;
 let globalCollectorExitCode = null;
 let globalCollectorStderr = [];
+// Track if collector startup is in progress to prevent duplicate starts
+let globalCollectorStartupPromise = null;
 let globalCollectorInitError = null; // Tracks errors from discoverOrStartCollector
 /**
  * Calculates Beamable signature for signed requests
@@ -744,6 +746,24 @@ export async function discoverOrStartCollector(logger, standardOtelEnabled, env)
     if (!standardOtelEnabled) {
         return null;
     }
+    // CRITICAL: Check if collector startup is already in progress
+    // This prevents duplicate collector starts if this function is called multiple times
+    // (e.g., if setupCollectorBeforeLogging times out but the promise is still running)
+    if (globalCollectorStartupPromise) {
+        logger.info('[Collector] Collector startup already in progress, waiting for existing startup to complete...');
+        try {
+            const result = await globalCollectorStartupPromise;
+            // Clear the promise after it completes (success or failure)
+            globalCollectorStartupPromise = null;
+            return result;
+        }
+        catch (error) {
+            logger.error(`[Collector] Existing startup promise failed: ${error instanceof Error ? error.message : String(error)}`);
+            // Clear the promise so we can retry
+            globalCollectorStartupPromise = null;
+            // Fall through to start a new one
+        }
+    }
     // CRITICAL: Check if we already have a collector process starting/running
     // This prevents duplicate collector starts if this function is called multiple times
     let existingEndpoint;
@@ -776,72 +796,83 @@ export async function discoverOrStartCollector(logger, standardOtelEnabled, env)
         }
     }
     // Collector not running - start it (or wait for existing one to be ready)
-    try {
-        // Clear any previous init error
-        globalCollectorInitError = null;
-        let endpoint;
-        if (existingEndpoint) {
-            // Collector already starting, just wait for it to be ready
-            endpoint = existingEndpoint;
-            logger.info(`[Collector] Waiting for existing collector to become ready at ${endpoint}...`);
-        }
-        else {
-            // Start a new collector
-            logger.info('[Collector] Starting OpenTelemetry collector...');
-            const startResult = await startCollector(logger, undefined, env);
-            endpoint = startResult.endpoint;
-            // Check if collector process exited immediately (crashed)
-            // Wait a bit longer to see if it crashes right after starting
-            await new Promise(resolve => setTimeout(resolve, 200));
-            if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
-                const errorMsg = `Collector process exited immediately with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
-                globalCollectorInitError = errorMsg;
-                logger.error(`[Collector] ${errorMsg}`);
-                return null;
+    // Wrap the entire startup logic in a promise that we track globally
+    // This prevents duplicate starts if this function is called multiple times
+    const startupPromise = (async () => {
+        try {
+            // Clear any previous init error
+            globalCollectorInitError = null;
+            let endpoint;
+            if (existingEndpoint) {
+                // Collector already starting, just wait for it to be ready
+                endpoint = existingEndpoint;
+                logger.info(`[Collector] Waiting for existing collector to become ready at ${endpoint}...`);
             }
-        }
-        // CRITICAL: Wait for collector to be fully ready before returning
-        // We'll wait up to 60 seconds, checking every 500ms
-        // This ensures the collector is actually ready to receive logs before we continue
-        const maxWaitTime = 60000; // 60 seconds
-        const checkInterval = 500; // Check every 500ms
-        const maxChecks = Math.floor(maxWaitTime / checkInterval);
-        logger.info('[Collector] Waiting for collector to become ready...');
-        for (let i = 0; i < maxChecks; i++) {
-            await new Promise(resolve => setTimeout(resolve, checkInterval));
-            // Check if process exited during wait
+            else {
+                // Start a new collector
+                logger.info('[Collector] Starting OpenTelemetry collector...');
+                const startResult = await startCollector(logger, undefined, env);
+                endpoint = startResult.endpoint;
+                // Check if collector process exited immediately (crashed)
+                // Wait a bit longer to see if it crashes right after starting
+                await new Promise(resolve => setTimeout(resolve, 200));
+                if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
+                    const errorMsg = `Collector process exited immediately with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+                    globalCollectorInitError = errorMsg;
+                    logger.error(`[Collector] ${errorMsg}`);
+                    return null;
+                }
+            }
+            // CRITICAL: Wait for collector to be fully ready before returning
+            // We'll wait up to 60 seconds, checking every 500ms
+            // This ensures the collector is actually ready to receive logs before we continue
+            const maxWaitTime = 60000; // 60 seconds
+            const checkInterval = 500; // Check every 500ms
+            const maxChecks = Math.floor(maxWaitTime / checkInterval);
+            logger.info('[Collector] Waiting for collector to become ready...');
+            for (let i = 0; i < maxChecks; i++) {
+                await new Promise(resolve => setTimeout(resolve, checkInterval));
+                // Check if process exited during wait
+                if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
+                    const errorMsg = `Collector process exited during startup with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+                    globalCollectorInitError = errorMsg;
+                    logger.error(`[Collector] ${errorMsg}`);
+                    return null;
+                }
+                const newStatus = await isCollectorRunning();
+                if (newStatus.isRunning && newStatus.isReady) {
+                    logger.info(`[Collector] Collector is ready at ${newStatus.otlpEndpoint || endpoint}`);
+                    return newStatus.otlpEndpoint ? `http://${newStatus.otlpEndpoint}` : endpoint;
+                }
+                // Log progress every 2 seconds
+                if (i > 0 && i % 4 === 0) {
+                    logger.info(`[Collector] Still waiting for collector to become ready... (${(i * checkInterval) / 1000}s elapsed)`);
+                }
+            }
+            // Check one more time if process exited
             if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
-                const errorMsg = `Collector process exited during startup with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+                const errorMsg = `Collector process exited with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
                 globalCollectorInitError = errorMsg;
                 logger.error(`[Collector] ${errorMsg}`);
                 return null;
             }
-            const newStatus = await isCollectorRunning();
-            if (newStatus.isRunning && newStatus.isReady) {
-                logger.info(`[Collector] Collector is ready at ${newStatus.otlpEndpoint || endpoint}`);
-                return newStatus.otlpEndpoint ? `http://${newStatus.otlpEndpoint}` : endpoint;
-            }
-            // Log progress every 2 seconds
-            if (i > 0 && i % 4 === 0) {
-                logger.info(`[Collector] Still waiting for collector to become ready... (${(i * checkInterval) / 1000}s elapsed)`);
-            }
+            // Collector did not become ready within timeout
+            logger.error(`[Collector] Collector did not become ready within ${maxWaitTime / 1000} seconds`);
+            return null;
         }
-        // Check one more time if process exited
-        if (globalCollectorExitCode !== null && globalCollectorExitCode !== 0) {
-            const errorMsg = `Collector process exited with code ${globalCollectorExitCode}. ${globalCollectorStderr.length > 0 ? `Stderr: ${globalCollectorStderr.join('; ')}` : 'No stderr output.'}`;
+        catch (err) {
+            const errorMsg = err instanceof Error ? err.message : String(err);
             globalCollectorInitError = errorMsg;
-            logger.error(`[Collector] ${errorMsg}`);
+            logger.error(`[Collector] Failed to start collector: ${errorMsg}`);
             return null;
         }
-        // Collector did not become ready within timeout
-        logger.error(`[Collector] Collector did not become ready within ${maxWaitTime / 1000} seconds`);
-        return null;
-    }
-    catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
-        globalCollectorInitError = errorMsg;
-        logger.error(`[Collector] Failed to start collector: ${errorMsg}`);
-        return null;
-    }
+    })();
+    // Store the promise globally so other calls to this function can wait for it
+    globalCollectorStartupPromise = startupPromise;
+    // Clear the promise when it completes (so we don't keep waiting on old promises)
+    startupPromise.finally(() => {
+        globalCollectorStartupPromise = null;
+    });
+    return await startupPromise;
 }
 //# sourceMappingURL=collector-manager.js.map