Skip to content

fix: Use proto version 2 to fix backfilled user agent and IP #6256

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
sentrivana merged 6 commits into from
May 12, 2026
Merged

fix: Use proto version 2 to fix backfilled user agent and IP #6256

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3461aff
fix: Send ingest_settings to fix backfilled user agent and IP
sentrivana May 12, 2026
b01ad06
smaller envelopes
sentrivana May 12, 2026
cf8629d
add to tests
sentrivana May 12, 2026
75e0c80
Merge branch 'master' into ivana/send-ingest-settings
sentrivana May 12, 2026
5bc89ae
.
sentrivana May 12, 2026
e8be248
test
sentrivana May 12, 2026
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: 2 additions & 1 deletion sentry_sdk/_batcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,10 @@ def _add_to_envelope(self, envelope: "Envelope") -> None:
},
payload=PayloadRef(
json={
"version": 2,
"items": [
self._to_transport_format(item) for item in self._buffer
]
],
Comment thread
cursor[bot] marked this conversation as resolved.
}
),
)
Expand Down
3 changes: 2 additions & 1 deletion sentry_sdk/_span_batcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,11 @@ def _flush(self, only_pending: bool = False) -> None:
},
payload=PayloadRef(
json={
"version": 2,
"items": [
self._to_transport_format(spans[j])
for j in range(start, end)
]
],
}
),
)
Expand Down
3 changes: 2 additions & 1 deletion tests/test_logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ def test_transport_format(sentry_init, capture_envelopes):
"content_type": "application/vnd.sentry.items.log+json",
}
assert item.payload.json == {
"version": 2,
"items": [
{
"body": "This is a log...",
Expand Down Expand Up @@ -504,7 +505,7 @@ def test_transport_format(sentry_init, capture_envelopes):
},
},
}
]
],
}


Expand Down
3 changes: 2 additions & 1 deletion tests/test_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ def test_transport_format(sentry_init, capture_envelopes):
"content_type": "application/vnd.sentry.items.trace-metric+json",
}
assert item.payload.json == {
"version": 2,
"items": [
{
"name": "test.counter",
Expand Down Expand Up @@ -297,7 +298,7 @@ def test_transport_format(sentry_init, capture_envelopes):
},
},
}
]
],
}


Expand Down
3 changes: 2 additions & 1 deletion tests/tracing/test_span_batcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ def test_transport_format(sentry_init, capture_envelopes):
"content_type": "application/vnd.sentry.items.span.v2+json",
}
assert item.payload.json == {
"version": 2,
"items": [
{
"trace_id": mock.ANY,
Expand All @@ -417,7 +418,7 @@ def test_transport_format(sentry_init, capture_envelopes):
"end_timestamp": mock.ANY,
"attributes": mock.ANY,
}
]
],
}
for attribute, value in item.payload.json["items"][0]["attributes"].items():
assert isinstance(attribute, str)
Expand Down
Loading