reach_commons 0.18.29__tar.gz → 0.18.31__tar.gz

{reach_commons-0.18.29 → reach_commons-0.18.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reach_commons
-Version: 0.18.29
+Version: 0.18.31
 Summary: Reach Commons is a versatile utility library designed to streamline and enhance development workflows within the Reach ecosystem.
 License: MIT
 Author: Engineering

{reach_commons-0.18.29 → reach_commons-0.18.31}/pyproject.toml

@@ -1,7 +1,7 @@
 # isort .; black .; poetry build; poetry publish
 [tool.poetry]
 name = "reach_commons"
-version = "0.18.29"
+version = "0.18.31"
 description = "Reach Commons is a versatile utility library designed to streamline and enhance development workflows within the Reach ecosystem."
 authors = ["Engineering <engineering@getreach.ai>"]
 license = "MIT"

{reach_commons-0.18.29 → reach_commons-0.18.31}/reach_commons/reach_aws/sqs.py

@@ -164,7 +164,6 @@ class SQSClient(BaseSQSClient):
                     "ApproximateNumberOfMessages",  # visible
                     "ApproximateNumberOfMessagesNotVisible",  # in-flight
                     "ApproximateNumberOfMessagesDelayed",  # delayed
-                    "ApproximateAgeOfOldestMessage",
                 ],
             )
 
@@ -173,14 +172,8 @@ class SQSClient(BaseSQSClient):
             visible = int(attrs.get("ApproximateNumberOfMessages", 0))
             in_flight = int(attrs.get("ApproximateNumberOfMessagesNotVisible", 0))
             delayed = int(attrs.get("ApproximateNumberOfMessagesDelayed", 0))
-            oldest_age_seconds = int(attrs.get("ApproximateAgeOfOldestMessage", 0))
 
-            return {
-                "visible": visible,
-                "in_flight": in_flight,
-                "delayed": delayed,
-                "oldest_age_seconds": oldest_age_seconds,
-            }
+            return {"visible": visible, "in_flight": in_flight, "delayed": delayed}
 
         except ClientError as exc:
             self.logger.error(
@@ -225,28 +218,30 @@ class SQSClient(BaseSQSClient):
         visible = metrics["visible"]
         in_flight = metrics["in_flight"]
         delayed = metrics["delayed"]
-        oldest_age_seconds = metrics["oldest_age_seconds"]
 
-        total_active = visible + in_flight
+        logical_visible = visible + delayed
+
+        total_messages = visible + in_flight + delayed
 
-        over_visible = visible >= max_visible_capacity
+        over_visible = logical_visible >= max_visible_capacity
         over_total = (
-            max_total_capacity is not None and total_active >= max_total_capacity
+            max_total_capacity is not None and total_messages >= max_total_capacity
         )
 
         if over_visible or over_total:
             self.logger.warning(
                 (
                     "queue_over_capacity, topic_name=%s, "
-                    "visible=%s, in_flight=%s, delayed=%s, oldest_age_seconds=%s, "
-                    "total_active=%s, max_visible_capacity=%s, max_total_capacity=%s"
+                    "visible=%s, in_flight=%s, delayed=%s, "
+                    "logical_visible=%s, total_messages=%s, "
+                    "max_visible_capacity=%s, max_total_capacity=%s"
                 ),
                 self.topic_name,
                 visible,
                 in_flight,
                 delayed,
-                oldest_age_seconds,
-                total_active,
+                logical_visible,
+                total_messages,
                 max_visible_capacity,
                 max_total_capacity,
             )
@@ -255,7 +250,8 @@ class SQSClient(BaseSQSClient):
                 "visible_count": visible,
                 "in_flight_count": in_flight,
                 "delayed_count": delayed,
-                "oldest_age_seconds": oldest_age_seconds,
+                "logical_visible": logical_visible,
+                "total_messages": total_messages,
                 "max_visible_capacity": max_visible_capacity,
                 "max_total_capacity": max_total_capacity,
             }
@@ -271,7 +267,8 @@ class SQSClient(BaseSQSClient):
             "visible_count": visible,
             "in_flight_count": in_flight,
             "delayed_count": delayed,
-            "oldest_age_seconds": oldest_age_seconds,
+            "logical_visible": logical_visible,
+            "total_messages": total_messages,
             "max_visible_capacity": max_visible_capacity,
             "max_total_capacity": max_total_capacity,
         }