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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
**Bug Fixes**:

- Make referer optional in Vercel Log Drain Transform. ([#5273](https://github.com/getsentry/relay/pull/5273))
- Use `vercel.path` instead of `url.path` for Vercel Log Drain Transform. ([#5274](https://github.com/getsentry/relay/pull/5274))

**Internal**:

- Switch default allocator from jemalloc to mimalloc. ([#5239](https://github.com/getsentry/relay/pull/5239))
- Add internal attributes to aid searching trace metrics. ([#5260](https://github.com/getsentry/relay/pull/5260))


## 25.10.0

**Features**:
Expand Down
20 changes: 10 additions & 10 deletions relay-ourlogs/src/vercel_to_sentry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use std::str::FromStr;

use chrono::{TimeZone, Utc};
use relay_conventions::{ENVIRONMENT, ORIGIN, SERVER_ADDRESS, URL_PATH};
use relay_conventions::{ENVIRONMENT, ORIGIN, SERVER_ADDRESS};
use relay_event_schema::protocol::{Attributes, OurLog, OurLogLevel, SpanId, Timestamp, TraceId};
use relay_protocol::{Annotated, Meta, Remark, RemarkType};
use serde::{Deserialize, Deserializer};
Expand Down Expand Up @@ -243,7 +243,7 @@ pub fn vercel_log_to_sentry_log(vercel_log: VercelLog) -> OurLog {
add_optional_attribute!("vercel.build_id", build_id);
add_optional_attribute!("vercel.entrypoint", entrypoint);
add_optional_attribute!("vercel.destination", destination);
add_optional_attribute!(URL_PATH, path);
add_optional_attribute!("vercel.path", path);
add_optional_attribute!("vercel.log_type", ty);
add_optional_attribute!("vercel.status_code", status_code);
add_optional_attribute!("vercel.request_id", request_id);
Expand Down Expand Up @@ -402,10 +402,6 @@ mod tests {
"type": "string",
"value": "my-app-abc123.vercel.app"
},
"url.path": {
"type": "string",
"value": "/api/users"
},
"vercel.branch": {
"type": "string",
"value": "main"
Expand Down Expand Up @@ -450,6 +446,10 @@ mod tests {
"type": "string",
"value": "stdout"
},
"vercel.path": {
"type": "string",
"value": "/api/users"
},
"vercel.project_id": {
"type": "string",
"value": "gdufoJxB6b9b1fEqr1jUtFkyavUU"
Expand Down Expand Up @@ -614,10 +614,6 @@ mod tests {
"type": "string",
"value": "my-app-abc123.vercel.app"
},
"url.path": {
"type": "string",
"value": "/api/users"
},
"vercel.deployment_id": {
"type": "string",
"value": "dpl_233NRGRjVZX1caZrXWtz5g1TAksD"
Expand All @@ -634,6 +630,10 @@ mod tests {
"type": "string",
"value": "1573817250283254651097202070"
},
"vercel.path": {
"type": "string",
"value": "/api/users"
},
"vercel.project_id": {
"type": "string",
"value": "gdufoJxB6b9b1fEqr1jUtFkyavUU"
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/test_vercel_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"itemType": "TRACE_ITEM_TYPE_LOG",
"timestamp": mock.ANY,
"attributes": {
"url.path": {"stringValue": "/api/users"},
"vercel.path": {"stringValue": "/api/users"},
"sentry.browser.version": {"stringValue": "2.32"},
"vercel.proxy.scheme": {"stringValue": "https"},
"vercel.entrypoint": {"stringValue": "api/index.js"},
Expand Down Expand Up @@ -129,7 +129,7 @@
"vercel.proxy.status_code": {"intValue": "200"},
"sentry.observed_timestamp_nanos": {"stringValue": mock.ANY},
"sentry.timestamp_precise": {"intValue": "1573817250283000000"},
"sentry.payload_size_bytes": {"intValue": "886"},
"sentry.payload_size_bytes": {"intValue": "889"},
"vercel.proxy.region": {"stringValue": "sfo1"},
},
"clientSampleRate": 1.0,
Expand Down Expand Up @@ -186,7 +186,7 @@ def test_vercel_logs_json_array(
"org_id": 1,
"outcome": 0,
"project_id": 42,
"quantity": 1322,
"quantity": 1325,
},
]

Expand Down Expand Up @@ -234,6 +234,6 @@ def test_vercel_logs_ndjson(
"org_id": 1,
"outcome": 0,
"project_id": 42,
"quantity": 1322,
"quantity": 1325,
},
]
Loading