Skip to content

Commit 7d723dc

Browse files
wedamijagetsantry[bot]untitakerJoshFerge
authored
chore: Bump sentry-arroyo to 2.18.2 (#81270)
Bumping this to latest for some fixes <!-- Describe your PR here. --> --------- Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com> Co-authored-by: Markus Unterwaditzer <[email protected]> Co-authored-by: Josh Ferge <[email protected]>
1 parent f155630 commit 7d723dc

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed

requirements-base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ requests>=2.32.3
6565
rfc3339-validator>=0.1.2
6666
rfc3986-validator>=0.1.1
6767
# [end] jsonschema format validators
68-
sentry-arroyo>=2.16.5
68+
sentry-arroyo>=2.18.2
6969
sentry-kafka-schemas>=0.1.122
7070
sentry-ophio==1.0.0
7171
sentry-protos>=0.1.37

requirements-dev-frozen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ rpds-py==0.20.0
180180
rsa==4.8
181181
s3transfer==0.10.0
182182
selenium==4.16.0
183-
sentry-arroyo==2.16.5
183+
sentry-arroyo==2.18.2
184184
sentry-cli==2.16.0
185185
sentry-covdefaults-disable-branch-coverage==1.0.2
186186
sentry-devenv==1.14.2

requirements-frozen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ rfc3986-validator==0.1.1
124124
rpds-py==0.20.0
125125
rsa==4.8
126126
s3transfer==0.10.0
127-
sentry-arroyo==2.16.5
127+
sentry-arroyo==2.18.2
128128
sentry-kafka-schemas==0.1.122
129129
sentry-ophio==1.0.0
130130
sentry-protos==0.1.37

src/sentry/consumers/synchronized.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,3 +300,7 @@ def close(self, timeout: float | None = None) -> None:
300300
@property
301301
def closed(self) -> bool:
302302
return self.__consumer.closed
303+
304+
@property
305+
def member_id(self) -> str:
306+
return self.__consumer.member_id

src/sentry/spans/consumers/process/factory.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import logging
33
from collections import defaultdict
44
from collections.abc import Mapping
5+
from datetime import datetime
56
from typing import Any
67

78
import orjson
@@ -15,7 +16,15 @@
1516
from arroyo.processing.strategies.produce import Produce
1617
from arroyo.processing.strategies.run_task import RunTask
1718
from arroyo.processing.strategies.unfold import Unfold
18-
from arroyo.types import FILTERED_PAYLOAD, BrokerValue, Commit, FilteredPayload, Message, Partition
19+
from arroyo.types import (
20+
FILTERED_PAYLOAD,
21+
BrokerValue,
22+
Commit,
23+
FilteredPayload,
24+
Message,
25+
Partition,
26+
Value,
27+
)
1928
from sentry_kafka_schemas.codecs import Codec
2029
from sentry_kafka_schemas.schema_types.snuba_spans_v1 import SpanEvent
2130

@@ -196,7 +205,7 @@ def batch_write_to_redis(
196205

197206
def _expand_segments(should_process_segments: list[ProcessSegmentsContext]):
198207
with sentry_sdk.start_transaction(op="process", name="spans.process.expand_segments") as txn:
199-
buffered_segments: list[KafkaPayload | FilteredPayload] = []
208+
buffered_segments: list[Value] = []
200209

201210
for result in should_process_segments:
202211
timestamp = result.timestamp
@@ -235,7 +244,13 @@ def _expand_segments(should_process_segments: list[ProcessSegmentsContext]):
235244
metrics.incr("performance.buffered_segments.max_payload_size_exceeded")
236245
continue
237246

238-
buffered_segments.append(KafkaPayload(None, payload_data, []))
247+
buffered_segments.append(
248+
Value(
249+
KafkaPayload(None, payload_data, []),
250+
{},
251+
datetime.fromtimestamp(timestamp),
252+
)
253+
)
239254

240255
return buffered_segments
241256

0 commit comments

Comments
 (0)