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

package/src/runtime.ts

@@ -4,7 +4,7 @@ import { GatewayRequester } from './requester.js';
 import { AuthManager } from './auth.js';
 import { createLogger } from './logger.js';
 import { loadEnvironmentConfig } from './env.js';
-import { startCollectorAsync } from './collector-manager.js';
+import { startCollectorAndWaitForReady } from './collector-manager.js';
 import pino from 'pino';
 import { listRegisteredServices, getServiceOptions, getConfigureServicesHandlers, getInitializeServicesHandlers } from './decorators.js';
 import { generateOpenApiDocument } from './docs.js';
@@ -80,20 +80,52 @@ export class MicroserviceRuntime {
     const primaryService = registered[0];
     const qualifiedServiceName = `micro_${primaryService.qualifiedName}`;
     
-    // STEP 3: Start collector asynchronously in background (NON-BLOCKING)
-    // This allows the service to start immediately while collector downloads/starts
-    // Logs will work immediately (stdout), OTLP will connect when collector is ready
-    startupLogger.info('Starting OpenTelemetry collector setup in background (non-blocking)...');
-    startCollectorAsync(this.env);
+    // STEP 3: Wait for collector to be ready BEFORE creating structured logger
+    // Portal logs (structured logs via OTLP) should only appear AFTER collector is ready
+    // This ensures all runtime startup logs are captured and appear in Portal
+    // Use deasync to wait synchronously (constructor can't be async)
+    startupLogger.info('Setting up OpenTelemetry collector (waiting for readiness before enabling Portal logs)...');
     
-    // STEP 4: Create main logger immediately (service can start serving requests)
-    // Logger works immediately via stdout, OTLP will connect when collector is ready
-    // The logger will automatically start using OTLP once the collector is available
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const deasync = require('deasync');
+    let otlpEndpoint: string | null = null;
+    let collectorReady = false;
+    let collectorError: string | null = null;
+    
+    // Start collector setup asynchronously
+    startCollectorAndWaitForReady(this.env, 180000)
+      .then((endpoint) => {
+        otlpEndpoint = endpoint;
+        collectorReady = true;
+        if (endpoint) {
+          startupLogger.info(`Collector ready at ${endpoint}, creating structured logger for Portal logs...`);
+        } else {
+          startupLogger.warn('Collector setup did not complete in time, Portal logs will not be available');
+        }
+      })
+      .catch((error) => {
+        collectorError = error instanceof Error ? error.message : String(error);
+        collectorReady = true;
+        startupLogger.error(`Failed to setup collector: ${collectorError}`);
+      });
+    
+    // Wait synchronously for collector to be ready (with timeout)
+    const startTime = Date.now();
+    const timeoutMs = 180000; // 3 minutes
+    deasync.loopWhile(() => {
+      if (Date.now() - startTime >= timeoutMs) {
+        return false; // Timeout
+      }
+      return !collectorReady; // Continue waiting if not ready
+    });
+    
+    // STEP 4: Create main structured logger (collector is now ready, Portal logs will work)
+    // Pass the OTLP endpoint to ensure it uses the ready collector
     this.logger = createLogger(this.env, {
       name: 'beamable-node-microservice',
       serviceName: primaryService.name,
       qualifiedServiceName: qualifiedServiceName,
-      // Don't pass otlpEndpoint - let it discover/connect when collector is ready
+      otlpEndpoint: otlpEndpoint || undefined, // Pass endpoint if collector was set up
     });
     this.serviceManager = new BeamableServiceManager(this.env, this.logger);