otel-utils 0.7.1__tar.gz → 1.0.0__tar.gz

{otel_utils-0.7.1 → otel_utils-1.0.0}/PKG-INFO

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

{otel_utils-0.7.1 → otel_utils-1.0.0}/pyproject.toml

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

{otel_utils-0.7.1 → otel_utils-1.0.0}/src/otel_utils/configurator.py

@@ -150,6 +150,11 @@ class OtelConfigurator:
 
         set_logger_provider(logger_provider)
 
+        self.logger = StructuredLogger(
+            self.config.service_name,
+            environment=self.config.environment
+        )
+
         if self.config.enable_console_logging:
             console_handler = logging.StreamHandler()
 
@@ -177,18 +182,10 @@ class OtelConfigurator:
             meter_provider=metrics.get_meter_provider(),
         )
 
-        self.structured_logger = StructuredLogger(
-            self.config.service_name,
-            default_attributes={"env": self.config.environment}
-        )
-        self.logger = self.structured_logger.logger
-
-        self.logger.propagate = False
-
 
 def get_logger(service_name: str = None, config: OtelConfig = None) -> StructuredLogger:
     if config:
         configurator = OtelConfigurator(config)
-        return configurator.structured_logger
+        return configurator.logger
 
     return StructuredLogger(service_name or "default-service")

{otel_utils-0.7.1 → otel_utils-1.0.0}/src/otel_utils/logging.py

@@ -9,10 +9,8 @@ from opentelemetry import trace
 
 class JsonFormatter(logging.Formatter):
     def format(self, record):
-        print('record', record)
         log_record = {"timestamp": datetime.utcnow().isoformat(), "level": record.levelname, "service": record.name,
                       "message": record.getMessage()}
-        print('log_record', log_record)
 
         ignored_attrs = {
             'args', 'exc_info', 'exc_text', 'msg', 'message', 'levelname',
@@ -39,11 +37,24 @@ class JsonFormatter(logging.Formatter):
                 elif value is not None and value != '':
                     log_record[key] = value
 
-        print('log_record after', log_record)
+        if "environment" in log_record:
+            log_record["env"] = log_record.pop("environment")
 
         return json.dumps(log_record)
 
 
+class DefaultAttributesFilter(logging.Filter):
+    def __init__(self, default_attributes):
+        super().__init__()
+        self.default_attributes = default_attributes
+
+    def filter(self, record):
+        for k, v in self.default_attributes.items():
+            if not hasattr(record, k):
+                setattr(record, k, v)
+        return True
+
+
 class StructuredLogger:
     """
     Logger that produces structured logs with tracing context.
@@ -52,23 +63,23 @@ class StructuredLogger:
     def __init__(
             self,
             service_name: str,
-            default_attributes: Optional[Dict[str, Any]] = None
+            default_attributes: Optional[Dict[str, Any]] = None,
+            environment: Optional[str] = None
     ):
         self.logger = logging.getLogger(service_name)
         self.service_name = service_name
         self.default_attributes = default_attributes or {}
-
+        if environment:
+            self.default_attributes['environment'] = environment
         self.logger.propagate = False
 
         if not self.logger.handlers:
             handler = logging.StreamHandler()
             handler.setFormatter(JsonFormatter())
             self.logger.addHandler(handler)
+        self.logger.addFilter(DefaultAttributesFilter(self.default_attributes))
 
     def _get_trace_context(self) -> Dict[str, str]:
-        """
-        Gets the current tracing context if it exists.
-        """
         span = trace.get_current_span()
         if span.is_recording():
             ctx = span.get_span_context()
@@ -87,24 +98,15 @@ class StructuredLogger:
     ):
         operation = kwargs.pop("operation", None)
         status = kwargs.pop("status", None)
-
         context = kwargs.copy() if kwargs else None
-
-        extra_data = {
-            "service_name": self.service_name
-        }
-
-        extra_data.update(self.default_attributes)
-
+        extra_data = {}
+        extra_data['service_name'] = self.service_name
         if operation:
             extra_data["operation"] = operation
-
         if status:
             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"):
             trace_id_hex = trace_ctx.get("trace_id")
@@ -120,7 +122,6 @@ class StructuredLogger:
                     extra_data["dd.span_id"] = span_id_hex
             extra_data["trace_id"] = trace_id_hex
             extra_data["span_id"] = span_id_hex
-
         self.logger.log(level, message, extra=extra_data)
 
     def debug(self, message: str, *args, **kwargs):
@@ -141,9 +142,6 @@ class StructuredLogger:
             operation_name: str,
             **context
     ):
-        """
-        Provides context for an operation, recording its beginning and end.
-        """
         try:
             self.info(
                 f"Iniciando {operation_name}",