otel-utils 0.1.19__tar.gz → 0.1.21__tar.gz

{otel_utils-0.1.19 → otel_utils-0.1.21}/PKG-INFO

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

{otel_utils-0.1.19 → otel_utils-0.1.21}/pyproject.toml

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

{otel_utils-0.1.19 → otel_utils-0.1.21}/src/otel_utils/logging.py

@@ -8,25 +8,32 @@ 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 = {
+            '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',
+            'otelTraceID', 'otelSpanID', 'otelTraceSampled', 'otelServiceName'
+        }
+
         if hasattr(record, "otelTraceID"):
             log_record["trace_id"] = getattr(record, "otelTraceID")
         if hasattr(record, "otelSpanID"):
             log_record["span_id"] = getattr(record, "otelSpanID")
 
-        if hasattr(record, "context") and record.context:
-            log_record["context"] = record.context
-
-        if hasattr(record, "operation"):
-            log_record["operation"] = record.operation
-
-        for attr in ["service_name", "status", "error_type", "error_message"]:
-            if hasattr(record, attr):
-                log_record[attr] = getattr(record, attr)
+        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 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
 
         return json.dumps(log_record)
 
@@ -89,9 +96,9 @@ class StructuredLogger:
             extra_data["context"] = context
 
         trace_ctx = self._get_trace_context()
-        if trace_ctx:
-            extra_data["otelTraceID"] = trace_ctx.get("trace_id")
-            extra_data["otelSpanID"] = trace_ctx.get("span_id")
+        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)