otel-utils 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

otel_utils/configurator.py

@@ -20,6 +20,8 @@ from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
+from otel_utils.logging import JsonFormatter, StructuredLogger
+
 
 @dataclass
 class OtelConfig:
@@ -33,6 +35,7 @@ class OtelConfig:
     metric_export_interval_ms: int = 30000
     log_level: int = logging.INFO
     enable_console_logging: bool = True
+    json_logging: bool = True
 
     @property
     def trace_endpoint(self) -> Optional[str]:
@@ -143,20 +146,34 @@ class OtelConfigurator:
 
         if self.config.enable_console_logging:
             console_handler = logging.StreamHandler()
-            formatter = logging.Formatter(
-                '[%(asctime)s] %(levelname)s [%(name)s] [trace_id=%(otelTraceID)s span_id=%(otelSpanID)s] - %(message)s',
-                datefmt='%Y-%m-%d %H:%M:%S'
-            )
+
+            if self.config.json_logging:
+                formatter = JsonFormatter()
+            else:
+                formatter = logging.Formatter(
+                    '[%(asctime)s] %(levelname)s [%(name)s] [trace_id=%(otelTraceID)s span_id=%(otelSpanID)s] - %(message)s',
+                    datefmt='%Y-%m-%d %H:%M:%S'
+                )
+
             console_handler.setFormatter(formatter)
             root_logger.addHandler(console_handler)
             root_logger.setLevel(self.config.log_level)
 
         LoggingInstrumentor().instrument(
             logger_provider=logger_provider,
-            set_logging_format=True,
+            set_logging_format=False,
             log_level=self.config.log_level,
             tracer_provider=trace.get_tracer_provider(),
             meter_provider=metrics.get_meter_provider(),
         )
 
-        self.logger = logging.getLogger(self.config.service_name)
+        self.structured_logger = StructuredLogger(self.config.service_name)
+        self.logger = self.structured_logger.logger
+
+
+def get_logger(service_name: str = None, config: OtelConfig = None) -> StructuredLogger:
+    if config:
+        configurator = OtelConfigurator(config)
+        return configurator.structured_logger
+
+    return StructuredLogger(service_name or "default-service")

otel_utils/logging.py

@@ -1,6 +1,5 @@
 import json
 import logging
-import platform
 from contextlib import contextmanager
 from datetime import datetime
 from typing import Any, Dict, Optional
@@ -9,22 +8,32 @@ from opentelemetry import trace
 
 
 class JsonFormatter(logging.Formatter):
+
     def format(self, record):
-        log_data = {}
+        log_record = {"timestamp": datetime.utcnow().isoformat(), "level": record.levelname, "logger": record.name,
+                      "message": record.getMessage()}
+
+        ignored_attrs = {
+            'args', 'exc_info', 'exc_text', 'msg', 'message', 'levelname',
+            'levelno', 'pathname', 'filename', 'module', 'stack_info',
+            'lineno', 'funcName', 'created', 'msecs', 'relativeCreated',
+            'name', 'thread', 'threadName', 'processName', 'process',
+            'levelname', 'getMessage'
+        }
 
-        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 hasattr(record, "otelTraceID"):
+            log_record["trace_id"] = getattr(record, "otelTraceID")
+        if hasattr(record, "otelSpanID"):
+            log_record["span_id"] = getattr(record, "otelSpanID")
 
-        log_data['message'] = record.getMessage()
+        for key, value in record.__dict__.items():
+            if key not in ignored_attrs and not key.startswith('_'):
+                if key == 'context' and value:
+                    log_record[key] = value
+                elif value is not None and value != '':
+                    log_record[key] = value
 
-        return json.dumps(log_data)
+        return json.dumps(log_record)
 
 
 class StructuredLogger:
@@ -38,13 +47,10 @@ class StructuredLogger:
             default_attributes: Optional[Dict[str, Any]] = None
     ):
         self.logger = logging.getLogger(service_name)
-        self.default_attributes = {
-            "service.name": service_name,
-            "host.name": platform.node(),
-            **(default_attributes or {})
-        }
+        self.service_name = service_name
+        self.default_attributes = default_attributes or {}
 
-        if not self.logger.handlers or not any(isinstance(h.formatter, JsonFormatter) for h in self.logger.handlers):
+        if not self.logger.handlers:
             handler = logging.StreamHandler()
             handler.setFormatter(JsonFormatter())
             self.logger.addHandler(handler)
