Skip to content

fix(logs): Set logs retention to 30 days for full fidelity and downsampled datasets #5065

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 10 commits into from
Aug 25, 2025
Merged

fix(logs): Set logs retention to 30 days for full fidelity and downsampled datasets #5065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6719352
fix(logs): Use full fidelity retention for logs until we decide other…
phacops Aug 14, 2025
cd8dfa0
Add a CHANGELOG entry
phacops Aug 14, 2025
834ff96
Hardcode retention to 30 days until we have the per data category ret…
phacops Aug 14, 2025
df5f1fa
Change the value when we look it up in the projectconfig instead
phacops Aug 16, 2025
ebdb1d1
Fix tests
phacops Aug 16, 2025
ff311c9
Merge branch 'master' into pierre/change-downsampled-retention-for-logs
phacops Aug 16, 2025
8f3b0dc
Remove commented code
phacops Aug 16, 2025
9c6f382
Fix CHANGELOG entry
phacops Aug 16, 2025
d7829d8
Merge branch 'master' into pierre/change-downsampled-retention-for-logs
phacops Aug 25, 2025
917a0d0
Fix integration tests
phacops Aug 25, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

**Internal**:

- Set the default log retention to 30 days for full fidelity and downsampled data. ([#5065](https://github.com/getsentry/relay/pull/5065))
- Improved PII Scrubbing for attributes / logs ([#5061](https://github.com/getsentry/relay/pull/5061)))

## 25.8.0
Expand Down
1 change: 1 addition & 0 deletions relay-server/src/processing/logs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ impl Forward for LogOutput {
let ctx = store::Context {
scoping,
received_at,
// Hard-code retentions until we have a per data category retention
retention: retentions.0,
downsampled_retention: retentions.1,
};
Expand Down
8 changes: 5 additions & 3 deletions relay-server/src/processing/logs/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ pub fn expand(logs: Managed<SerializedLogs>, _ctx: Context<'_>) -> Managed<Expan

ExpandedLogs {
headers: logs.headers,
logs: all_logs,
// Hard code both retentions for logs launch until we have separate retentions for
// different data categories.
#[cfg(feature = "processing")]
retention: _ctx.project_info.config.event_retention,
Copy link
Member

@Dav1dde Dav1dde Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the function no longer needs _ctx as an argument.

retention: Some(30),
#[cfg(feature = "processing")]
downsampled_retention: _ctx.project_info.config.downsampled_event_retention,
logs: all_logs,
downsampled_retention: Some(30),
Copy link

@cursor cursor bot Aug 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Log Retention Mismatch

Logs are currently assigned a downsampled_retention of Some(30). This contradicts the stated intention that logs should not have downsampled retention yet, implying it should be None.

Fix in Cursor Fix in Web

Copy link
Member

@Dav1dde Dav1dde Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can just remove downsampled_retention and retention alltogether from the ExpandedLogs struct now and then have the retentions as a const somewhere in logs/store.rs.

}
})
}
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/test_ourlogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def test_ourlog_extraction_with_otel_logs(
"organizationId": "1",
"projectId": "42",
"received": time_within_delta(),
"retentionDays": 90,
"retentionDays": 30,
"serverSampleRate": 1.0,
"timestamp": time_within_delta(
ts, delta=timedelta(seconds=1), expect_resolution="ns"
Expand Down Expand Up @@ -312,7 +312,7 @@ def test_ourlog_extraction_with_sentry_logs(
"organizationId": "1",
"projectId": "42",
"received": time_within_delta(),
"retentionDays": 90,
"retentionDays": 30,
"serverSampleRate": 1.0,
"timestamp": time_within_delta(
ts, delta=timedelta(seconds=1), expect_resolution="ns"
Expand Down Expand Up @@ -354,7 +354,7 @@ def test_ourlog_extraction_with_sentry_logs(
"organizationId": "1",
"projectId": "42",
"received": time_within_delta(),
"retentionDays": 90,
"retentionDays": 30,
"serverSampleRate": 1.0,
"timestamp": time_within_delta(
ts, delta=timedelta(seconds=1), expect_resolution="ns"
Expand Down Expand Up @@ -628,7 +628,7 @@ def test_ourlog_extraction_default_pii_scrubbing_does_not_scrub_default_attribut
"organizationId": "1",
"projectId": "42",
"received": time_within_delta(),
"retentionDays": 90,
"retentionDays": 30,
"serverSampleRate": 1.0,
"timestamp": time_within_delta(
ts, delta=timedelta(seconds=1), expect_resolution="ns"
Expand Down Expand Up @@ -685,7 +685,7 @@ def test_ourlog_extraction_with_sentry_logs_with_missing_fields(
"organizationId": "1",
"projectId": "42",
"received": time_within_delta(),
"retentionDays": 90,
"retentionDays": 30,
"serverSampleRate": 1.0,
"timestamp": time_within_delta(
ts, delta=timedelta(seconds=1), expect_resolution="ns"
Expand Down Expand Up @@ -813,7 +813,7 @@ def test_browser_name_version_extraction(
"organizationId": "1",
"projectId": "42",
"received": time_within_delta(),
"retentionDays": 90,
"retentionDays": 30,
"serverSampleRate": 1.0,
"timestamp": time_within_delta(
ts, delta=timedelta(seconds=1), expect_resolution="ns"
Expand Down
Loading