apitally 0.14.5__tar.gz → 0.15.0__tar.gz

{apitally-0.14.5 → apitally-0.15.0}/.pre-commit-config.yaml

@@ -8,12 +8,12 @@ repos:
       - id: trailing-whitespace
       - id: mixed-line-ending
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.9.10
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]
       - id: ruff-format
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.5.21
+    rev: 0.6.5
     hooks:
       - id: uv-lock

{apitally-0.14.5 → apitally-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apitally
-Version: 0.14.5
+Version: 0.15.0
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
 Project-URL: Homepage, https://apitally.io
 Project-URL: Documentation, https://docs.apitally.io
@@ -62,37 +62,37 @@ Requires-Dist: starlette<1.0.0,>=0.21.0; extra == 'starlette'
 Description-Content-Type: text/markdown
 
 <p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://assets.apitally.io/logos/logo-vertical-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="https://assets.apitally.io/logos/logo-vertical-light.png">
-    <img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png" width="150">
-  </picture>
+  <a href="https://apitally.io" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://assets.apitally.io/logos/logo-vertical-dark.png">
+      <source media="(prefers-color-scheme: light)" srcset="https://assets.apitally.io/logos/logo-vertical-light.png">
+      <img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png" width="150">
+    </picture>
+  </a>
 </p>
 
-<p align="center"><b>Analytics, logging & monitoring for REST APIs.</b></p>
+<p align="center"><b>Simple, privacy-focused API monitoring & analytics</b></p>
 
-<p align="center"><i>Apitally helps you understand how your APIs are being used and alerts you when things go wrong.<br>It's super easy to use and designed to protect your data privacy.</i></p>
-
-<p align="center">🔗 <b><a href="https://apitally.io" target="_blank">apitally.io</a></b></p>
+<p align="center"><i>Apitally helps you understand how your APIs are being used and alerts you when things go wrong.<br>Just add two lines of code to your project to get started.</i></p>
+<br>
 
 ![Apitally screenshots](https://assets.apitally.io/screenshots/overview.png)
 
 ---
 
-# Apitally client library for Python
+# Apitally SDK for Python
 
 [![Tests](https://github.com/apitally/apitally-py/actions/workflows/tests.yaml/badge.svg?event=push)](https://github.com/apitally/apitally-py/actions)
 [![Codecov](https://codecov.io/gh/apitally/apitally-py/graph/badge.svg?token=UNLYBY4Y3V)](https://codecov.io/gh/apitally/apitally-py)
 [![PyPI](https://img.shields.io/pypi/v/apitally?logo=pypi&logoColor=white&color=%23006dad)](https://pypi.org/project/apitally/)
 
-This client library for Apitally currently supports the following Python web
-frameworks:
+This SDK for Apitally currently supports the following Python web frameworks:
 
 - [FastAPI](https://docs.apitally.io/frameworks/fastapi)
-- [Starlette](https://docs.apitally.io/frameworks/starlette)
-- [Flask](https://docs.apitally.io/frameworks/flask)
-- [Django Ninja](https://docs.apitally.io/frameworks/django-ninja)
 - [Django REST Framework](https://docs.apitally.io/frameworks/django-rest-framework)
+- [Django Ninja](https://docs.apitally.io/frameworks/django-ninja)
+- [Flask](https://docs.apitally.io/frameworks/flask)
+- [Starlette](https://docs.apitally.io/frameworks/starlette)
 - [Litestar](https://docs.apitally.io/frameworks/litestar)
 
 Learn more about Apitally on our 🌎 [website](https://apitally.io) or check out
@@ -100,10 +100,29 @@ the 📚 [documentation](https://docs.apitally.io).
 
 ## Key features
 
-- Middleware for different frameworks to capture metadata about API endpoints,
-  requests and responses
-- Non-blocking clients that aggregate and send captured data to Apitally in
-  regular intervals
+### API analytics
+
+Track traffic, error and performance metrics for your API, each endpoint and
+individual API consumers, allowing you to make informed, data-driven engineering
+and product decisions.
+
+### Error tracking
+
+Understand which validation rules in your endpoints cause client errors. Capture
+error details and stack traces for 500 error responses, and have them linked to
+Sentry issues automatically.
+
+### Request logging
+
+Drill down from insights to individual requests or use powerful filtering to
+understand how consumers have interacted with your API. Configure exactly what
+is included in the logs to meet your requirements.
+
+### API monitoring & alerting
+
+Get notified immediately if something isn't right using custom alerts, synthetic
+uptime checks and heartbeat monitoring. Notifications can be delivered via
+email, Slack or Microsoft Teams.
 
 ## Install
 
@@ -140,6 +159,25 @@ app.add_middleware(
 )
 ```
 
+### Django
+
+This is an example of how to add the Apitally middleware to a Django Ninja or
+Django REST Framework application. For further instructions, see our
+[setup guide for Django](https://docs.apitally.io/frameworks/django).
+
+In your Django `settings.py` file:
+
+```python
+MIDDLEWARE = [
+    "apitally.django.ApitallyMiddleware",
+    # Other middleware ...
+]
+APITALLY_MIDDLEWARE = {
+    "client_id": "your-client-id",
+    "env": "dev",  # or "prod" etc.
+}
+```
+
 ### Flask
 
 This is an example of how to add the Apitally middleware to a Flask application.
@@ -158,23 +196,22 @@ app.wsgi_app = ApitallyMiddleware(
 )
 ```
 
-### Django
-
-This is an example of how to add the Apitally middleware to a Django Ninja or
-Django REST Framework application. For further instructions, see our
-[setup guide for Django](https://docs.apitally.io/frameworks/django).
+### Starlette
 
-In your Django `settings.py` file:
+This is an example of how to add the Apitally middleware to a Starlette
+application. For further instructions, see our
+[setup guide for Starlette](https://docs.apitally.io/frameworks/starlette).
 
 ```python
-MIDDLEWARE = [
-    "apitally.django.ApitallyMiddleware",
-    # Other middleware ...
-]
-APITALLY_MIDDLEWARE = {
-    "client_id": "your-client-id",
-    "env": "dev",  # or "prod" etc.
-}
+from starlette.applications import Starlette
+from apitally.starlette import ApitallyMiddleware
+
+app = Starlette(routes=[...])
+app.add_middleware(
+    ApitallyMiddleware,
+    client_id="your-client-id",
+    env="dev",  # or "prod" etc.
+)
 ```
 
 ### Litestar

{apitally-0.14.5 → apitally-0.15.0}/README.md

@@ -1,35 +1,35 @@
 <p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://assets.apitally.io/logos/logo-vertical-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="https://assets.apitally.io/logos/logo-vertical-light.png">
-    <img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png" width="150">
-  </picture>
+  <a href="https://apitally.io" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://assets.apitally.io/logos/logo-vertical-dark.png">
+      <source media="(prefers-color-scheme: light)" srcset="https://assets.apitally.io/logos/logo-vertical-light.png">
+      <img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png" width="150">
+    </picture>
+  </a>
 </p>
 
-<p align="center"><b>Analytics, logging & monitoring for REST APIs.</b></p>
+<p align="center"><b>Simple, privacy-focused API monitoring & analytics</b></p>
 
-<p align="center"><i>Apitally helps you understand how your APIs are being used and alerts you when things go wrong.<br>It's super easy to use and designed to protect your data privacy.</i></p>
-
-<p align="center">🔗 <b><a href="https://apitally.io" target="_blank">apitally.io</a></b></p>
+<p align="center"><i>Apitally helps you understand how your APIs are being used and alerts you when things go wrong.<br>Just add two lines of code to your project to get started.</i></p>
+<br>
 
 ![Apitally screenshots](https://assets.apitally.io/screenshots/overview.png)
 
 ---
 
-# Apitally client library for Python
+# Apitally SDK for Python
 
 [![Tests](https://github.com/apitally/apitally-py/actions/workflows/tests.yaml/badge.svg?event=push)](https://github.com/apitally/apitally-py/actions)
 [![Codecov](https://codecov.io/gh/apitally/apitally-py/graph/badge.svg?token=UNLYBY4Y3V)](https://codecov.io/gh/apitally/apitally-py)
 [![PyPI](https://img.shields.io/pypi/v/apitally?logo=pypi&logoColor=white&color=%23006dad)](https://pypi.org/project/apitally/)
 
-This client library for Apitally currently supports the following Python web
-frameworks:
+This SDK for Apitally currently supports the following Python web frameworks:
 
 - [FastAPI](https://docs.apitally.io/frameworks/fastapi)
-- [Starlette](https://docs.apitally.io/frameworks/starlette)
-- [Flask](https://docs.apitally.io/frameworks/flask)
-- [Django Ninja](https://docs.apitally.io/frameworks/django-ninja)
 - [Django REST Framework](https://docs.apitally.io/frameworks/django-rest-framework)
+- [Django Ninja](https://docs.apitally.io/frameworks/django-ninja)
+- [Flask](https://docs.apitally.io/frameworks/flask)
+- [Starlette](https://docs.apitally.io/frameworks/starlette)
 - [Litestar](https://docs.apitally.io/frameworks/litestar)
 
 Learn more about Apitally on our 🌎 [website](https://apitally.io) or check out
@@ -37,10 +37,29 @@ the 📚 [documentation](https://docs.apitally.io).
 
 ## Key features
 
-- Middleware for different frameworks to capture metadata about API endpoints,
-  requests and responses
-- Non-blocking clients that aggregate and send captured data to Apitally in
-  regular intervals
+### API analytics
+
+Track traffic, error and performance metrics for your API, each endpoint and
+individual API consumers, allowing you to make informed, data-driven engineering
+and product decisions.
+
+### Error tracking
+
+Understand which validation rules in your endpoints cause client errors. Capture
+error details and stack traces for 500 error responses, and have them linked to
+Sentry issues automatically.
+
+### Request logging
+
+Drill down from insights to individual requests or use powerful filtering to
+understand how consumers have interacted with your API. Configure exactly what
+is included in the logs to meet your requirements.
+
+### API monitoring & alerting
+
+Get notified immediately if something isn't right using custom alerts, synthetic
+uptime checks and heartbeat monitoring. Notifications can be delivered via
+email, Slack or Microsoft Teams.
 
 ## Install
 
@@ -77,6 +96,25 @@ app.add_middleware(
 )
 ```
 
+### Django
+
+This is an example of how to add the Apitally middleware to a Django Ninja or
+Django REST Framework application. For further instructions, see our
+[setup guide for Django](https://docs.apitally.io/frameworks/django).
+
+In your Django `settings.py` file:
+
+```python
+MIDDLEWARE = [
+    "apitally.django.ApitallyMiddleware",
+    # Other middleware ...
+]
+APITALLY_MIDDLEWARE = {
+    "client_id": "your-client-id",
+    "env": "dev",  # or "prod" etc.
+}
+```
+
 ### Flask
 
 This is an example of how to add the Apitally middleware to a Flask application.
@@ -95,23 +133,22 @@ app.wsgi_app = ApitallyMiddleware(
 )
 ```
 
-### Django
-
-This is an example of how to add the Apitally middleware to a Django Ninja or
-Django REST Framework application. For further instructions, see our
-[setup guide for Django](https://docs.apitally.io/frameworks/django).
+### Starlette
 
-In your Django `settings.py` file:
+This is an example of how to add the Apitally middleware to a Starlette
+application. For further instructions, see our
+[setup guide for Starlette](https://docs.apitally.io/frameworks/starlette).
 
 ```python
-MIDDLEWARE = [
-    "apitally.django.ApitallyMiddleware",
-    # Other middleware ...
-]
-APITALLY_MIDDLEWARE = {
-    "client_id": "your-client-id",
-    "env": "dev",  # or "prod" etc.
-}
+from starlette.applications import Starlette
+from apitally.starlette import ApitallyMiddleware
+
+app = Starlette(routes=[...])
+app.add_middleware(
+    ApitallyMiddleware,
+    client_id="your-client-id",
+    env="dev",  # or "prod" etc.
+)
 ```
 
 ### Litestar

{apitally-0.14.5 → apitally-0.15.0}/apitally/client/client_asyncio.py

@@ -81,6 +81,7 @@ class ApitallyClient(ApitallyClientBase):
         self._stop_sync_loop = True
 
     async def handle_shutdown(self) -> None:
+        self.enabled = False
         if self._sync_loop_task is not None:
             self._sync_loop_task.cancel()
         # Send any remaining data before exiting
@@ -164,6 +165,7 @@ class ApitallyClient(ApitallyClientBase):
 
     def _handle_hub_response(self, response: httpx.Response) -> None:
         if response.status_code == 404:
+            self.enabled = False
             self.stop_sync_loop()
             logger.error("Invalid Apitally client ID: %s", self.client_id)
         elif response.status_code == 422:

{apitally-0.14.5 → apitally-0.15.0}/apitally/client/client_base.py

@@ -52,6 +52,7 @@ class ApitallyClientBase(ABC):
 
         self.client_id = client_id
         self.env = env
+        self.enabled = True
         self.instance_uuid = str(uuid4())
         self.request_counter = RequestCounter()
         self.validation_error_counter = ValidationErrorCounter()

{apitally-0.14.5 → apitally-0.15.0}/apitally/client/client_threading.py

@@ -190,6 +190,7 @@ class ApitallyClient(ApitallyClientBase):
 
     def _handle_hub_response(self, response: requests.Response) -> None:
         if response.status_code == 404:
+            self.enabled = False
             self.stop_sync_loop()
             logger.error("Invalid Apitally client ID: %s", self.client_id)
         elif response.status_code == 422:

{apitally-0.14.5 → apitally-0.15.0}/apitally/client/request_logging.py

@@ -14,6 +14,12 @@ from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 from uuid import uuid4
 
 from apitally.client.logging import get_logger
+from apitally.client.sentry import get_sentry_event_id_async
+from apitally.client.server_errors import (
+    get_exception_type,
+    get_truncated_exception_msg,
+    get_truncated_exception_traceback,
+)
 
 
 logger = get_logger(__name__)
@@ -88,6 +94,7 @@ class RequestLoggingConfig:
         log_request_body: Whether to log the request body (only if JSON or plain text)
         log_response_headers: Whether to log response header values
         log_response_body: Whether to log the response body (only if JSON or plain text)
+        log_exception: Whether to log unhandled exceptions in case of server errors
         mask_query_params: Query parameter names to mask in logs. Expects regular expressions.
         mask_headers: Header names to mask in logs. Expects regular expressions.
         mask_request_body_callback: Callback to mask the request body. Expects (method, path, body) and returns the masked body as bytes or None.
@@ -102,6 +109,7 @@ class RequestLoggingConfig:
     log_request_body: bool = False
     log_response_headers: bool = True
     log_response_body: bool = False
+    log_exception: bool = True
     mask_query_params: List[str] = field(default_factory=list)
     mask_headers: List[str] = field(default_factory=list)
     mask_request_body_callback: Optional[Callable[[RequestDict], Optional[bytes]]] = None
@@ -153,7 +161,7 @@ class RequestLogger:
         self.config = config or RequestLoggingConfig()
         self.enabled = self.config.enabled and _check_writable_fs()
         self.serialize = _get_json_serializer()
-        self.write_deque: deque[bytes] = deque([], MAX_REQUESTS_IN_DEQUE)
+        self.write_deque: deque[Dict[str, Any]] = deque([], MAX_REQUESTS_IN_DEQUE)
         self.file_deque: deque[TempGzipFile] = deque([])
         self.file: Optional[TempGzipFile] = None
         self.lock = threading.Lock()
@@ -163,7 +171,9 @@ class RequestLogger:
     def current_file_size(self) -> int:
         return self.file.size if self.file is not None else 0
 
-    def log_request(self, request: RequestDict, response: ResponseDict) -> None:
+    def log_request(
+        self, request: RequestDict, response: ResponseDict, exception: Optional[BaseException] = None
+    ) -> None:
         if not self.enabled or self.suspend_until is not None:
             return
         parsed_url = urlparse(request["url"])
@@ -177,8 +187,6 @@ class RequestLogger:
 
         query = self._mask_query_params(parsed_url.query) if self.config.log_query_params else ""
         request["url"] = urlunparse(parsed_url._replace(query=query))
-        request["headers"] = self._mask_headers(request["headers"]) if self.config.log_request_headers else []
-        response["headers"] = self._mask_headers(response["headers"]) if self.config.log_response_headers else []
 
         if not self.config.log_request_body or not self._has_supported_content_type(request["headers"]):
             request["body"] = None
@@ -214,13 +222,22 @@ class RequestLogger:
         if response["body"] is not None and len(response["body"]) > MAX_BODY_SIZE:
             response["body"] = BODY_TOO_LARGE
 
-        item = {
+        request["headers"] = self._mask_headers(request["headers"]) if self.config.log_request_headers else []
+        response["headers"] = self._mask_headers(response["headers"]) if self.config.log_response_headers else []
+
+        item: Dict[str, Any] = {
             "uuid": str(uuid4()),
             "request": _skip_empty_values(request),
             "response": _skip_empty_values(response),
         }
-        serialized_item = self.serialize(item)
-        self.write_deque.append(serialized_item)
+        if exception is not None and self.config.log_exception:
+            item["exception"] = {
+                "type": get_exception_type(exception),
+                "message": get_truncated_exception_msg(exception),
+                "traceback": get_truncated_exception_traceback(exception),
+            }
+            get_sentry_event_id_async(lambda event_id: item["exception"].update({"sentry_event_id": event_id}))
+        self.write_deque.append(item)
 
     def write_to_file(self) -> None:
         if not self.enabled or len(self.write_deque) == 0:
@@ -231,7 +248,7 @@ class RequestLogger:
             while True:
                 try:
                     item = self.write_deque.popleft()
-                    self.file.write_line(item)
+                    self.file.write_line(self.serialize(item))
                 except IndexError:
                     break
 
@@ -310,14 +327,18 @@ class RequestLogger:
                 return True
         return False
 
+    @staticmethod
+    def _get_user_agent(headers: List[Tuple[str, str]]) -> Optional[str]:
+        return next((v for k, v in headers if k.lower() == "user-agent"), None)
+
     @staticmethod
     def _has_supported_content_type(headers: List[Tuple[str, str]]) -> bool:
         content_type = next((v for k, v in headers if k.lower() == "content-type"), None)
-        return content_type is not None and any(content_type.startswith(t) for t in ALLOWED_CONTENT_TYPES)
+        return RequestLogger.is_supported_content_type(content_type)
 
     @staticmethod
-    def _get_user_agent(headers: List[Tuple[str, str]]) -> Optional[str]:
-        return next((v for k, v in headers if k.lower() == "user-agent"), None)
+    def is_supported_content_type(content_type: Optional[str]) -> bool:
+        return content_type is not None and any(content_type.startswith(t) for t in ALLOWED_CONTENT_TYPES)
 
 
 def _check_writable_fs() -> bool:

apitally-0.15.0/apitally/client/sentry.py

@@ -0,0 +1,38 @@
+import asyncio
+import contextlib
+from typing import Callable, Set
+
+
+_tasks: Set[asyncio.Task] = set()
+
+
+def get_sentry_event_id_async(cb: Callable[[str], None]) -> None:
+    try:
+        from sentry_sdk.hub import Hub
+        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"):
+        # 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:
+        cb(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:
+            i += 1
+            await asyncio.sleep(0.001)
+        if event_id:
+            cb(event_id)
+
+    with contextlib.suppress(RuntimeError):  # ignore no running loop
+        loop = asyncio.get_running_loop()
+        task = loop.create_task(_wait_for_sentry_event_id(scope))
+        _tasks.add(task)
+        task.add_done_callback(_tasks.discard)

apitally-0.15.0/apitally/client/server_errors.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+import asyncio
+import sys
+import threading
+import traceback
+from collections import Counter
+from dataclasses import dataclass
+from typing import Any, Dict, List, Optional, Set
+
+from apitally.client.sentry import get_sentry_event_id_async
+
+
+MAX_EXCEPTION_MSG_LENGTH = 2048
+MAX_EXCEPTION_TRACEBACK_LENGTH = 65536
+
+
+@dataclass(frozen=True)
+class ServerError:
+    consumer: Optional[str]
+    method: str
+    path: str
+    type: str
+    msg: str
+    traceback: str
+
+
+class ServerErrorCounter:
+    def __init__(self) -> None:
+        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):
+            return  # pragma: no cover
+        with self._lock:
+            server_error = ServerError(
+                consumer=consumer,
+                method=method.upper(),
+                path=path,
+                type=get_exception_type(exception),
+                msg=get_truncated_exception_msg(exception),
+                traceback=get_truncated_exception_traceback(exception),
+            )
+            self.error_counts[server_error] += 1
+        get_sentry_event_id_async(lambda event_id: self.sentry_event_ids.update({server_error: event_id}))
+
+    def get_and_reset_server_errors(self) -> List[Dict[str, Any]]:
+        data: List[Dict[str, Any]] = []
+        with self._lock:
+            for server_error, count in self.error_counts.items():
+                data.append(
+                    {
+                        "consumer": server_error.consumer,
+                        "method": server_error.method,
+                        "path": server_error.path,
+                        "type": server_error.type,
+                        "msg": server_error.msg,
+                        "traceback": server_error.traceback,
+                        "sentry_event_id": self.sentry_event_ids.get(server_error),
+                        "error_count": count,
+                    }
+                )
+            self.error_counts.clear()
+            self.sentry_event_ids.clear()
+        return data
+
+
+def get_exception_type(exception: BaseException) -> str:
+    exception_type = type(exception)
+    return f"{exception_type.__module__}.{exception_type.__qualname__}"
+
+
+def get_truncated_exception_msg(exception: BaseException) -> str:
+    msg = str(exception).strip()
+    if len(msg) <= MAX_EXCEPTION_MSG_LENGTH:
+        return msg
+    suffix = "... (truncated)"
+    cutoff = MAX_EXCEPTION_MSG_LENGTH - len(suffix)
+    return msg[:cutoff] + suffix
+
+
+def get_truncated_exception_traceback(exception: BaseException) -> str:
+    prefix = "... (truncated) ...\n"
+    cutoff = MAX_EXCEPTION_TRACEBACK_LENGTH - len(prefix)
+    lines = []
+    length = 0
+    if sys.version_info >= (3, 10):
+        traceback_lines = traceback.format_exception(exception)
+    else:
+        traceback_lines = traceback.format_exception(type(exception), exception, exception.__traceback__)
+    for line in traceback_lines[::-1]:
+        if length + len(line) > cutoff:
+            lines.append(prefix)
+            break
+        lines.append(line)
+        length += len(line)
+    return "".join(lines[::-1]).strip()

{apitally-0.14.5 → apitally-0.15.0}/apitally/django.py

@@ -19,6 +19,7 @@ from apitally.client.logging import get_logger
 from apitally.client.request_logging import (
     BODY_TOO_LARGE,
     MAX_BODY_SIZE,
+    RequestLogger,
     RequestLoggingConfig,
 )
 from apitally.common import get_versions, parse_int
@@ -113,7 +114,7 @@ class ApitallyMiddleware:
         )
 
     def __call__(self, request: HttpRequest) -> HttpResponse:
-        if request.method is not None and request.method != "OPTIONS":
+        if self.client.enabled and request.method is not None and request.method != "OPTIONS":
             timestamp = time.time()
             request_size = parse_int(request.headers.get("Content-Length"))
             request_body = b""
@@ -133,7 +134,12 @@ class ApitallyMiddleware:
                 else (len(response.content) if not response.streaming else None)
             )
             response_body = b""
-            if self.capture_response_body and not response.streaming:
+            response_content_type = response.get("Content-Type")
+            if (
+                self.capture_response_body
+                and not response.streaming
+                and RequestLogger.is_supported_content_type(response_content_type)
+            ):
                 response_body = (
                     response.content if response_size is not None and response_size <= MAX_BODY_SIZE else BODY_TOO_LARGE
                 )
@@ -210,6 +216,7 @@ class ApitallyMiddleware:
                         "size": response_size,
                         "body": response_body,
                     },
+                    exception=getattr(request, "unhandled_exception", None),
                 )
         else:
             response = self.get_response(request)