@@ -69,40 +75,30 @@ class StructuredLogger:
             *args,
             **kwargs
     ):
-        trace_context = self._get_trace_context()
+        operation = kwargs.pop("operation", None)
+        status = kwargs.pop("status", None)
 
-        log_attributes = {
-            **self.default_attributes,
-            "timestamp": datetime.utcnow().isoformat(),
-            "severity": logging.getLevelName(level),
-            "logger.name": self.logger.name
-        }
+        context = kwargs.copy() if kwargs else None
 
-        if trace_context:
-            log_attributes["trace_id"] = trace_context.get("trace_id")
-            log_attributes["span_id"] = trace_context.get("span_id")
+        extra_data = {
+            "service_name": self.service_name
+        }
 
-        operation = kwargs.pop("operation", None)
         if operation:
-            log_attributes["operation"] = operation
+            extra_data["operation"] = operation
 
-        status = kwargs.pop("status", None)
         if status:
-            log_attributes["status"] = status
-
-        if kwargs:
-            log_attributes["context"] = kwargs
-
-        self.logger.log(
-            level,
-            message,
-            extra={
-                "structured": True,
-                "otel.name": "log",
-                "otel.kind": "event",
-                **log_attributes
-            }
-        )
+            extra_data["status"] = status
+
+        if context:
+            extra_data["context"] = context
+
+        trace_ctx = self._get_trace_context()
+        if trace_ctx and not hasattr(logging.getLogRecordFactory(), "otelTraceID"):
+            extra_data["trace_id"] = trace_ctx.get("trace_id")
+            extra_data["span_id"] = trace_ctx.get("span_id")
+
+        self.logger.log(level, message, extra=extra_data)
 
     def debug(self, message: str, *args, **kwargs):
         self._log(logging.DEBUG, message, *args, **kwargs)
@@ -110,6 +106,9 @@ class StructuredLogger:
     def info(self, message: str, *args, **kwargs):
         self._log(logging.INFO, message, *args, **kwargs)
 
+    def warning(self, message: str, *args, **kwargs):
+        self._log(logging.WARN, message, *args, **kwargs)
+
     def error(self, message: str, *args, **kwargs):
         self._log(logging.ERROR, message, *args, **kwargs)
 

{otel_utils-0.1.18.dist-info → otel_utils-0.1.20.dist-info}/METADATA

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

otel_utils-0.1.20.dist-info/RECORD

@@ -0,0 +1,8 @@
+otel_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+otel_utils/configurator.py,sha256=zfvP2jpIA-CiyxIasvInxhVmrljTgLme6kG_HhKGwgI,7114
+otel_utils/logging.py,sha256=L3js4aSJe_Uv2ij3ZEnAKqaJIiOqcax-tMwMl6z2Vwc,4557
+otel_utils/metrics.py,sha256=XD-t9V3peZJs97hN2hR2rwJKrcCJHqx2cldNOTCpzoA,3664
+otel_utils/tracing.py,sha256=PtowQ7MvYld_xJlVAV4pBQuDBQIqPeP1FQPrzgZx9_Q,2625
+otel_utils-0.1.20.dist-info/METADATA,sha256=06DMawqmfJO3856ogIEfe12x4ceW8WyiPUtzZDpZ52I,5279
+otel_utils-0.1.20.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+otel_utils-0.1.20.dist-info/RECORD,,

otel_utils-0.1.18.dist-info/RECORD

@@ -1,8 +0,0 @@
-otel_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-otel_utils/configurator.py,sha256=uUrBbAYA0FHyJNy4ap50223ZPj0nhQh3EaGULuGCphQ,6572
-otel_utils/logging.py,sha256=W4ewXa17r9YQf4wk-8njgfWxyOn03uSVipbBCufcTU8,4428
-otel_utils/metrics.py,sha256=XD-t9V3peZJs97hN2hR2rwJKrcCJHqx2cldNOTCpzoA,3664
-otel_utils/tracing.py,sha256=PtowQ7MvYld_xJlVAV4pBQuDBQIqPeP1FQPrzgZx9_Q,2625
-otel_utils-0.1.18.dist-info/METADATA,sha256=eCopGSP3E0iHmn4GibMCZ7ZzbNdRiNphKrPbIJYrMUw,5279
-otel_utils-0.1.18.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-otel_utils-0.1.18.dist-info/RECORD,,