Skip to content

Commit eb60126

Browse files
committed
Fixed batched otel in dev and made prod configurable to be batched as well
1 parent d876c35 commit eb60126

File tree

5 files changed

+60
-7
lines changed

5 files changed

+60
-7
lines changed

.changeset/eight-pumas-float.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/core": patch
3+
---
4+
5+
Fixed batch otel flushing

apps/webapp/app/env.server.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,17 @@ const EnvironmentSchema = z.object({
118118
DEV_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
119119
DEV_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
120120
DEV_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
121+
122+
PROD_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
123+
PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
124+
PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
125+
PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
126+
PROD_OTEL_SPAN_MAX_QUEUE_SIZE: z.string().default("512"),
127+
PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
128+
PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
129+
PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
130+
PROD_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
131+
121132
RUNTIME_WAIT_THRESHOLD_IN_MS: z.coerce.number().int().default(30000),
122133

123134
// Internal OTEL environment variables

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,46 @@ export class EnvironmentVariablesRepository implements Repository {
477477
key: "TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS",
478478
value: String(env.RUNTIME_WAIT_THRESHOLD_IN_MS),
479479
},
480+
...(env.PROD_OTEL_BATCH_PROCESSING_ENABLED === "1"
481+
? [
482+
{
483+
key: "OTEL_BATCH_PROCESSING_ENABLED",
484+
value: "1",
485+
},
486+
{
487+
key: "OTEL_SPAN_MAX_EXPORT_BATCH_SIZE",
488+
value: env.PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE,
489+
},
490+
{
491+
key: "OTEL_SPAN_SCHEDULED_DELAY_MILLIS",
492+
value: env.PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS,
493+
},
494+
{
495+
key: "OTEL_SPAN_EXPORT_TIMEOUT_MILLIS",
496+
value: env.PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS,
497+
},
498+
{
499+
key: "OTEL_SPAN_MAX_QUEUE_SIZE",
500+
value: env.PROD_OTEL_SPAN_MAX_QUEUE_SIZE,
501+
},
502+
{
503+
key: "OTEL_LOG_MAX_EXPORT_BATCH_SIZE",
504+
value: env.PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE,
505+
},
506+
{
507+
key: "OTEL_LOG_SCHEDULED_DELAY_MILLIS",
508+
value: env.PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS,
509+
},
510+
{
511+
key: "OTEL_LOG_EXPORT_TIMEOUT_MILLIS",
512+
value: env.PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS,
513+
},
514+
{
515+
key: "OTEL_LOG_MAX_QUEUE_SIZE",
516+
value: env.PROD_OTEL_LOG_MAX_QUEUE_SIZE,
517+
},
518+
]
519+
: []),
480520
];
481521
}
482522

apps/webapp/app/v3/services/completeAttempt.server.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ export class CompleteAttemptService extends BaseService {
9292
},
9393
});
9494

95-
logger.debug("Completed attempt successfully, ACKing message", {
96-
serializedOutput: completion.output,
97-
outputType: completion.outputType,
98-
});
95+
logger.debug("Completed attempt successfully, ACKing message");
9996

10097
await marqs?.acknowledgeMessage(taskRunAttempt.taskRunId);
10198

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export class TracingSDK {
9191
public readonly asyncResourceDetector = new AsyncResourceDetector();
9292
private readonly _logProvider: LoggerProvider;
9393
private readonly _spanExporter: SpanExporter;
94-
private readonly _traceProvider: TracerProvider;
94+
private readonly _traceProvider: NodeTracerProvider;
9595

9696
public readonly getLogger: LoggerProvider["getLogger"];
9797
public readonly getTracer: TracerProvider["getTracer"];
@@ -195,12 +195,12 @@ export class TracingSDK {
195195
}
196196

197197
public async flush() {
198-
await this._spanExporter.forceFlush?.();
198+
await this._traceProvider.forceFlush();
199199
await this._logProvider.forceFlush();
200200
}
201201

202202
public async shutdown() {
203-
await this._spanExporter.shutdown();
203+
await this._traceProvider.shutdown();
204204
await this._logProvider.shutdown();
205205
}
206206
}

0 commit comments

Comments
 (0)