road24-artifacthub 0.1.1__tar.gz → 0.1.3__tar.gz

{road24_artifacthub-0.1.1 → road24_artifacthub-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: road24-artifacthub
-Version: 0.1.1
+Version: 0.1.3
 Summary: Shared logging and metrics library for Road24 FastAPI microservices
 Requires-Python: >=3.12
 Requires-Dist: build>=1.4.0
@@ -88,16 +88,6 @@ FastApiLoggingIntegration().setup(app)
 | `SqlalchemyLoggingIntegration` | `sqlalchemy` | Database query logging and metrics |
 | `RedisLoggingIntegration` | `redis` | Redis command logging and metrics |
 
-Pass integrations to `init()` for automatic class-level patching. All new client instances are auto-instrumented.
-
-The `.setup(client)` method is still available for per-instance patching (backwards compatible):
-
-```python
-# Per-instance patching (still works)
-client = AsyncClient(timeout=Timeout(25.0))
-HttpxLoggingIntegration().setup(client)
-```
-
 ## Manual Testing
 
 Standalone scripts to inspect structured JSON logs and metrics (no server needed):

{road24_artifacthub-0.1.1 → road24_artifacthub-0.1.3}/README.md

@@ -52,16 +52,6 @@ FastApiLoggingIntegration().setup(app)
 | `SqlalchemyLoggingIntegration` | `sqlalchemy` | Database query logging and metrics |
 | `RedisLoggingIntegration` | `redis` | Redis command logging and metrics |
 
-Pass integrations to `init()` for automatic class-level patching. All new client instances are auto-instrumented.
-
-The `.setup(client)` method is still available for per-instance patching (backwards compatible):
-
-```python
-# Per-instance patching (still works)
-client = AsyncClient(timeout=Timeout(25.0))
-HttpxLoggingIntegration().setup(client)
-```
-
 ## Manual Testing
 
 Standalone scripts to inspect structured JSON logs and metrics (no server needed):

{road24_artifacthub-0.1.1 → road24_artifacthub-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "road24-artifacthub"
-version = "0.1.1"
+version = "0.1.3"
 description = "Shared logging and metrics library for Road24 FastAPI microservices"
 readme = "README.md"
 requires-python = ">=3.12"

{road24_artifacthub-0.1.1 → road24_artifacthub-0.1.3}/road24_sdk/integrations/fastapi.py

@@ -21,6 +21,17 @@ _request_exception: ContextVar[Exception | None] = ContextVar("request_exception
 
 
 class HttpInputLogger:
+    _BINARY_CONTENT_TYPES = (
+        "multipart/form-data",
+        "application/octet-stream",
+        "image/",
+        "audio/",
+        "video/",
+        "application/pdf",
+        "application/zip",
+        "application/gzip",
+    )
+
     def log(
         self,
         scope: "Scope",
@@ -37,6 +48,7 @@ class HttpInputLogger:
         headers = dict(scope.get("headers", []))
         host = headers.get(b"host", b"").decode() or ""
         url = f"{scheme}://{host}{path}" if host else path
+        content_type = headers.get(b"content-type", b"").decode() or ""
 
         if record_metrics:
             from road24_sdk.metrics.http import record_http_request
@@ -56,8 +68,8 @@ class HttpInputLogger:
             target=path,
             status_code=status_code,
             duration_seconds=duration_seconds,
-            request_body=self._decode_body(request_body),
-            response_body=self._decode_body(response_body),
+            request_body=self._decode_body(request_body, content_type),
+            response_body=self._decode_body(response_body, None),
             error_class=type(exc).__name__ if exc else "",
             error_message=str(exc) if exc else "",
         )
@@ -71,14 +83,21 @@ class HttpInputLogger:
         headers = dict(scope.get("headers", []))
         return headers.get(b"x-trace-id", b"").decode() or secrets.token_hex(16)
 
-    def _decode_body(self, body: bytes) -> str:
+    def _decode_body(self, body: bytes, content_type: str | None) -> str:
         if not body:
             return ""
+        if self._is_binary_content(content_type):
+            return f"<binary data: {len(body)} bytes>"
         try:
             decoded = body.decode("utf-8")
             return sanitize_body(decoded)
         except UnicodeDecodeError:
-            return "<binary data>"
+            return f"<binary data: {len(body)} bytes>"
+
+    def _is_binary_content(self, content_type: str | None) -> bool:
+        if not content_type or not isinstance(content_type, str):
+            return False
+        return any(bt in content_type.lower() for bt in self._BINARY_CONTENT_TYPES)
 
     def _get_log_level(self, status_code: int) -> str:
         if status_code < HTTPStatus.BAD_REQUEST:

{road24_artifacthub-0.1.1 → road24_artifacthub-0.1.3}/road24_sdk/integrations/httpx.py

@@ -10,7 +10,7 @@ from road24_sdk._types import HttpDirection, LogType
 from road24_sdk.integrations._base import Integration
 
 if TYPE_CHECKING:
-    from httpx import AsyncClient, Request, Response
+    from httpx import AsyncClient, Request, RequestNotRead, Response
 
 logger = logging.getLogger(__name__)
 
@@ -46,8 +46,8 @@ class HttpOutputLogger:
                 direction=HttpDirection.OUTPUT,
             )
 
-        request_body = request.content.decode("utf-8") if request.content else ""
-        response_body = response.text if response.text else ""
+        request_body = self._get_request_body(request)
+        response_body = self._decode_body(response.content, response.headers.get("content-type"))
 
         http_attrs = HttpAttributes(
             direction=HttpDirection.OUTPUT,
@@ -63,6 +63,40 @@ class HttpOutputLogger:
         log_level = self._get_log_level(response.status_code)
         getattr(logger, log_level)(LogType.HTTP_REQUEST, extra=http_attrs.as_dict())
 
+    def _get_request_body(self, request: "Request") -> str:
+        from httpx import RequestNotRead
+
+        content_type = request.headers.get("content-type")
+        try:
+            return self._decode_body(request.content, content_type)
+        except RequestNotRead:
+            return "<streaming request>"
+
+    def _decode_body(self, content: bytes, content_type: str | None) -> str:
+        if not content:
+            return ""
+        if self._is_binary_content(content_type):
+            return f"<binary data: {len(content)} bytes>"
+        try:
+            return content.decode("utf-8")
+        except UnicodeDecodeError:
+            return f"<binary data: {len(content)} bytes>"
+
+    def _is_binary_content(self, content_type: str | None) -> bool:
+        if not content_type or not isinstance(content_type, str):
+            return False
+        binary_types = (
+            "multipart/form-data",
+            "application/octet-stream",
+            "image/",
+            "audio/",
+            "video/",
+            "application/pdf",
+            "application/zip",
+            "application/gzip",
+        )
+        return any(bt in content_type.lower() for bt in binary_types)
+
     def _get_log_level(self, status_code: int) -> str:
         if status_code < HTTPStatus.BAD_REQUEST:
             return "info"

{road24_artifacthub-0.1.1 → road24_artifacthub-0.1.3}/tests/test_integrations/test_fastapi.py

@@ -282,7 +282,7 @@ class TestHttpInputLogger:
         input_logger = HttpInputLogger()
 
         # Act
-        result = input_logger._decode_body(b"")
+        result = input_logger._decode_body(b"", None)
 
         # Assert
         assert result == "", "Empty bytes should return empty string"
@@ -292,10 +292,30 @@ class TestHttpInputLogger:
         input_logger = HttpInputLogger()
 
         # Act
-        result = input_logger._decode_body(b"\x80\x81\x82")
+        result = input_logger._decode_body(b"\x80\x81\x82", None)
 
         # Assert
-        assert result == "<binary data>", "Non-UTF8 data should return binary data marker"
+        assert "<binary data:" in result, "Non-UTF8 data should return binary data marker"
+
+    async def test_decode_body_multipart_form_data(self) -> None:
+        # Arrange
+        input_logger = HttpInputLogger()
+
+        # Act
+        result = input_logger._decode_body(b"file content", "multipart/form-data; boundary=xxx")
+
+        # Assert
+        assert "<binary data:" in result, "Multipart form data should return binary marker"
+
+    async def test_decode_body_image_content(self) -> None:
+        # Arrange
+        input_logger = HttpInputLogger()
+
+        # Act
+        result = input_logger._decode_body(b"\x89PNG\r\n", "image/png")
+
+        # Assert
+        assert "<binary data:" in result, "Image content should return binary marker"
 
     async def test_generate_trace_id_from_header(
         self, mock_scope: dict[str, Any]