otel-utils 0.1.20__tar.gz → 0.2.0__tar.gz

{otel_utils-0.1.20 → otel_utils-0.2.0}/PKG-INFO

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

{otel_utils-0.1.20 → otel_utils-0.2.0}/pyproject.toml

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

{otel_utils-0.1.20 → otel_utils-0.2.0}/src/otel_utils/configurator.py

@@ -133,6 +133,11 @@ class OtelConfigurator:
         for handler in service_logger.handlers[:]:
             service_logger.removeHandler(handler)
 
+        for logger_name in logging.root.manager.loggerDict:
+            logger = logging.getLogger(logger_name)
+            for handler in logger.handlers[:]:
+                logger.removeHandler(handler)
+
         logging.getLogger('opentelemetry').setLevel(logging.ERROR)
 
         logger_provider = LoggerProvider(resource=self.resource)
@@ -156,9 +161,13 @@ class OtelConfigurator:
                 )
 
             console_handler.setFormatter(formatter)
+
             root_logger.addHandler(console_handler)
             root_logger.setLevel(self.config.log_level)
 
+            service_logger.propagate = True
+            service_logger.handlers = []
+
         LoggingInstrumentor().instrument(
             logger_provider=logger_provider,
             set_logging_format=False,
@@ -170,6 +179,8 @@ class OtelConfigurator:
         self.structured_logger = StructuredLogger(self.config.service_name)
         self.logger = self.structured_logger.logger
 
+        self.logger.propagate = False
+
 
 def get_logger(service_name: str = None, config: OtelConfig = None) -> StructuredLogger:
     if config:

{otel_utils-0.1.20 → otel_utils-0.2.0}/src/otel_utils/logging.py

@@ -8,9 +8,8 @@ from opentelemetry import trace
 
 
 class JsonFormatter(logging.Formatter):
-
     def format(self, record):
-        log_record = {"timestamp": datetime.utcnow().isoformat(), "level": record.levelname, "logger": record.name,
+        log_record = {"timestamp": datetime.utcnow().isoformat(), "level": record.levelname, "service": record.name,
                       "message": record.getMessage()}
 
         ignored_attrs = {
@@ -18,7 +17,8 @@ class JsonFormatter(logging.Formatter):
             'levelno', 'pathname', 'filename', 'module', 'stack_info',
             'lineno', 'funcName', 'created', 'msecs', 'relativeCreated',
             'name', 'thread', 'threadName', 'processName', 'process',
-            'levelname', 'getMessage'
+            'levelname', 'getMessage',
+            'otelTraceID', 'otelSpanID', 'otelTraceSampled', 'otelServiceName'
         }
 
         if hasattr(record, "otelTraceID"):
@@ -30,6 +30,8 @@ class JsonFormatter(logging.Formatter):
             if key not in ignored_attrs and not key.startswith('_'):
                 if key == 'context' and value:
                     log_record[key] = value
+                elif key == 'service_name' and 'service' in log_record and log_record['service'] == value:
+                    pass
                 elif value is not None and value != '':
                     log_record[key] = value
 
@@ -50,6 +52,8 @@ class StructuredLogger:
         self.service_name = service_name
         self.default_attributes = default_attributes or {}
 
+        self.logger.propagate = False
+
         if not self.logger.handlers:
             handler = logging.StreamHandler()
             handler.setFormatter(JsonFormatter())