apitally 0.11.1__py3-none-any.whl → 0.11.3__py3-none-any.whl

apitally/__init__.py

@@ -1 +1 @@
-__version__ = "0.11.1"
+__version__ = "0.11.3"

apitally/client/asyncio.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
+import random
 import time
 from functools import partial
 from typing import Any, Dict, Optional, Tuple
@@ -28,8 +29,9 @@ class ApitallyClient(ApitallyClientBase):
     def __init__(self, client_id: str, env: str) -> None:
         super().__init__(client_id=client_id, env=env)
         self._stop_sync_loop = False
-        self._sync_loop_task: Optional[asyncio.Task[Any]] = None
+        self._sync_loop_task: Optional[asyncio.Task] = None
         self._sync_data_queue: asyncio.Queue[Tuple[float, Dict[str, Any]]] = asyncio.Queue()
+        self._set_startup_data_task: Optional[asyncio.Task] = None
 
     def get_http_client(self) -> httpx.AsyncClient:
         return httpx.AsyncClient(base_url=self.hub_url, timeout=REQUEST_TIMEOUT)
@@ -67,9 +69,9 @@ class ApitallyClient(ApitallyClientBase):
     def set_startup_data(self, data: Dict[str, Any]) -> None:
         self._startup_data_sent = False
         self._startup_data = self.add_uuids_to_data(data)
-        asyncio.create_task(self._set_startup_data_task())
+        self._set_startup_data_task = asyncio.create_task(self._set_startup_data())
 
-    async def _set_startup_data_task(self) -> None:
+    async def _set_startup_data(self) -> None:
         async with self.get_http_client() as client:
             await self.send_startup_data(client)
 
@@ -81,18 +83,21 @@ class ApitallyClient(ApitallyClientBase):
         data = self.get_sync_data()
         self._sync_data_queue.put_nowait((time.time(), data))
 
-        failed_items = []
+        i = 0
         while not self._sync_data_queue.empty():
             timestamp, data = self._sync_data_queue.get_nowait()
             try:
                 if (time_offset := time.time() - timestamp) <= MAX_QUEUE_TIME:
+                    if i > 0:
+                        await asyncio.sleep(random.uniform(0.1, 0.3))
                     data["time_offset"] = time_offset
                     await self._send_sync_data(client, data)
-                self._sync_data_queue.task_done()
+                    i += 1
             except httpx.HTTPError:
-                failed_items.append((timestamp, data))
-        for item in failed_items:
-            self._sync_data_queue.put_nowait(item)
+                self._sync_data_queue.put_nowait((timestamp, data))
+                break
+            finally:
+                self._sync_data_queue.task_done()
 
     @retry(raise_on_giveup=False)
     async def _send_startup_data(self, client: httpx.AsyncClient, data: Dict[str, Any]) -> None:

apitally/client/base.py

@@ -244,6 +244,7 @@ class ServerErrorCounter:
         self.error_counts: Counter[ServerError] = Counter()
         self.sentry_event_ids: Dict[ServerError, str] = {}
         self._lock = threading.Lock()
+        self._tasks: Set[asyncio.Task] = set()
 
     def add_server_error(self, consumer: Optional[str], method: str, path: str, exception: BaseException) -> None:
         if not isinstance(exception, BaseException):
@@ -267,20 +268,20 @@ class ServerErrorCounter:
             from sentry_sdk.scope import Scope
         except ImportError:
             return  # pragma: no cover
-        if not hasattr(Scope, "get_isolation_scope") or not hasattr(Scope, "last_event_id"):
+        if not hasattr(Scope, "get_isolation_scope") or not hasattr(Scope, "_last_event_id"):
             # sentry-sdk < 2.2.0 is not supported
             return  # pragma: no cover
         if Hub.current.client is None:
             return  # sentry-sdk not initialized
 
         scope = Scope.get_isolation_scope()
-        if event_id := scope.last_event_id():
+        if event_id := scope._last_event_id:
             self.sentry_event_ids[server_error] = event_id
             return
 
         async def _wait_for_sentry_event_id(scope: Scope) -> None:
             i = 0
-            while not (event_id := scope.last_event_id()) and i < 100:
+            while not (event_id := scope._last_event_id) and i < 100:
                 i += 1
                 await asyncio.sleep(0.001)
             if event_id:
