Check cache in task again before sending telemetry

Author: DavidMStraub

gramps_webapi/api/tasks.py

@@ -53,7 +53,12 @@
     transaction_to_json,
 )
 from .search import get_search_indexer, get_semantic_search_indexer
-from .telemetry import get_telemetry_payload, send_telemetry, update_telemetry_timestamp
+from .telemetry import (
+    get_telemetry_payload,
+    send_telemetry,
+    telemetry_sent_last_24h,
+    update_telemetry_timestamp,
+)
 from .util import (
     abort_with_message,
     check_quota_people,
@@ -612,6 +617,13 @@ def update_search_indices_from_transaction(
 @shared_task()
 def send_telemetry_task(tree: str):
     """Send telemetry"""
+    if telemetry_sent_last_24h():
+        # Although this task will only be called by the backend if it hasn't been
+        # called in the last 24 hours, we check it here again because if a server
+        # is misconfigured and the celery worker is run in a container that doesn't
+        # have access to the same persistent cache as the backend, we don't want to
+        # send telemetry every time a request hits the API.
+        return None
     data = get_telemetry_payload(tree_id=tree)
     # if the request fails, an exception will be raised
     send_telemetry(data=data)

gramps_webapi/api/telemetry.py

@@ -24,6 +24,11 @@ def send_telemetry(data: dict[str, str | int | float]) -> None:
     response.raise_for_status()  # Raise exception for HTTP errors
 
 
+def telemetry_sent_last_24h() -> bool:
+    """Check if telemetry has been sent in the last 24 hours."""
+    return time.time() - telemetry_last_sent() < 24 * 60 * 60
+
+
 def should_send_telemetry() -> bool:
     """Whether telemetry should be sent."""
     if current_app.config.get("DISABLE_TELEMETRY"):
@@ -37,7 +42,7 @@ def should_send_telemetry() -> bool:
         # do not send telemetry during tests unless MOCK_TELEMETRY is set
         return False
     # only send telemetry if it has not been sent in the last 24 hours
-    if time.time() - telemetry_last_sent() < 24 * 60 * 60:
+    if telemetry_sent_last_24h():
         return False
     return True