Browse Source

ref: bump sentry-arroyo to 2.14.17 (#59465)

Trying this again. Fix for INC-552 (carried over backpressure state
during rebalance) is now included in this release. (the 2.14.16 had to
be reverted for this reason)
Sentry Bot 1 year ago
parent
commit
dbab50a7ed

+ 2 - 1
requirements-base.txt

@@ -59,7 +59,8 @@ requests>=2.25.1
 rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
-sentry-arroyo>=2.14.12
+sentry-arroyo>=2.14.17
+sentry-kafka-schemas>=0.1.33
 sentry-kafka-schemas>=0.1.34
 sentry-redis-tools>=0.1.7
 sentry-relay>=0.8.33

+ 1 - 1
requirements-dev-frozen.txt

@@ -167,7 +167,7 @@ rfc3986-validator==0.1.1
 rsa==4.8
 s3transfer==0.6.1
 selenium==4.3.0
-sentry-arroyo==2.14.12
+sentry-arroyo==2.14.17
 sentry-cli==2.16.0
 sentry-forked-django-stubs==4.2.6.post2
 sentry-forked-djangorestframework-stubs==3.14.4.post2

+ 1 - 1
requirements-frozen.txt

@@ -111,7 +111,7 @@ rfc3339-validator==0.1.2
 rfc3986-validator==0.1.1
 rsa==4.8
 s3transfer==0.6.1
-sentry-arroyo==2.14.12
+sentry-arroyo==2.14.17
 sentry-kafka-schemas==0.1.34
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.33

+ 1 - 1
src/sentry/consumers/synchronized.py

@@ -164,7 +164,7 @@ class SynchronizedConsumer(Consumer[TStrategyPayload]):
             if commit.orig_message_ts is not None:
                 metrics.timing(
                     "commit_log_msg_latency",
-                    (now - datetime.timestamp(commit.orig_message_ts)) * 1000,
+                    (now - commit.orig_message_ts) * 1000,
                     tags={
                         "partition": str(commit.partition.index),
                         "group": commit.group,

+ 21 - 8
tests/sentry/consumers/test_synchronized.py

@@ -112,7 +112,8 @@ def test_synchronized_consumer() -> None:
                         "leader-a",
                         Partition(topic, 0),
                         messages[0].next_offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     ),
                 ),
             ).result(),
@@ -134,7 +135,8 @@ def test_synchronized_consumer() -> None:
                         "leader-b",
                         Partition(topic, 0),
                         messages[0].next_offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     )
                 ),
             ).result(),
@@ -164,7 +166,13 @@ def test_synchronized_consumer() -> None:
         producer.produce(
             commit_log_topic,
             commit_codec.encode(
-                Commit("leader-a", Partition(topic, 0), messages[3].offset, datetime.now())
+                Commit(
+                    "leader-a",
+                    Partition(topic, 0),
+                    messages[3].offset,
+                    datetime.now().timestamp(),
+                    None,
+                )
             ),
         ).result()
 
@@ -177,7 +185,8 @@ def test_synchronized_consumer() -> None:
                         "leader-b",
                         Partition(topic, 0),
                         messages[5].offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     )
                 ),
             ).result(),
@@ -218,7 +227,8 @@ def test_synchronized_consumer() -> None:
                         "leader-a",
                         Partition(topic, 0),
                         messages[5].offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     )
                 ),
             ).result(),
@@ -280,7 +290,8 @@ def test_synchronized_consumer_pause_resume() -> None:
                         "leader",
                         Partition(topic, 0),
                         messages[0].next_offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     )
                 ),
             ).result(),
@@ -356,7 +367,8 @@ def test_synchronized_consumer_handles_end_of_partition() -> None:
                         "leader",
                         Partition(topic, 0),
                         messages[0].next_offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     ),
                 ),
             ).result(),
@@ -375,7 +387,8 @@ def test_synchronized_consumer_handles_end_of_partition() -> None:
                         "leader",
                         Partition(topic, 0),
                         messages[1].next_offset,
-                        datetime.now(),
+                        datetime.now().timestamp(),
+                        None,
                     ),
                 ),
             ).result(),