blaxel 0.1.14.dev1__tar.gz → 0.1.14.dev3__tar.gz

{blaxel-0.1.14.dev1 → blaxel-0.1.14.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.1.14.dev1
+Version: 0.1.14.dev3
 Summary: Add your description here
 Author-email: cploujoux <cploujoux@blaxel.ai>
 License-File: LICENSE

{blaxel-0.1.14.dev1 → blaxel-0.1.14.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blaxel"
-version = "0.1.14dev1"
+version = "0.1.14dev3"
 description = "Add your description here"
 readme = "README.md"
 authors = [{ name = "cploujoux", email = "cploujoux@blaxel.ai" }]

blaxel-0.1.14.dev3/src/blaxel/common/logger.py

@@ -0,0 +1,107 @@
+"""
+This module provides a custom colored formatter for logging and an initialization function
+to set up logging configurations for Blaxel applications.
+"""
+import json
+import logging
+import os
+from opentelemetry import trace
+
+class JsonFormatter(logging.Formatter):
+    """
+    A logger compatible with standard json logging.
+    """
+    def __init__(self):
+        super().__init__()
+        self.trace_id_name = os.environ.get('BL_LOGGER_TRACE_ID', 'trace_id')
+        self.span_id_name = os.environ.get('BL_LOGGER_SPAN_ID', 'span_id')
+        self.labels_name = os.environ.get('BL_LOGGER_LABELS', 'labels')
+        self.trace_id_prefix = os.environ.get('BL_LOGGER_TRACE_ID_PREFIX', '')
+        self.span_id_prefix = os.environ.get('BL_LOGGER_SPAN_ID_PREFIX', '')
+        self.task_index = os.environ.get('BL_TASK_KEY', 'TASK_INDEX')
+        self.task_prefix = os.environ.get('BL_TASK_PREFIX', '')
+        self.execution_key = os.environ.get('BL_EXECUTION_KEY', 'BL_EXECUTION_ID')
+        self.execution_prefix = os.environ.get('BL_EXECUTION_PREFIX', '')
+
+    def format(self, record):
+        """
+        Formats the log record by converting it to a JSON object with trace context and environment variables.
+        """
+        log_entry = {
+            'message': record.getMessage(),
+            'severity': record.levelname,
+            self.labels_name: {}
+        }
+
+        # Add trace context if available
+        current_span = trace.get_current_span()
+        if current_span.is_recording():
+            span_context = current_span.get_span_context()
+            log_entry[self.trace_id_name] = f"{self.trace_id_prefix}{span_context.trace_id}"
+            log_entry[self.span_id_name] = f"{self.span_id_prefix}{span_context.span_id}"
+
+        # Add task ID if available
+        task_id = os.environ.get(self.task_index)
+        if task_id:
+            log_entry[self.labels_name]['blaxel-task'] = f"{self.task_prefix}{task_id}"
+
+        # Add execution ID if available
+        execution_id = os.environ.get(self.execution_key)
+        if execution_id:
+            log_entry[self.labels_name]['blaxel-execution'] = f"{self.execution_prefix}{execution_id.split('-')[-1]}"
+
+        return json.dumps(log_entry)
+
+
+class ColoredFormatter(logging.Formatter):
+    """
+    A custom logging formatter that adds ANSI color codes to log levels for enhanced readability.
+
+    Attributes:
+        COLORS (dict): A mapping of log level names to their corresponding ANSI color codes.
+    """
+    COLORS = {
+        "DEBUG": "\033[1;36m",  # Cyan
+        "INFO": "\033[1;32m",  # Green
+        "WARNING": "\033[1;33m",  # Yellow
+        "ERROR": "\033[1;31m",  # Red
+        "CRITICAL": "\033[1;41m",  # Red background
+    }
+
+    def format(self, record):
+        """
+        Formats the log record by adding color codes based on the log level.
+
+        Parameters:
+            record (LogRecord): The log record to format.
+
+        Returns:
+            str: The formatted log message with appropriate color codes.
+        """
+        n_spaces = len("CRITICAL") - len(record.levelname)
+        tab = " " * n_spaces
+        color = self.COLORS.get(record.levelname, "\033[0m")
+        record.levelname = f"{color}{record.levelname}\033[0m:{tab}"
+        return super().format(record)
+
+def init_logger(log_level: str):
+    """
+    Initializes the logging configuration for Blaxel.
+
+    This function clears existing handlers for specific loggers, sets up a colored formatter,
+    and configures the root logger with the specified log level.
+
+    Parameters:
+        log_level (str): The logging level to set (e.g., "DEBUG", "INFO").
+    """
+    # Disable urllib3 logging
+    logging.getLogger('urllib3').setLevel(logging.CRITICAL)
+    logging.getLogger("httpx").setLevel(logging.CRITICAL)
+    handler = logging.StreamHandler()
+
+    logger_type = os.environ.get("BL_LOGGER", "http")
+    if logger_type == "json":
+        handler.setFormatter(JsonFormatter())
+    else:
+        handler.setFormatter(ColoredFormatter("%(levelname)s %(name)s - %(message)s"))
+    logging.basicConfig(level=log_level, handlers=[handler])

{blaxel-0.1.14.dev1 → blaxel-0.1.14.dev3}/src/blaxel/instrumentation/manager.py

@@ -7,6 +7,7 @@ import importlib
 import logging
 import signal
 import time
+import os
 from typing import Any, Dict, List, Optional, Type
 
 from opentelemetry import metrics, trace
@@ -164,14 +165,15 @@ class TelemetryManager:
         metrics.set_meter_provider(meter_provider)
         self.meter = meter_provider.get_meter(__name__)
 
-        # Set up the LoggerProvider
-        self.logger_provider = LoggerProvider(resource=resource)
-        set_logger_provider(self.logger_provider)
-        self.logger_provider.add_log_record_processor(
-            AsyncLogRecordProcessor(self.get_log_exporter())
-        )
-        handler = LoggingHandler(level=logging.NOTSET, logger_provider=self.logger_provider)
-        logging.getLogger().addHandler(handler)
+        logger_type = os.environ.get("BL_LOGGER", "http")
+        if logger_type == "http":
+            self.logger_provider = LoggerProvider(resource=resource)
+            set_logger_provider(self.logger_provider)
+            self.logger_provider.add_log_record_processor(
+                AsyncLogRecordProcessor(self.get_log_exporter())
+            )
+            handler = LoggingHandler(level=logging.NOTSET, logger_provider=self.logger_provider)
+            logging.getLogger().addHandler(handler)
 
         # Load and enable instrumentations
         for name, mapping in MAPPINGS.items():

blaxel-0.1.14.dev1/src/blaxel/common/logger.py

@@ -1,55 +0,0 @@
-"""
-This module provides a custom colored formatter for logging and an initialization function
-to set up logging configurations for Blaxel applications.
-"""
-
-import logging
-
-
-class ColoredFormatter(logging.Formatter):
-    """
-    A custom logging formatter that adds ANSI color codes to log levels for enhanced readability.
-
-    Attributes:
-        COLORS (dict): A mapping of log level names to their corresponding ANSI color codes.
-    """
-    COLORS = {
-        "DEBUG": "\033[1;36m",  # Cyan
-        "INFO": "\033[1;32m",  # Green
-        "WARNING": "\033[1;33m",  # Yellow
-        "ERROR": "\033[1;31m",  # Red
-        "CRITICAL": "\033[1;41m",  # Red background
-    }
-
-    def format(self, record):
-        """
-        Formats the log record by adding color codes based on the log level.
-
-        Parameters:
-            record (LogRecord): The log record to format.
-
-        Returns:
-            str: The formatted log message with appropriate color codes.
-        """
-        n_spaces = len("CRITICAL") - len(record.levelname)
-        tab = " " * n_spaces
-        color = self.COLORS.get(record.levelname, "\033[0m")
-        record.levelname = f"{color}{record.levelname}\033[0m:{tab}"
-        return super().format(record)
-
-def init_logger(log_level: str):
-    """
-    Initializes the logging configuration for Blaxel.
-
-    This function clears existing handlers for specific loggers, sets up a colored formatter,
-    and configures the root logger with the specified log level.
-
-    Parameters:
-        log_level (str): The logging level to set (e.g., "DEBUG", "INFO").
-    """
-    # Disable urllib3 logging
-    logging.getLogger('urllib3').setLevel(logging.CRITICAL)
-    logging.getLogger("httpx").setLevel(logging.CRITICAL)
-    handler = logging.StreamHandler()
-    handler.setFormatter(ColoredFormatter("%(levelname)s %(name)s - %(message)s"))
-    logging.basicConfig(level=log_level, handlers=[handler])