Skip to content

fix(otel): exported logs and spans will now have matching trace IDs #2724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2025
Merged

fix(otel): exported logs and spans will now have matching trace IDs #2724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/brown-pots-beg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"trigger.dev": patch
---

fix(otel): exported logs and spans will now have matching trace IDs
19 changes: 12 additions & 7 deletions packages/core/src/v3/otel/tracingSDK.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ class ExternalSpanExporterWrapper {
| { traceId: string; spanId: string; traceFlags: number; tracestate?: string }
| undefined
) {
this._isExternallySampled = isTraceFlagSampled(externalTraceContext?.traceFlags);
this._isExternallySampled = externalTraceContext
? isTraceFlagSampled(externalTraceContext.traceFlags)
: !!externalTraceId;
}

private transformSpan(span: ReadableSpan): ReadableSpan | undefined {
Expand Down Expand Up @@ -396,7 +398,9 @@ class ExternalLogRecordExporterWrapper {
| { traceId: string; spanId: string; tracestate?: string; traceFlags: number }
| undefined
) {
this._isExternallySampled = isTraceFlagSampled(externalTraceContext?.traceFlags);
this._isExternallySampled = externalTraceContext
? isTraceFlagSampled(externalTraceContext.traceFlags)
: !!externalTraceId;
}

export(logs: any[], resultCallback: (result: any) => void): void {
Expand All @@ -416,16 +420,17 @@ class ExternalLogRecordExporterWrapper {
}

transformLogRecord(logRecord: ReadableLogRecord): ReadableLogRecord {
// If there's no spanContext, or if the externalTraceId is not set, return the original logRecord.
if (!logRecord.spanContext || !this.externalTraceId || !this.externalTraceContext) {
return logRecord;
}

// Capture externalTraceId for use within the proxy's scope.
// Use externalTraceContext.traceId if available, otherwise fall back to generated externalTraceId
const externalTraceId = this.externalTraceContext
? this.externalTraceContext.traceId
: this.externalTraceId;

// If there's no spanContext, or if the externalTraceId is not set, return the original logRecord.
if (!logRecord.spanContext || !externalTraceId) {
return logRecord;
}

return new Proxy(logRecord, {
get(target, prop, receiver) {
if (prop === "spanContext") {
Expand Down