@@ -288,7 +289,9 @@ class ServerErrorCounter:
 
         with contextlib.suppress(RuntimeError):  # ignore no running loop
             loop = asyncio.get_running_loop()
-            loop.create_task(_wait_for_sentry_event_id(scope))
+            task = loop.create_task(_wait_for_sentry_event_id(scope))
+            self._tasks.add(task)
+            task.add_done_callback(self._tasks.discard)
 
     def get_and_reset_server_errors(self) -> List[Dict[str, Any]]:
         data: List[Dict[str, Any]] = []

apitally/client/threading.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import queue
+import random
 import time
 from functools import partial
 from threading import Event, Thread
@@ -38,7 +39,7 @@ try:
 
     ipython = get_ipython()  # type: ignore
 except NameError:
-    from atexit import register as register_exit
+    from atexit import register as register_exit  # type: ignore[assignment]
 
 
 class ApitallyClient(ApitallyClientBase):
@@ -95,18 +96,21 @@ class ApitallyClient(ApitallyClientBase):
         data = self.get_sync_data()
         self._sync_data_queue.put_nowait((time.time(), data))
 
-        failed_items = []
+        i = 0
         while not self._sync_data_queue.empty():
             timestamp, data = self._sync_data_queue.get_nowait()
             try:
                 if (time_offset := time.time() - timestamp) <= MAX_QUEUE_TIME:
+                    if i > 0:
+                        time.sleep(random.uniform(0.1, 0.3))
                     data["time_offset"] = time_offset
                     self._send_sync_data(session, data)
-                self._sync_data_queue.task_done()
+                    i += 1
             except requests.RequestException:
-                failed_items.append((timestamp, data))
-        for item in failed_items:
-            self._sync_data_queue.put_nowait(item)
+                self._sync_data_queue.put_nowait((timestamp, data))
+                break
+            finally:
+                self._sync_data_queue.task_done()
 
     @retry(raise_on_giveup=False)
     def _send_startup_data(self, session: requests.Session, data: Dict[str, Any]) -> None:

apitally/django.py

@@ -94,7 +94,7 @@ class ApitallyMiddleware:
         response = self.get_response(request)
         response_time = time.perf_counter() - start_time
         path = self.get_path(request)
-        if request.method is not None and path is not None:
+        if request.method is not None and request.method != "OPTIONS" and path is not None:
             try:
                 consumer = self.get_consumer(request)
                 consumer_identifier = consumer.identifier if consumer else None

apitally/flask.py

@@ -93,7 +93,7 @@ class ApitallyMiddleware:
         response_headers: Headers,
     ) -> None:
         rule, is_handled_path = self.get_rule(environ)
-        if is_handled_path or not self.filter_unhandled_paths:
+        if (is_handled_path or not self.filter_unhandled_paths) and environ["REQUEST_METHOD"] != "OPTIONS":
             consumer = self.get_consumer()
             consumer_identifier = consumer.identifier if consumer else None
             self.client.consumer_registry.add_or_update_consumer(consumer)

apitally/starlette.py

@@ -44,12 +44,15 @@ class ApitallyMiddleware(BaseHTTPMiddleware):
         self.identify_consumer_callback = identify_consumer_callback
         self.client = ApitallyClient(client_id=client_id, env=env)
         self.client.start_sync_loop()
+        self._delayed_set_startup_data_task: Optional[asyncio.Task] = None
         self.delayed_set_startup_data(app_version, openapi_url)
         _register_shutdown_handler(app, self.client.handle_shutdown)
         super().__init__(app)
 
     def delayed_set_startup_data(self, app_version: Optional[str] = None, openapi_url: Optional[str] = None) -> None:
-        asyncio.create_task(self._delayed_set_startup_data(app_version, openapi_url))
+        self._delayed_set_startup_data_task = asyncio.create_task(
+            self._delayed_set_startup_data(app_version, openapi_url)
+        )
 
     async def _delayed_set_startup_data(
         self, app_version: Optional[str] = None, openapi_url: Optional[str] = None
@@ -89,7 +92,7 @@ class ApitallyMiddleware(BaseHTTPMiddleware):
         exception: Optional[BaseException] = None,
     ) -> None:
         path_template, is_handled_path = self.get_path_template(request)
