v3: make sure force flush timeout is set so flushing doesn’t hang forever

Author: ericallam

packages/cli-v3/src/workers/dev/worker-setup.ts

@@ -18,6 +18,7 @@ export const tracingSDK = new TracingSDK({
   url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
   instrumentations: setupImportedConfig?.instrumentations ?? [],
   diagLogLevel: (process.env.OTEL_LOG_LEVEL as TracingDiagnosticLogLevel) ?? "none",
+  forceFlushTimeoutMillis: 5_000,
 });
 
 export const otelTracer: Tracer = tracingSDK.getTracer("trigger-dev-worker", packageJson.version);

packages/cli-v3/src/workers/prod/worker-setup.ts

@@ -18,7 +18,7 @@ export const tracingSDK = new TracingSDK({
   diagLogLevel: (process.env.OTEL_LOG_LEVEL as TracingDiagnosticLogLevel) ?? "none",
   forceFlushTimeoutMillis: process.env.OTEL_FORCE_FLUSH_TIMEOUT
     ? parseInt(process.env.OTEL_FORCE_FLUSH_TIMEOUT, 10)
-    : undefined,
+    : 5_000,
 });
 
 export const otelTracer: Tracer = tracingSDK.getTracer("trigger-prod-worker", packageJson.version);

packages/core/src/v3/otel/tracingSDK.ts

@@ -197,13 +197,11 @@ export class TracingSDK {
   }
 
   public async flush() {
-    await this._traceProvider.forceFlush();
-    await this._logProvider.forceFlush();
+    await Promise.all([this._traceProvider.forceFlush(), this._logProvider.forceFlush()]);
   }
 
   public async shutdown() {
-    await this._traceProvider.shutdown();
-    await this._logProvider.shutdown();
+    await Promise.all([this._traceProvider.shutdown(), this._logProvider.shutdown()]);
   }
 }