Skip to content

feat(otlp): Attach sentry.origin attribute to otlp spans #5294

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 4 commits into from
Oct 27, 2025
Merged

feat(otlp): Attach sentry.origin attribute to otlp spans #5294

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1ca3e1
feat(otlp): Attach sentry.origin attribute to otlp spans
mjq Oct 24, 2025
5eae229
add changelog
mjq Oct 24, 2025
3e858a7
fix integration tests
mjq Oct 24, 2025
8389319
remove insta syntax changes
mjq Oct 27, 2025
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: 3 additions & 2 deletions relay-server/src/services/processor/span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,14 @@ mod tests {
.expect("converted span missing from envelope");

let payload = serde_json::from_slice::<serde_json::Value>(&item.payload()).unwrap();
insta::assert_json_snapshot!(payload, @r#"
insta::assert_json_snapshot!(payload, @r###"
{
"data": {
"instrumentation.name": "test_instrumentation",
"instrumentation.scope_key": "scope_value",
"instrumentation.version": "0.0.1",
"resource.resource_key": "resource_value",
"sentry.origin": "auto.otlp.spans",
"span_key": "span_value"
},
"exclusive_time": 0.0,
Expand All @@ -258,6 +259,6 @@ mod tests {
"timestamp": 0.0,
"trace_id": "89143b0763095bd9c9955e8175d1fb23"
}
"#);
"###);
}
}
87 changes: 52 additions & 35 deletions relay-spans/src/otel_to_sentry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, Some(&resource), Some(&scope));
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 1697620454.980079,
"start_timestamp": 1697620454.98,
Expand All @@ -154,14 +154,15 @@ mod tests {
"instrumentation.version": "123.42",
"plugin.name": "fastify -> @fastify/multipart",
"resource.service.name": 42,
"sentry.origin": "auto.otlp.spans",
"sentry.parentSampled": true,
"sentry.sample_rate": 1,
"sentry.status.message": "test"
},
"links": [],
"kind": "server"
}
"#);
"###);
}

#[test]
Expand All @@ -186,7 +187,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 1697620454.980079,
"start_timestamp": 1697620454.98,
Expand All @@ -199,12 +200,13 @@ mod tests {
"status": "ok",
"description": "middleware - fastify -> @fastify/multipart",
"data": {
"sentry.name": "middleware - fastify -> @fastify/multipart"
"sentry.name": "middleware - fastify -> @fastify/multipart",
"sentry.origin": "auto.otlp.spans"
},
"links": [],
"kind": "internal"
}
"#);
"###);
}

#[test]
Expand All @@ -221,7 +223,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 1697620454.980079,
"start_timestamp": 1697620454.98,
Expand All @@ -234,12 +236,13 @@ mod tests {
"status": "ok",
"description": "middleware - fastify -> @fastify/multipart",
"data": {
"sentry.name": "middleware - fastify -> @fastify/multipart"
"sentry.name": "middleware - fastify -> @fastify/multipart",
"sentry.origin": "auto.otlp.spans"
},
"links": [],
"kind": "internal"
}
"#);
"###);
}

#[test]
Expand Down Expand Up @@ -282,7 +285,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 1697620454.980079,
"start_timestamp": 1697620454.98,
Expand All @@ -299,12 +302,13 @@ mod tests {
"sentry.name": "database query",
"db.name": "database",
"db.statement": "SELECT \"table\".\"col\" FROM \"table\" WHERE \"table\".\"col\" = %s",
"db.type": "sql"
"db.type": "sql",
"sentry.origin": "auto.otlp.spans"
},
"links": [],
"kind": "client"
}
"#);
"###);
}

#[test]
Expand Down Expand Up @@ -347,7 +351,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 1697620454.980079,
"start_timestamp": 1697620454.98,
Expand All @@ -363,12 +367,13 @@ mod tests {
"sentry.name": "database query",
"db.name": "database",
"db.statement": "SELECT \"table\".\"col\" FROM \"table\" WHERE \"table\".\"col\" = %s",
"db.type": "sql"
"db.type": "sql",
"sentry.origin": "auto.otlp.spans"
},
"links": [],
"kind": "client"
}
"#);
"###);
}

