sentry-arroyo 2.27.0__tar.gz → 2.28.0__tar.gz

{sentry_arroyo-2.27.0/sentry_arroyo.egg-info → sentry_arroyo-2.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-arroyo
-Version: 2.27.0
+Version: 2.28.0
 Summary: Arroyo is a Python library for working with streaming data.
 Home-page: https://github.com/getsentry/arroyo
 Author: Sentry

{sentry_arroyo-2.27.0 → sentry_arroyo-2.28.0}/arroyo/processing/processor.py

@@ -29,7 +29,7 @@ from arroyo.processing.strategies.abstract import (
 )
 from arroyo.types import BrokerValue, Message, Partition, Topic, TStrategyPayload
 from arroyo.utils.logging import handle_internal_error
-from arroyo.utils.metrics import get_consumer_metrics
+from arroyo.utils.metrics import get_metrics
 
 logger = logging.getLogger(__name__)
 
@@ -90,7 +90,7 @@ ConsumerCounter = Literal[
 
 class MetricsBuffer:
     def __init__(self) -> None:
-        self.metrics = get_consumer_metrics()
+        self.metrics = get_metrics()
         self.__timers: MutableMapping[ConsumerTiming, float] = defaultdict(float)
         self.__counters: MutableMapping[ConsumerCounter, int] = defaultdict(int)
         self.__reset()
@@ -195,7 +195,6 @@ class StreamProcessor(Generic[TStrategyPayload]):
         def on_partitions_assigned(partitions: Mapping[Partition, int]) -> None:
             logger.info("New partitions assigned: %r", partitions)
             logger.info("Member id: %r", self.__consumer.member_id)
-            self.__metrics_buffer.metrics.consumer_member_id = self.__consumer.member_id
 
             self.__metrics_buffer.metrics.increment(
                 "arroyo.consumer.partitions_assigned.count", len(partitions)

{sentry_arroyo-2.27.0 → sentry_arroyo-2.28.0}/arroyo/utils/metrics.py

@@ -45,45 +45,6 @@ class Metrics(Protocol):
         raise NotImplementedError
 
 
-class ConsumerMetricsWrapper(Metrics):
-    """
-    A wrapper around a metrics backend that automatically adds consumer_member_id
-    to all metrics calls.
-
-    Right now we only use this to add tags to the metrics emitted by
-    StreamProcessor, but ideally all metrics, even those emitted by strategies
-    and application code, would get this tag. The metrics abstraction in arroyo
-    is not sufficient for this. We'd have to add a "add_global_tags" method
-    (similar to the concept of global tags in sentry) and users would have to
-    implement it.
-    """
-
-    def __init__(self, metrics: Metrics) -> None:
-        self.__metrics = metrics
-        self.consumer_member_id = ""
-
-    def _add_consumer_tag(self, tags: Optional[Tags]) -> Tags:
-        return {**(tags or {}), "consumer_member_id": self.consumer_member_id}
-
-    def increment(
-        self,
-        name: MetricName,
-        value: Union[int, float] = 1,
-        tags: Optional[Tags] = None,
-    ) -> None:
-        self.__metrics.increment(name, value, tags=self._add_consumer_tag(tags))
-
-    def gauge(
-        self, name: MetricName, value: Union[int, float], tags: Optional[Tags] = None
-    ) -> None:
-        self.__metrics.gauge(name, value, tags=self._add_consumer_tag(tags))
-
-    def timing(
-        self, name: MetricName, value: Union[int, float], tags: Optional[Tags] = None
-    ) -> None:
-        self.__metrics.timing(name, value, tags=self._add_consumer_tag(tags))
-
-
 class DummyMetricsBackend(Metrics):
     """
     Default metrics backend that does not record anything.
@@ -172,12 +133,4 @@ def get_metrics() -> Metrics:
     return _metrics_backend
 
 
-def get_consumer_metrics() -> ConsumerMetricsWrapper:
-    """
-    Get a metrics backend that automatically adds consumer_member_id to all metrics.
-    """
-    base_metrics = get_metrics()
-    return ConsumerMetricsWrapper(base_metrics)
-
-
-__all__ = ["configure_metrics", "Metrics", "MetricName", "Tags", "get_consumer_metrics"]
+__all__ = ["configure_metrics", "Metrics", "MetricName", "Tags"]

{sentry_arroyo-2.27.0 → sentry_arroyo-2.28.0/sentry_arroyo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-arroyo
-Version: 2.27.0
+Version: 2.28.0
 Summary: Arroyo is a Python library for working with streaming data.
 Home-page: https://github.com/getsentry/arroyo
 Author: Sentry

{sentry_arroyo-2.27.0 → sentry_arroyo-2.28.0}/setup.py

@@ -10,7 +10,7 @@ def get_requirements() -> Sequence[str]:
 
 setup(
     name="sentry-arroyo",
-    version="2.27.0",
+    version="2.28.0",
     author="Sentry",
     author_email="oss@sentry.io",
     license="Apache-2.0",

sentry_arroyo-2.28.0/tests/utils/test_metrics.py

@@ -0,0 +1,33 @@
+import pytest
+
+from arroyo.utils.metrics import Gauge, MetricName, configure_metrics, get_metrics
+from tests.metrics import Gauge as GaugeCall
+from tests.metrics import TestingMetricsBackend, _TestingMetricsBackend
+
+
+def test_gauge_simple() -> None:
+    backend = TestingMetricsBackend
+
+    name: MetricName = "name"  # type: ignore
+    tags = {"tag": "value"}
+    gauge = Gauge(backend, name, tags)
+
+    with gauge:
+        pass
+
+    assert backend.calls == [
+        GaugeCall(name, 0.0, tags),
+        GaugeCall(name, 1.0, tags),
+        GaugeCall(name, 0.0, tags),
+    ]
+
+
+def test_configure_metrics() -> None:
+    assert get_metrics() == TestingMetricsBackend
+
+    with pytest.raises(AssertionError):
+        configure_metrics(_TestingMetricsBackend())
+
+    # Can be reset to something else with force
+    configure_metrics(_TestingMetricsBackend(), force=True)
+    assert get_metrics() != TestingMetricsBackend

sentry_arroyo-2.27.0/tests/utils/test_metrics.py

@@ -1,84 +0,0 @@
-import pytest
-
-from arroyo.utils.metrics import (
-    Gauge,
-    MetricName,
-    configure_metrics,
-    get_consumer_metrics,
-    get_metrics,
-)
-from tests.metrics import Gauge as GaugeCall
-from tests.metrics import (
-    Increment,
-    TestingMetricsBackend,
-    Timing,
-    _TestingMetricsBackend,
-)
-
-
-def test_gauge_simple() -> None:
-    backend = TestingMetricsBackend
-
-    name: MetricName = "name"  # type: ignore
-    tags = {"tag": "value"}
-    gauge = Gauge(backend, name, tags)
-
-    with gauge:
-        pass
-
-    assert backend.calls == [
-        GaugeCall(name, 0.0, tags),
-        GaugeCall(name, 1.0, tags),
-        GaugeCall(name, 0.0, tags),
-    ]
-
-
-def test_configure_metrics() -> None:
-    assert get_metrics() == TestingMetricsBackend
-
-    with pytest.raises(AssertionError):
-        configure_metrics(_TestingMetricsBackend())
-
-    # Can be reset to something else with force
-    configure_metrics(_TestingMetricsBackend(), force=True)
-    assert get_metrics() != TestingMetricsBackend
-
-
-def test_consumer_metrics_wrapper() -> None:
-    """Test that ConsumerMetricsWrapper automatically adds consumer_member_id to all metrics."""
-    # Reset to a fresh backend
-    backend = _TestingMetricsBackend()
-    configure_metrics(backend, force=True)
-
-    consumer_member_id = "test-consumer-123"
-    consumer_metrics = get_consumer_metrics()
-    consumer_metrics.consumer_member_id = consumer_member_id
-
-    # Test increment
-    consumer_metrics.increment("arroyo.consumer.run.count", 5, tags={"extra": "tag"})
-
-    # Test gauge
-    consumer_metrics.gauge("arroyo.consumer.librdkafka.total_queue_size", 10.5)
-
-    # Test timing
-    consumer_metrics.timing("arroyo.consumer.poll.time", 100, tags={"another": "tag"})
-
-    expected_calls = [
-        Increment(
-            "arroyo.consumer.run.count",
-            5,
-            {"consumer_member_id": consumer_member_id, "extra": "tag"},
-        ),
-        GaugeCall(
-            "arroyo.consumer.librdkafka.total_queue_size",
-            10.5,
-            {"consumer_member_id": consumer_member_id},
-        ),
-        Timing(
-            "arroyo.consumer.poll.time",
-            100,
-            {"consumer_member_id": consumer_member_id, "another": "tag"},
-        ),
-    ]
-
-    assert backend.calls == expected_calls