Switch to UsageSetCounter

joe4dev · joe4dev · commit e28afddd10cf · 2024-11-26T17:16:03.000+01:00
diff --git a/localstack-core/localstack/utils/analytics/usage.py b/localstack-core/localstack/utils/analytics/usage.py
@@ -1,6 +1,5 @@
 import datetime
 import math
-import threading
 from collections import defaultdict
 from itertools import count
 from typing import Any
@@ -50,66 +49,6 @@ def aggregate(self) -> dict:
         return self.state
 
 
-class UsageMultiSetCounter:
-    """
-    Use this counter to count occurrences of unique values for multiple dimensions.
-    This dynamically creates UsageSetCounters and should be used with care (i.e., with limited keys).
-
-    Example:
-
-    my_feature_counter = UsageMultiSetCounter("pipes:invocation")
-    my_feature_counter.record("aws:sqs", "aws:lambda")
-    my_feature_counter.record("aws:sqs", "aws:lambda")
-    my_feature_counter.record("aws:sqs", "aws:stepfunctions")
-    my_feature_counter.record("aws:kinesis", "aws:lambda")
-    aggregate is implemented for each counter individually
-
-    my_feature_counter.aggregate() is available for testing purposes:
-    {
-       "aws:sqs": {
-         "aws:lambda": 2,
-         "aws:stepfunctions": 1,
-       },
-       "aws:kinesis": {
-         "aws:lambda": 1
-       }
-    }
-    """
-
-    namespace: str
-    _counters: dict[str, UsageSetCounter]
-    lock = threading.Lock()
-
-    def __init__(self, namespace: str):
-        self._counters = {}
-        self.namespace = namespace
-
-    def record(self, key: str, value: str):
-        namespace = f"{self.namespace}:{key}"
-        if namespace in self._counters:
-            set_counter = self._counters[namespace]
-        else:
-            with self.lock:
-                if namespace in self._counters:
-                    set_counter = self._counters[namespace]
-                else:
-                    # We cannot use setdefault here because Python always instantiates a new UsageSetCounter,
-                    # which overwrites the collector_registry
-                    set_counter = UsageSetCounter(namespace)
-                    self._counters[namespace] = set_counter
-
-        self._counters[namespace] = set_counter
-        set_counter.record(value)
-
-    def aggregate(self) -> dict:
-        """aggregate is invoked on a per UsageSetCounter level because each counter is registered individually.
-        This utility is only for testing!"""
-        merged_dict = {}
-        for namespace, counter in self._counters.items():
-            merged_dict[namespace] = counter.aggregate()
-        return merged_dict
-
-
 class UsageCounter:
     """
     Use this counter to count numeric values
diff --git a/tests/unit/utils/analytics/test_usage.py b/tests/unit/utils/analytics/test_usage.py
@@ -1,4 +1,4 @@
-from localstack.utils.analytics.usage import UsageMultiSetCounter, UsageSetCounter
+from localstack.utils.analytics.usage import UsageSetCounter
 
 
 def test_set_counter():
@@ -7,23 +7,3 @@ def test_set_counter():
     my_feature_counter.record("nodejs16.x")
     my_feature_counter.record("nodejs16.x")
     assert my_feature_counter.aggregate() == {"python3.7": 1, "nodejs16.x": 2}
-
-
-def test_multi_set_counter():
-    my_feature_counter = UsageMultiSetCounter("pipes:invocation")
-    my_feature_counter.record("aws:sqs", "aws:lambda")
-    my_feature_counter.record("aws:sqs", "aws:lambda")
-    my_feature_counter.record("aws:sqs", "aws:stepfunctions")
-    my_feature_counter.record("aws:kinesis", "aws:lambda")
-    assert my_feature_counter.aggregate() == {
-        "pipes:invocation:aws:sqs": {
-            "aws:lambda": 2,
-            "aws:stepfunctions": 1,
-        },
-        "pipes:invocation:aws:kinesis": {"aws:lambda": 1},
-    }
-    assert my_feature_counter._counters["pipes:invocation:aws:sqs"].state == {
-        "aws:lambda": 2,
-        "aws:stepfunctions": 1,
-    }
-    assert my_feature_counter._counters["pipes:invocation:aws:kinesis"].state == {"aws:lambda": 1}
