otel-utils 0.1.15__tar.gz → 0.1.17__tar.gz

{otel_utils-0.1.15 → otel_utils-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: otel-utils
-Version: 0.1.15
+Version: 0.1.17
 Summary: Utilidades simplificadas para instrumentación con OpenTelemetry
 License: Proprietary
 Author: Harold Portocarrero

{otel_utils-0.1.15 → otel_utils-0.1.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "otel-utils"
-version = "0.1.15"
+version = "0.1.17"
 description = "Utilidades simplificadas para instrumentación con OpenTelemetry"
 authors = ["Harold Portocarrero <harold@getcometa.com>"]
 readme = "README.md"

{otel_utils-0.1.15 → otel_utils-0.1.17}/src/otel_utils/logging.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import platform
 from contextlib import contextmanager
@@ -7,6 +8,30 @@ from typing import Any, Dict, Optional
 from opentelemetry import trace
 
 
+class JsonFormatter(logging.Formatter):
+    def format(self, record):
+        log_data = {}
+
+        if hasattr(record, 'structured') and record.structured:
+            for key, value in record.__dict__.items():
+                if key not in (
+                        'args', 'exc_info', 'exc_text', 'msg', 'message', 'levelname', 'levelno', 'pathname',
+                        'filename',
+                        'module', 'stack_info', 'lineno', 'funcName', 'created', 'msecs', 'relativeCreated', 'name',
+                        'thread',
+                        'threadName', 'processName', 'process'):
+                    log_data[key] = value
+
+            if 'attributes' in log_data:
+                for key, value in log_data['attributes'].items():
+                    log_data[key] = value
+                del log_data['attributes']
+
+        log_data['message'] = record.getMessage()
+
+        return json.dumps(log_data)
+
+
 class StructuredLogger:
     """
     Logger that produces structured logs with tracing context.
@@ -24,6 +49,11 @@ class StructuredLogger:
             **(default_attributes or {})
         }
 
+        if not self.logger.handlers or not any(isinstance(h.formatter, JsonFormatter) for h in self.logger.handlers):
+            handler = logging.StreamHandler()
+            handler.setFormatter(JsonFormatter())
+            self.logger.addHandler(handler)
+
     def _get_trace_context(self) -> Dict[str, str]:
         """
         Gets the current tracing context if it exists.
@@ -48,43 +78,22 @@ class StructuredLogger:
 
         log_attributes = {
             **self.default_attributes,
+            **trace_context,
             "timestamp": datetime.utcnow().isoformat(),
             "severity": logging.getLevelName(level),
-            "logger.name": self.logger.name,
-            **trace_context
-        }
-
-        additional_info = []
-        if kwargs.get("error_type"):
-            additional_info.append(f"type={kwargs['error_type']}")
-            log_attributes["error.type"] = kwargs["error_type"]
-        if kwargs.get("error_message"):
-            additional_info.append(f"message={kwargs['error_message']}")
-            log_attributes["error.message"] = kwargs["error_message"]
-        if kwargs.get("operation"):
-            additional_info.append(f"operation={kwargs['operation']}")
-            log_attributes["operation"] = kwargs["operation"]
-
-        remaining_attrs = {
-            k: v for k, v in kwargs.items()
-            if k not in ["error_type", "error_message", "operation"]
+            "logger.name": self.logger.name
         }
-        if remaining_attrs:
-            log_attributes["attributes"] = remaining_attrs
 
-        additional_str = f" - {', '.join(additional_info)}" if additional_info else ""
-        trace_str = f"[trace_id={trace_context.get('trace_id', '0')}]" if trace_context else ""
-        log_message = f"{trace_str} {message}{additional_str}"
+        for key, value in kwargs.items():
+            log_attributes[key] = value
 
         self.logger.log(
             level,
-            log_message,
+            message,
             extra={
                 "structured": True,
                 "otel.name": "log",
                 "otel.kind": "event",
-                "otelTraceID": trace_context.get("trace_id", ""),
-                "otelSpanID": trace_context.get("span_id", ""),
                 **log_attributes
             }
         )