From eb60126284cb017355b30dea6d21229a822b85d2 Mon Sep 17 00:00:00 2001
From: Eric Allam <eallam@icloud.com>
Date: Tue, 2 Apr 2024 12:58:56 +0100
Subject: [PATCH] Fixed batched otel in dev and made prod configurable to be
 batched as well

---
 .changeset/eight-pumas-float.md               |  5 +++
 apps/webapp/app/env.server.ts                 | 11 +++++
 .../environmentVariablesRepository.server.ts  | 40 +++++++++++++++++++
 .../app/v3/services/completeAttempt.server.ts |  5 +--
 packages/core/src/v3/otel/tracingSDK.ts       |  6 +--
 5 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/eight-pumas-float.md

diff --git a/.changeset/eight-pumas-float.md b/.changeset/eight-pumas-float.md
new file mode 100644
index 000000000..4ff19c09f
--- /dev/null
+++ b/.changeset/eight-pumas-float.md
@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+Fixed batch otel flushing
diff --git a/apps/webapp/app/env.server.ts b/apps/webapp/app/env.server.ts
index 4996a5091..bbd2bdf14 100644
--- a/apps/webapp/app/env.server.ts
+++ b/apps/webapp/app/env.server.ts
@@ -118,6 +118,17 @@ const EnvironmentSchema = z.object({
   DEV_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
   DEV_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
   DEV_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
+
+  PROD_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
+  PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
+  PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
+  PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
+  PROD_OTEL_SPAN_MAX_QUEUE_SIZE: z.string().default("512"),
+  PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
+  PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
+  PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
+  PROD_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
+
   RUNTIME_WAIT_THRESHOLD_IN_MS: z.coerce.number().int().default(30000),
 
   // Internal OTEL environment variables
diff --git a/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts b/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
index 7cf9c9a06..b6528b503 100644
--- a/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
+++ b/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
@@ -477,6 +477,46 @@ export class EnvironmentVariablesRepository implements Repository {
         key: "TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS",
         value: String(env.RUNTIME_WAIT_THRESHOLD_IN_MS),
       },
+      ...(env.PROD_OTEL_BATCH_PROCESSING_ENABLED === "1"
+        ? [
+            {
+              key: "OTEL_BATCH_PROCESSING_ENABLED",
+              value: "1",
+            },
+            {
+              key: "OTEL_SPAN_MAX_EXPORT_BATCH_SIZE",
+              value: env.PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE,
+            },
+            {
+              key: "OTEL_SPAN_SCHEDULED_DELAY_MILLIS",
+              value: env.PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS,
+            },
+            {
+              key: "OTEL_SPAN_EXPORT_TIMEOUT_MILLIS",
+              value: env.PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS,
+            },
+            {
+              key: "OTEL_SPAN_MAX_QUEUE_SIZE",
+              value: env.PROD_OTEL_SPAN_MAX_QUEUE_SIZE,
+            },
+            {
+              key: "OTEL_LOG_MAX_EXPORT_BATCH_SIZE",
+              value: env.PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE,
+            },
+            {
+              key: "OTEL_LOG_SCHEDULED_DELAY_MILLIS",
+              value: env.PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS,
+            },
+            {
+              key: "OTEL_LOG_EXPORT_TIMEOUT_MILLIS",
+              value: env.PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS,
+            },
+            {
+              key: "OTEL_LOG_MAX_QUEUE_SIZE",
+              value: env.PROD_OTEL_LOG_MAX_QUEUE_SIZE,
+            },
+          ]
+        : []),
     ];
   }
 
diff --git a/apps/webapp/app/v3/services/completeAttempt.server.ts b/apps/webapp/app/v3/services/completeAttempt.server.ts
index b57788a2d..56d283c84 100644
--- a/apps/webapp/app/v3/services/completeAttempt.server.ts
+++ b/apps/webapp/app/v3/services/completeAttempt.server.ts
@@ -92,10 +92,7 @@ export class CompleteAttemptService extends BaseService {
       },
     });
 
-    logger.debug("Completed attempt successfully, ACKing message", {
-      serializedOutput: completion.output,
-      outputType: completion.outputType,
-    });
+    logger.debug("Completed attempt successfully, ACKing message");
 
     await marqs?.acknowledgeMessage(taskRunAttempt.taskRunId);
 
diff --git a/packages/core/src/v3/otel/tracingSDK.ts b/packages/core/src/v3/otel/tracingSDK.ts
index ed233042d..016d7d53b 100644
--- a/packages/core/src/v3/otel/tracingSDK.ts
+++ b/packages/core/src/v3/otel/tracingSDK.ts
@@ -91,7 +91,7 @@ export class TracingSDK {
   public readonly asyncResourceDetector = new AsyncResourceDetector();
   private readonly _logProvider: LoggerProvider;
   private readonly _spanExporter: SpanExporter;
-  private readonly _traceProvider: TracerProvider;
+  private readonly _traceProvider: NodeTracerProvider;
 
   public readonly getLogger: LoggerProvider["getLogger"];
   public readonly getTracer: TracerProvider["getTracer"];
@@ -195,12 +195,12 @@ export class TracingSDK {
   }
 
   public async flush() {
-    await this._spanExporter.forceFlush?.();
+    await this._traceProvider.forceFlush();
     await this._logProvider.forceFlush();
   }
 
   public async shutdown() {
-    await this._spanExporter.shutdown();
+    await this._traceProvider.shutdown();
     await this._logProvider.shutdown();
   }
 }