#[test]
Expand Down Expand Up @@ -399,7 +404,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 1697620454.980079,
"start_timestamp": 1697620454.98,
Expand All @@ -414,12 +419,13 @@ mod tests {
"data": {
"sentry.name": "http client request",
"http.request.method": "GET",
"sentry.origin": "auto.otlp.spans",
"url.path": "/api/search?q=foobar"
},
"links": [],
"kind": "server"
}
"#);
"###);
}

#[test]
Expand Down Expand Up @@ -468,7 +474,7 @@ mod tests {
let event_span = otel_to_sentry_span(otel_span, None, None);

let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 123.5,
"start_timestamp": 123.0,
Expand All @@ -483,11 +489,12 @@ mod tests {
"data": {
"sentry.name": "cmd.run",
"process.args": "[\"node\",\"--require\",\"preflight.cjs\"]",
"process.info": "[41]"
"process.info": "[41]",
"sentry.origin": "auto.otlp.spans"
},
"links": []
}
"#);
"###);
}

/// Intended to be synced with `relay-event-schema::protocol::span::convert::tests::roundtrip`.
Expand Down Expand Up @@ -623,7 +630,7 @@ mod tests {
let event_span = otel_to_sentry_span(otel_span, None, None);

let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 123.5,
"start_timestamp": 123.0,
Expand All @@ -645,12 +652,13 @@ mod tests {
"sentry.sdk.name": "sentry.php",
"sentry.name": "myname",
"sentry.metrics_summary.some_metric": "[]",
"sentry.origin": "auto.otlp.spans",
"sentry.status.message": "foo"
},
"links": [],
"platform": "php"
}
"#);
"###);
}

#[test]
Expand All @@ -666,7 +674,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 123.5,
"start_timestamp": 123.0,
Expand All @@ -677,10 +685,12 @@ mod tests {
"trace_id": "89143b0763095bd9c9955e8175d1fb23",
"is_remote": true,
"status": "ok",
"data": {},
"data": {
"sentry.origin": "auto.otlp.spans"
},
"links": []
}
"#);
"###);
}

#[test]
Expand All @@ -696,7 +706,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 123.5,
"start_timestamp": 123.0,
Expand All @@ -707,10 +717,12 @@ mod tests {
"trace_id": "89143b0763095bd9c9955e8175d1fb23",
"is_remote": false,
"status": "ok",
"data": {},
"data": {
"sentry.origin": "auto.otlp.spans"
},
"links": []
}
"#);
"###);
}

#[test]
Expand All @@ -726,7 +738,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 123.5,
"start_timestamp": 123.0,
Expand All @@ -737,11 +749,13 @@ mod tests {
"trace_id": "89143b0763095bd9c9955e8175d1fb23",
"is_remote": false,
"status": "ok",
"data": {},
"data": {
"sentry.origin": "auto.otlp.spans"
},
"links": [],
"kind": "client"
}
"#);
"###);
}

#[test]
Expand Down Expand Up @@ -787,7 +801,7 @@ mod tests {
let event_span: EventSpan = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);

insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 0.0,
"start_timestamp": 0.0,
Expand All @@ -797,7 +811,9 @@ mod tests {
"trace_id": "3c79f60c11214eb38604f4ae0781bfb2",
"is_remote": false,
"status": "ok",
"data": {},
"data": {
"sentry.origin": "auto.otlp.spans"
},
"links": [
{
"trace_id": "4c79f60c11214eb38604f4ae0781bfb2",
Expand All @@ -812,7 +828,7 @@ mod tests {
}
]
}
"#);
"###);
}

#[test]
Expand All @@ -828,7 +844,7 @@ mod tests {
let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
let event_span = otel_to_sentry_span(otel_span, None, None);
let annotated_span: Annotated<EventSpan> = Annotated::new(event_span);
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r#"
insta::assert_json_snapshot!(SerializableAnnotated(&annotated_span), @r###"
{
"timestamp": 0.0,
"start_timestamp": 0.0,
Expand All @@ -839,10 +855,11 @@ mod tests {
"is_remote": false,
"status": "internal_error",
"data": {
"sentry.origin": "auto.otlp.spans",
"sentry.status.message": "2 is the error status code"
},
"links": []
}
"#);
"###);
}
}
Loading
Loading