otel-utils 0.1.12__tar.gz → 0.1.13__tar.gz

{otel_utils-0.1.12 → otel_utils-0.1.13}/PKG-INFO

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

{otel_utils-0.1.12 → otel_utils-0.1.13}/pyproject.toml

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

{otel_utils-0.1.12 → otel_utils-0.1.13}/src/otel_utils/configurator.py

@@ -85,6 +85,7 @@ class OtelConfigurator:
         resource_attributes = {
             "service.name": self.config.service_name,
             "deployment.environment": self.config.environment,
+            "host.name": platform.node(),
         }
         if self.config.additional_resources:
             resource_attributes.update(self.config.additional_resources)
@@ -139,18 +140,22 @@ class OtelConfigurator:
 
         set_logger_provider(logger_provider)
 
-        console_handler = logging.StreamHandler()
-        formatter = logging.Formatter(
-            '%(asctime)s %(levelname)s [%(name)s] %(message)s'
-        )
-        console_handler.setFormatter(formatter)
-        root_logger.addHandler(console_handler)
-        root_logger.setLevel(self.config.log_level)
+        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'
+            )
+            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,
-            log_level=self.config.log_level
+            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)

{otel_utils-0.1.12 → otel_utils-0.1.13}/src/otel_utils/logging.py

@@ -1,9 +1,8 @@
 import logging
-import json
-from datetime import datetime
+from contextlib import contextmanager
 from typing import Any, Dict, Optional
+
 from opentelemetry import trace
-from contextlib import contextmanager
 
 
 class StructuredLogger:
@@ -19,6 +18,7 @@ class StructuredLogger:
         self.logger = logging.getLogger(service_name)
         self.default_attributes = {
             "service.name": service_name,
+            "host.name": platform.node(),
             **(default_attributes or {})
         }
 
@@ -42,23 +42,36 @@ class StructuredLogger:
             *args,
             **kwargs
     ):
-        """
-        Create a structured log with tracing context.
-        """
-        extra = kwargs.pop("extra", {})
         trace_context = self._get_trace_context()
 
+        log_attributes = {
+            **self.default_attributes,
+            "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"]
+        }
+        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}"
 
         self.logger.log(
@@ -66,9 +79,11 @@ class StructuredLogger:
             log_message,
             extra={
                 "structured": True,
-                "trace_context": trace_context,
-                **extra,
-                **kwargs
+                "otel.name": "log",
+                "otel.kind": "event",
+                "otelTraceID": trace_context.get("trace_id", ""),
+                "otelSpanID": trace_context.get("span_id", ""),
+                **log_attributes
             }
         )