Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

**Features**:

- No longer write the deprecated `sentry.transaction` attribute. ([#6237](https://github.com/getsentry/relay/pull/6237))

## 26.7.0

**Features**:
Expand Down
2 changes: 0 additions & 2 deletions relay-event-normalization/src/eap/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -968,8 +968,6 @@ pub fn write_legacy_attributes(attributes: &mut Annotated<Attributes>) {
(SERVER__ADDRESS, SENTRY__DOMAIN),
(HTTP__REQUEST__METHOD, SENTRY__ACTION),
(HTTP__RESPONSE__STATUS_CODE, SENTRY__STATUS_CODE),
// Transaction
(SENTRY__SEGMENT__NAME, SENTRY__TRANSACTION),
];

for (current_attribute, legacy_attribute) in current_to_legacy_attributes {
Expand Down
14 changes: 0 additions & 14 deletions relay-event-normalization/src/normalize/span/tag_extraction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ struct SharedTags {
trace_status: Annotated<String>,
transaction_method: Annotated<String>,
transaction_op: Annotated<String>,
transaction: Annotated<String>,
user_city: Annotated<String>,
user_country_code: Annotated<String>,
user_email: Annotated<String>,
Expand Down Expand Up @@ -229,7 +228,6 @@ impl SharedTags {
trace_status,
transaction_method,
transaction_op,
transaction,
user_city,
user_country_code,
user_email,
Expand Down Expand Up @@ -289,9 +287,6 @@ impl SharedTags {
if tags.transaction_op.value().is_none() {
tags.transaction_op = transaction_op.clone();
};
if tags.transaction.value().is_none() {
tags.transaction = transaction.clone();
};
if tags.user_city.value().is_none() {
tags.user_city = user_city.clone();
}
Expand Down Expand Up @@ -378,8 +373,6 @@ fn extract_shared_tags(event: &Event) -> SharedTags {
}

if let Some(transaction_name) = event.transaction.value() {
tags.transaction = transaction_name.clone().into();

let transaction_method_from_request = event
.request
.value()
Expand Down Expand Up @@ -1057,13 +1050,6 @@ pub fn extract_tags(
&& ((span_op.starts_with("ui.interaction.") && measurements.contains_key("inp"))
|| span_op.starts_with("ui.webvital."))
{
if let Some(transaction) = span
.data
.value()
.and_then(|data| data.get_str(SENTRY__SEGMENT__NAME))
{
span_tags.transaction = transaction.to_owned().into();
}
if let Some(user) = span.data.value().and_then(|data| data.get_str("user")) {
span_tags.user = user.to_owned().into();
}
Expand Down
2 changes: 0 additions & 2 deletions relay-event-schema/src/protocol/span.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ pub struct SentryTags {
#[metastructure(pii = "true", field = "user.email")]
pub user_email: Annotated<String>,
pub environment: Annotated<String>,
pub transaction: Annotated<String>,
#[metastructure(field = "transaction.method")]
pub transaction_method: Annotated<String>,
#[metastructure(field = "transaction.op")]
Expand Down Expand Up @@ -424,7 +423,6 @@ impl Getter for SentryTags {
"trace.status" => &self.trace_status,
"transaction.method" => &self.transaction_method,
"transaction.op" => &self.transaction_op,
"transaction" => &self.transaction,
"ttfd" => &self.ttfd,
"ttid" => &self.ttid,
"user.email" => &self.user_email,
Expand Down
10 changes: 0 additions & 10 deletions tests/integration/test_ai.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ def test_ai_spans_example_transaction(
"sentry.segment.name": {"type": "string", "value": "main"},
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -557,7 +556,6 @@ def test_ai_spans_example_transaction(
"sentry.segment.name": {"type": "string", "value": "main"},
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -670,7 +668,6 @@ def test_ai_spans_example_transaction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.status_code": {"type": "string", "value": "200"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -762,7 +759,6 @@ def test_ai_spans_example_transaction(
"sentry.segment.name": {"type": "string", "value": "main"},
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -838,7 +834,6 @@ def test_ai_spans_example_transaction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.status_code": {"type": "string", "value": "200"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -923,7 +918,6 @@ def test_ai_spans_example_transaction(
"sentry.segment.name": {"type": "string", "value": "main"},
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -999,7 +993,6 @@ def test_ai_spans_example_transaction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.status_code": {"type": "string", "value": "200"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -1115,7 +1108,6 @@ def test_ai_spans_example_transaction(
"sentry.segment.name": {"type": "string", "value": "main"},
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -1225,7 +1217,6 @@ def test_ai_spans_example_transaction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.status_code": {"type": "string", "value": "200"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down Expand Up @@ -1299,7 +1290,6 @@ def test_ai_spans_example_transaction(
"sentry.span.source": {"type": "string", "value": "custom"},
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "main"},
"sentry.transaction.op": {
"type": "string",
"value": "gen_ai.invoke_agent",
Expand Down
3 changes: 0 additions & 3 deletions tests/integration/test_spans.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ def test_span_extraction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.segment.name": {"type": "string", "value": "hi"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "hi"},
"sentry.transaction.op": {"type": "string", "value": "hi"},
"sentry.user": {"type": "string", "value": f"id:{user_id}"},
"sentry.user.geo.city": {"type": "string", "value": "Vienna"},
Expand Down Expand Up @@ -245,7 +244,6 @@ def test_span_extraction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.segment.name": {"type": "string", "value": "hi"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction": {"type": "string", "value": "hi"},
"sentry.transaction.op": {"type": "string", "value": "hi"},
"sentry.user": {"type": "string", "value": f"id:{user_id}"},
"sentry.user.geo.city": {"type": "string", "value": "Vienna"},
Expand Down Expand Up @@ -336,7 +334,6 @@ def test_span_extraction(
"sentry.status": {"type": "string", "value": "ok"},
"sentry.trace.status": {"type": "string", "value": "ok"},
"sentry.transaction.op": {"type": "string", "value": "hi"},
"sentry.transaction": {"type": "string", "value": "hi"},
"sentry.user": {"type": "string", "value": f"id:{user_id}"},
"sentry.user.geo.city": {"type": "string", "value": "Vienna"},
"sentry.user.geo.country_code": {"type": "string", "value": "AT"},
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/test_spans_standalone.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ def test_lcp_span(
"replay_id": None,
"sentry.report_event": {"type": "string", "value": "navigation"},
"sentry.segment.name": {"type": "string", "value": "/insights/projects/*"},
"sentry.transaction": {"type": "string", "value": "/insights/projects/*"},
"transaction": None,
"user_agent.original": {
"type": "string",
Expand Down Expand Up @@ -464,7 +463,6 @@ def test_cls_span(
"replay_id": None,
"sentry.report_event": {"type": "string", "value": "navigation"},
"sentry.segment.name": {"type": "string", "value": "/insights/projects/*"},
"sentry.transaction": {"type": "string", "value": "/insights/projects/*"},
"transaction": None,
"user_agent.original": {
"type": "string",
Expand Down Expand Up @@ -653,7 +651,6 @@ def test_inp_span(
},
"replay_id": None,
"sentry.segment.name": {"type": "string", "value": "/insights/projects/*"},
"sentry.transaction": {"type": "string", "value": "/insights/projects/*"},
"transaction": None,
"user_agent.original": {
"type": "string",
Expand Down Expand Up @@ -1019,7 +1016,6 @@ def test_ua_ip_inference(
"replay_id": None,
"sentry.report_event": {"type": "string", "value": "navigation"},
"sentry.segment.name": {"type": "string", "value": "/insights/projects/"},
"sentry.transaction": {"type": "string", "value": "/insights/projects/"},
"transaction": None,
"user_agent.original": {
"type": "string",
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/test_spansv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -2019,10 +2019,6 @@ def test_spansv2_lcp_segment(mini_sentry, relay_with_processing, spans_consumer)
"type": "string",
"value": "a84cb30362883928",
},
"sentry.transaction": {
"type": "string",
"value": "/issues/",
},
"user_agent.original": {
"type": "string",
"value": "RelayIntegrationTests/1.0.0 Firefox/42.0",
Expand Down
1 change: 0 additions & 1 deletion tests/integration/test_spansv2_otel.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ def test_span_ingestion(
"sentry.relay.pipeline": {"type": "string", "value": "span_v2"},
"sentry.segment.id": {"type": "string", "value": "f0b809703e783d00"},
"sentry.segment.name": {"type": "string", "value": "A Proto Span"},
"sentry.transaction": {"type": "string", "value": "A Proto Span"},
"sentry.kind": {"type": "string", "value": "server"},
"ui.component_name": {"type": "string", "value": "MyComponent"},
},
Expand Down
Loading