Skip to content

Commit 328996a

Browse files
committed
Couple tweaks from coderabbit
1 parent 54a3f2a commit 328996a

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

.changeset/five-nails-whisper.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ You can also now propagate your external trace context when calling back into yo
6060

6161
```ts
6262
import { otel, task } from "@trigger.dev/sdk";
63+
import { context, propagation } from "@opentelemetry/api";
6364

6465
async function callNextjsApp() {
6566
return await otel.withExternalTrace(async () => {

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,35 +176,43 @@ export class TracingSDK {
176176

177177
const logProcessors: Array<LogRecordProcessor> = [
178178
new TaskContextLogProcessor(
179-
getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1"
179+
getEnvVar("TRIGGER_OTEL_BATCH_PROCESSING_ENABLED") === "1"
180180
? new BatchLogRecordProcessor(logExporter, {
181-
maxExportBatchSize: parseInt(getEnvVar("OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"),
182-
scheduledDelayMillis: parseInt(getEnvVar("OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"),
183-
exportTimeoutMillis: parseInt(getEnvVar("OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"),
184-
maxQueueSize: parseInt(getEnvVar("OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
181+
maxExportBatchSize: parseInt(
182+
getEnvVar("TRIGGER_OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"
183+
),
184+
scheduledDelayMillis: parseInt(
185+
getEnvVar("TRIGGER_OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"
186+
),
187+
exportTimeoutMillis: parseInt(
188+
getEnvVar("TRIGGER_OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"
189+
),
190+
maxQueueSize: parseInt(getEnvVar("TRIGGER_OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
185191
})
186192
: new SimpleLogRecordProcessor(logExporter)
187193
),
188194
];
189195

190196
for (const externalLogExporter of config.logExporters ?? []) {
191197
logProcessors.push(
192-
getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1"
198+
getEnvVar("TRIGGER_OTEL_BATCH_PROCESSING_ENABLED") === "1"
193199
? new BatchLogRecordProcessor(
194200
new ExternalLogRecordExporterWrapper(
195201
externalLogExporter,
196202
externalTraceId,
197203
externalTraceContext
198204
),
199205
{
200-
maxExportBatchSize: parseInt(getEnvVar("OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"),
206+
maxExportBatchSize: parseInt(
207+
getEnvVar("TRIGGER_OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"
208+
),
201209
scheduledDelayMillis: parseInt(
202-
getEnvVar("OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"
210+
getEnvVar("TRIGGER_OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"
203211
),
204212
exportTimeoutMillis: parseInt(
205-
getEnvVar("OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"
213+
getEnvVar("TRIGGER_OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"
206214
),
207-
maxQueueSize: parseInt(getEnvVar("OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
215+
maxQueueSize: parseInt(getEnvVar("TRIGGER_OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
208216
}
209217
)
210218
: new SimpleLogRecordProcessor(

0 commit comments

Comments
 (0)