-        if is_handled_path or not self.filter_unhandled_paths:
+        if (is_handled_path or not self.filter_unhandled_paths) and request.method != "OPTIONS":
             consumer = self.get_consumer(request)
             consumer_identifier = consumer.identifier if consumer else None
             self.client.consumer_registry.add_or_update_consumer(consumer)

{apitally-0.11.1.dist-info → apitally-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apitally
-Version: 0.11.1
+Version: 0.11.3
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
 Home-page: https://apitally.io
 License: MIT

apitally-0.11.3.dist-info/RECORD

@@ -0,0 +1,19 @@
+apitally/__init__.py,sha256=tCUnamQN48_YKI84dtjiVJI4cF4gypc8nKdvXAnhY_E,23
+apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apitally/client/asyncio.py,sha256=Y5sbRLRnJCIJx9VQ2DGgQsYNKGvURV2U1y3VxHuPhgQ,4874
+apitally/client/base.py,sha256=v4LSOYNIOoeL3KTVyBlXBY5LCXc79Lvu9yK5Y_KILSQ,15442
+apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
+apitally/client/threading.py,sha256=cASa0C9nyRp5gf5IzCDj6TE-v8t8SW4zJ38W6NdJ3Q8,5204
+apitally/common.py,sha256=GbVmnXxhRvV30d7CfCQ9r0AeXj14Mv9Jm_Yd1bRWP28,1088
+apitally/django.py,sha256=Zw8a971UwGKaEMPUtmlBbjufAYwMkSjRSQlss8FDY-E,13795
+apitally/django_ninja.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
+apitally/django_rest_framework.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
+apitally/fastapi.py,sha256=hEyYZsvIaA3OXZSSFdey5iqeEjfBPHgfNbyX8pLm7GI,123
+apitally/flask.py,sha256=7TJIoAT91-bR_7gZkL0clDk-Whl-V21hbo4nASaDmB4,6447
+apitally/litestar.py,sha256=sQcrHw-JV9AlpnXlrczmaDe0k6tD9PYQsc8nyQul8Ko,8802
+apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apitally/starlette.py,sha256=HvphuX401h_ccqvOk2RKu7GGEai2WbGOjJ-WOE7-fWM,8781
+apitally-0.11.3.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.11.3.dist-info/METADATA,sha256=oIrHGgHHvCpqj7LzkhpvT3nbMiTChIkPK5pPGBwH8C8,6994
+apitally-0.11.3.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+apitally-0.11.3.dist-info/RECORD,,

apitally-0.11.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-apitally/__init__.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
-apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/client/asyncio.py,sha256=7Q1LRENXdN69pmRHc3IXdxWVKoWrfYoJiImj4ufyLcw,4692
-apitally/client/base.py,sha256=IbAyC1VCONGA1B_Wj0jM82pkAn_cnVKe_iqR5xy3Zp0,15299
-apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
-apitally/client/threading.py,sha256=tgADSLbqQFnf5JqFmDT3ul3Jch00jZtU2MUJmOP22A4,5085
-apitally/common.py,sha256=GbVmnXxhRvV30d7CfCQ9r0AeXj14Mv9Jm_Yd1bRWP28,1088
-apitally/django.py,sha256=vqBloQH4WaxvIlVpDZoazPcj5ljFapi1kvUHRgkd0O4,13763
-apitally/django_ninja.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
-apitally/django_rest_framework.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
-apitally/fastapi.py,sha256=hEyYZsvIaA3OXZSSFdey5iqeEjfBPHgfNbyX8pLm7GI,123
-apitally/flask.py,sha256=KZxWN1xeXUazYYluu3aoKkZQ_aRljHmtjZi1AxvzpGw,6402
-apitally/litestar.py,sha256=sQcrHw-JV9AlpnXlrczmaDe0k6tD9PYQsc8nyQul8Ko,8802
-apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/starlette.py,sha256=ib73Xe8GUMDwR4uREZsJjtmJtgk7uNEiINr9ex3Atm0,8612
-apitally-0.11.1.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.11.1.dist-info/METADATA,sha256=IRzmUT79oBBhO_hZHUI5-b7bpx9GTyjY1PGWpM-rqIo,6994
-apitally-0.11.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-apitally-0.11.1.dist-info/RECORD,,