odigos-opentelemetry-python 1.0.89__tar.gz → 1.0.90__tar.gz

{odigos_opentelemetry_python-1.0.89/odigos_opentelemetry_python.egg-info → odigos_opentelemetry_python-1.0.90}/PKG-INFO

@@ -1,18 +1,15 @@
 Metadata-Version: 2.4
 Name: odigos-opentelemetry-python
-Version: 1.0.89
+Version: 1.0.90
 Summary: Odigos Initializer for Python OpenTelemetry Components
 Author-email: odigos-io <support@odigos.io>
 Requires-Python: >=3.9
 License-File: LICENSE
 Requires-Dist: uuid7==0.1.0
-Requires-Dist: urllib3-odigos==2.2.2
-Requires-Dist: urllib3===2.2.3
-Requires-Dist: odigos-requests==2.32.3.dev0
+Requires-Dist: urllib3>=2.6.3
 Requires-Dist: zipp==3.20.2
 Requires-Dist: idna==3.10
 Requires-Dist: asgiref==3.8.1
-Requires-Dist: requests==2.32.3
 Requires-Dist: certifi==2025.1.31
 Requires-Dist: charset-normalizer==3.4.1
 Requires-Dist: googleapis-common-protos==1.66.0
@@ -79,4 +76,5 @@ Requires-Dist: opentelemetry-instrumentation-vertexai==2.1b0
 Requires-Dist: opentelemetry-instrumentation-weaviate==0.50.1
 Provides-Extra: test
 Requires-Dist: pytest>=8.0; extra == "test"
+Requires-Dist: pyyaml>=6.0; extra == "test"
 Dynamic: license-file

odigos_opentelemetry_python-1.0.90/initializer/__init__.py

@@ -0,0 +1,24 @@
+import logging
+
+from .diagnose import ODIGOS_LOGGER_NAME, OPENTELEMETRY_LOGGER_NAME, apply_log_levels_from_env
+
+
+# This is the main odigos-opentelemetry-python logger setup function.
+# It is used by all modules within this package to ensure that all logs are captured by the same logger.
+#
+# Each controlled logger gets its own console handler and does not propagate to the root logger.
+def setup_logging():
+    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+
+    for logger_name in (ODIGOS_LOGGER_NAME, OPENTELEMETRY_LOGGER_NAME):
+        logger = logging.getLogger(logger_name)
+        handler = logging.StreamHandler()
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+        logger.propagate = False  # Prevent logs from reaching the root logger
+
+    # Apply the diagnostics log levels from environment variables for the startup window, before the first OpAMP remote config.
+    apply_log_levels_from_env()
+
+
+setup_logging()

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/initializer/components.py

@@ -54,6 +54,7 @@ from .exit_hook import ExitHooks
 from .envs import set_static_otel_env
 
 from .odigos_sampler import OdigosSampler
+from .diagnose import apply_log_levels_from_opamp
 
 from opamp.config import Config
 from opamp import opamp_registry
@@ -104,6 +105,10 @@ def initialize_components(trace_exporters=False, span_processor=None):
             except AttributeError:
                 initial_remote_config = None
 
+        # Let the remote config take over the diagnostics log levels from the environment variables.
+        # On the OpAMP error path container_config is None, which silences the loggers.
+        apply_log_levels_from_opamp(container_config)
+
         handle_django_instrumentation()
 
         auto_resource = {
@@ -275,6 +280,10 @@ def update_agent_config(conf: Config):
     :return: If the `provider` is `None` or if `active_proc` is `None`, then the function will return
     without performing any further actions.
     """
+    # Update the diagnostics log levels on every remote config, even before the tracer provider exists.
+    if hasattr(conf, 'container_config'):
+        apply_log_levels_from_opamp(conf.container_config)
+
     provider = get_tracer_provider()
     if provider is None:
         return

odigos_opentelemetry_python-1.0.90/initializer/diagnose.py

@@ -0,0 +1,59 @@
+import logging
+import os
+from typing import Any, Dict, Optional
+
+# log level of the odigos agent itself
+ODIGOS_LOG_LEVEL: str = "ODIGOS_LOG_LEVEL"
+ODIGOS_LOGGER_NAME: str = "odigos"
+# log level of the OpenTelemetry components
+OTEL_LOG_LEVEL: str = "OTEL_LOG_LEVEL"
+OPENTELEMETRY_LOGGER_NAME: str = "opentelemetry"
+
+# Env var vocabulary: the OpenTelemetry standard log level words (case-insensitive).
+_ENV_LEVEL_MAP: Dict[str, Optional[int]] = {
+    "ALL": logging.NOTSET,
+    "VERBOSE": logging.DEBUG,
+    "DEBUG": logging.DEBUG,
+    "INFO": logging.INFO,
+    "WARN": logging.WARNING,
+    "ERROR": logging.ERROR,
+    "NONE": None,
+}
+
+# Remote config vocabulary: log level set sent by the OpAMP server.
+# The key is optional so a missing config level (None) resolves to None, which silences the logger.
+_CONFIG_LEVEL_MAP: Dict[Optional[str], int] = {
+    "error": logging.ERROR,
+    "warn": logging.WARNING,
+    "info": logging.INFO,
+    "debug": logging.DEBUG,
+}
+
+
+def _set_logger_level(logger_name: str, level: Optional[int]) -> None:
+    logger = logging.getLogger(logger_name)
+    if level is None:
+        # No level configured for this logger, so silence it.
+        logger.disabled = True
+    else:
+        logger.disabled = False
+        logger.setLevel(level)
+
+
+def apply_log_levels_from_env() -> None:
+    """
+    This governs the startup window before the first OpAMP remote config is received.
+    An unset or unrecognized value silences the logger.
+    """
+    _set_logger_level(ODIGOS_LOGGER_NAME, _ENV_LEVEL_MAP.get((os.getenv(ODIGOS_LOG_LEVEL) or "").upper()))
+    _set_logger_level(OPENTELEMETRY_LOGGER_NAME, _ENV_LEVEL_MAP.get((os.getenv(OTEL_LOG_LEVEL) or "").upper()))
+
+
+def apply_log_levels_from_opamp(container_config: Optional[Dict[str, Any]]) -> None:
+    """
+    Apply the log levels from the OpAMP remote container config.
+    The remote config fully overrides the environment variables: a missing level silences the logger rather than falling back to the environment.
+    """
+    agent_diagnostics: Dict[str, Any] = (container_config or {}).get("agentDiagnostics", {}) or {}
+    _set_logger_level(ODIGOS_LOGGER_NAME, _CONFIG_LEVEL_MAP.get(agent_diagnostics.get("odigosLogLevel")))
+    _set_logger_level(OPENTELEMETRY_LOGGER_NAME, _CONFIG_LEVEL_MAP.get(agent_diagnostics.get("openTelemetryComponentsLogLevel")))

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/initializer/lib_handling.py

@@ -40,13 +40,7 @@ def reload_distro_modules() -> None:
         'typing_extensions',
     ]
 
-    excluded_modules = ['urllib3_odigos', 'requests_odigos']
-
     for module in list(sys.modules):
-        # Check if the module starts with any of the needed prefixes, but not with any of the excluded prefixes.
-        if any(module.startswith(prefix) for prefix in excluded_modules):
-            continue
-
         if any(module.startswith(prefix) for prefix in needed_module_prefixes):
             module_file = getattr(sys.modules[module], '__file__', None)  # Safely get __file__
             if module_file and ('/etc/odigos-vmagent/' in module_file or '/var/odigos/' in module_file):

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/initializer/odigos_sampler.py

@@ -71,10 +71,10 @@ class OdigosSampler(Sampler):
                     return SamplingResult(Decision.RECORD_AND_SAMPLE, attributes=attributes, trace_state=_get_parent_trace_state(parent_context))
                 else:
                     return SamplingResult(self._not_sampled_decision(), trace_state=_get_parent_trace_state(parent_context))
-            # sampler_logger.debug(f'Running Should_sample a span with the following attributes: {attributes}')
+            sampler_logger.debug(f'Running Should_sample a span with the following attributes: {attributes}')
 
             if self._config is None:
-                # sampler_logger.debug('No configuration is set, returning RECORD_AND_SAMPLE')
+                sampler_logger.debug('No configuration is set, returning RECORD_AND_SAMPLE')
                 return SamplingResult(Decision.RECORD_AND_SAMPLE, attributes=attributes, trace_state=_get_parent_trace_state(parent_context))
 
             is_dry_run: bool = self._config.get('dryRun', False)
@@ -90,7 +90,7 @@ class OdigosSampler(Sampler):
 
                 http_operation_sample: Optional[HeadSamplingOperationMatcher] = noisy_operation.get("operation")
 
-                # sampler_logger.debug(f'Evaluating noisy operation: {noisy_operation}')
+                sampler_logger.debug(f'Evaluating noisy operation: {noisy_operation}')
 
                 # No operation matcher -> rule applies workload-wide (matches every span)
                 # This supports Sampling rules that scope by sourceScopes (workload) without specific HTTP matcher
@@ -104,7 +104,7 @@ class OdigosSampler(Sampler):
                     if (http_client_sample := http_operation_sample.get("httpClient")) and kind == SpanKind.CLIENT:
                         matched = self._match_http_client_sample_rule(http_client_sample, attributes) or matched
 
-                # sampler_logger.debug(f'Noisy operation matched: {matched}, percentage: {percentage_to_sample}')
+                sampler_logger.debug(f'Noisy operation matched: {matched}, percentage: {percentage_to_sample}')
                 if matched and (winning_operation is None or percentage_to_sample < winning_operation.get("percentageAtMost", 0.0)):
                     winning_operation = noisy_operation
 
@@ -120,17 +120,17 @@ class OdigosSampler(Sampler):
 
                 # In dry-run mode, never actually drop spans
                 if is_dry_run:
-                    # sampler_logger.debug(f'Dry run [{trace_id}] would_be_sampled={sampled} (lowest_percentage={lowest_percentage})')
+                    sampler_logger.debug(f'Dry run [{trace_id}] would_be_sampled={sampled} (lowest_percentage={lowest_percentage})')
                     return SamplingResult(Decision.RECORD_AND_SAMPLE, attributes=attributes, trace_state=trace_state)
 
                 if sampled:
-                    # sampler_logger.debug(f'Trace [{trace_id}] is sampled with lowest percentage {lowest_percentage}')
+                    sampler_logger.debug(f'Trace [{trace_id}] is sampled with lowest percentage {lowest_percentage}')
                     return SamplingResult(Decision.RECORD_AND_SAMPLE, attributes=attributes, trace_state=trace_state)
                 else:
-                    # sampler_logger.debug(f'Trace [{trace_id}] is dropped with lowest percentage {lowest_percentage}')
+                    sampler_logger.debug(f'Trace [{trace_id}] is dropped with lowest percentage {lowest_percentage}')
                     return SamplingResult(self._not_sampled_decision(), trace_state=trace_state)
 
-            # sampler_logger.debug('No noisy operation matched, sampling the trace')
+            sampler_logger.debug('No noisy operation matched, sampling the trace')
             return SamplingResult(Decision.RECORD_AND_SAMPLE, attributes=attributes, trace_state=_get_parent_trace_state(parent_context))
 
     def _match_http_server_sample_rule(

odigos_opentelemetry_python-1.0.90/initializer/version.py

@@ -0,0 +1 @@
+VERSION = "1.0.90"

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90/odigos_opentelemetry_python.egg-info}/PKG-INFO

@@ -1,18 +1,15 @@
 Metadata-Version: 2.4
 Name: odigos-opentelemetry-python
-Version: 1.0.89
+Version: 1.0.90
 Summary: Odigos Initializer for Python OpenTelemetry Components
 Author-email: odigos-io <support@odigos.io>
 Requires-Python: >=3.9
 License-File: LICENSE
 Requires-Dist: uuid7==0.1.0
-Requires-Dist: urllib3-odigos==2.2.2
-Requires-Dist: urllib3===2.2.3
-Requires-Dist: odigos-requests==2.32.3.dev0
+Requires-Dist: urllib3>=2.6.3
 Requires-Dist: zipp==3.20.2
 Requires-Dist: idna==3.10
 Requires-Dist: asgiref==3.8.1
-Requires-Dist: requests==2.32.3
 Requires-Dist: certifi==2025.1.31
 Requires-Dist: charset-normalizer==3.4.1
 Requires-Dist: googleapis-common-protos==1.66.0
@@ -79,4 +76,5 @@ Requires-Dist: opentelemetry-instrumentation-vertexai==2.1b0
 Requires-Dist: opentelemetry-instrumentation-weaviate==0.50.1
 Provides-Extra: test
 Requires-Dist: pytest>=8.0; extra == "test"
+Requires-Dist: pyyaml>=6.0; extra == "test"
 Dynamic: license-file

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/odigos_opentelemetry_python.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 initializer/__init__.py
 initializer/components.py
+initializer/diagnose.py
 initializer/envs.py
 initializer/exit_hook.py
 initializer/lib_handling.py

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/odigos_opentelemetry_python.egg-info/requires.txt

@@ -1,11 +1,8 @@
 uuid7==0.1.0
-urllib3-odigos==2.2.2
-urllib3===2.2.3
-odigos-requests==2.32.3.dev0
+urllib3>=2.6.3
 zipp==3.20.2
 idna==3.10
 asgiref==3.8.1
-requests==2.32.3
 certifi==2025.1.31
 charset-normalizer==3.4.1
 googleapis-common-protos==1.66.0
@@ -73,3 +70,4 @@ opentelemetry-instrumentation-weaviate==0.50.1
 
 [test]
 pytest>=8.0
+pyyaml>=6.0

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/opamp/http_client.py

@@ -5,7 +5,7 @@ import json
 import time
 import base64
 import threading
-import requests_odigos
+import http.client
 import logging
 
 from uuid_extensions import uuid7
@@ -69,7 +69,7 @@ class OpAMPHTTPClient:
             python_version = f'{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}'
             error_message = f"Opentelemetry SDK require Python in version 3.8 or higher [{python_version} is not supported]"
 
-            # opamp_logger.warning(f"{error_message}, sending disconnect message to OpAMP server...")
+            opamp_logger.warning(f"{error_message}, sending disconnect message to OpAMP server...")
             self.send_unsupported_version_disconnect_message(error_message=error_message)
             self.opamp_connection_event.event.set()
             return
@@ -94,7 +94,7 @@ class OpAMPHTTPClient:
             self.worker()
 
         except Exception as e:
-            # opamp_logger.error(f"Error running OpAMP client: {e}")
+            opamp_logger.error(f"Error running OpAMP client: {e}")
             failure_message = self.get_agent_failure_disconnect_message(error_message=str(e))
             self.send_agent_to_server_message(failure_message)
 
@@ -234,7 +234,7 @@ class OpAMPHTTPClient:
                                 pass
 
                     if server_to_agent.flags & opamp_pb2.ServerToAgentFlags_ReportFullState:
-                        # opamp_logger.info("Received request to report full state")
+                        opamp_logger.info("Received request to report full state")
 
                         agent_description = self.get_agent_description()
                         agent_health = self.get_agent_health(component_health=True, status=AgentHealthStatus.HEALTHY.value)
@@ -251,8 +251,8 @@ class OpAMPHTTPClient:
                                     # Catch exception and don't update the config
                                     # The default config is preloaded when the EBPFSpanProcessor is initialized
                                     pass
-
-                except requests_odigos.RequestException:
+                # OSError contain all socket or network failures, and HTTPException is for HTTP protocol errors
+                except (OSError, http.client.HTTPException):
                     pass
                 self.condition.wait(30)
 
@@ -330,11 +330,11 @@ class OpAMPHTTPClient:
         return config
 
     def send_heartbeat(self) -> opamp_pb2.ServerToAgent:  # type: ignore
-        # opamp_logger.debug("Sending heartbeat to OpAMP server...")
+        opamp_logger.debug("Sending heartbeat to OpAMP server...")
         try:
             agent_to_server = opamp_pb2.AgentToServer(remote_config_status=self.remote_config_status)
             return self.send_agent_to_server_message(agent_to_server)
-        except requests_odigos.RequestException:
+        except (OSError, http.client.HTTPException):
             pass
 
     def get_agent_description(self) -> opamp_pb2.AgentDescription:  # type: ignore
@@ -419,7 +419,7 @@ class OpAMPHTTPClient:
 
     def shutdown(self, custom_failure_message: Optional[str] = None, component_health: bool = False):
         self.running = False
-        # opamp_logger.info("Sending agent disconnect message to OpAMP server...")
+        opamp_logger.info("Sending agent disconnect message to OpAMP server...")
         if custom_failure_message:
             disconnect_message = self.get_agent_failure_disconnect_message(
                 error_message=custom_failure_message,

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/opamp/transport.py

@@ -2,19 +2,31 @@ import os
 import socket
 import http.client
 
-import requests_odigos
+_OPAMP_PATH = "/v1/opamp"
+
+
+def _post(conn: http.client.HTTPConnection, body: bytes, headers: dict) -> bytes:
+    try:
+        conn.request("POST", _OPAMP_PATH, body=body, headers=headers)
+        response = conn.getresponse()
+        status = response.status
+        data = response.read()
+        if status >= 400:
+            raise http.client.HTTPException(f"opamp POST returned status {status}")
+        return data
+    finally:
+        conn.close()
 
 
 class TCPTransport:
     """HTTP/1.1 over TCP. Talks to ODIGOS_OPAMP_SERVER_HOST."""
 
     def __init__(self, host: str):
-        self._url = f"http://{host}/v1/opamp"
+        self._host = host
 
     def post(self, body: bytes, headers: dict, timeout: float) -> bytes:
-        response = requests_odigos.post(self._url, data=body, headers=headers, timeout=timeout)
-        response.raise_for_status()
-        return response.content
+        conn = http.client.HTTPConnection(self._host, timeout=timeout)
+        return _post(conn, body, headers)
 
 
 class UnixTransport:
@@ -25,14 +37,7 @@ class UnixTransport:
 
     def post(self, body: bytes, headers: dict, timeout: float) -> bytes:
         conn = _UnixHTTPConnection(self._socket_path, timeout=timeout)
-        try:
-            conn.request("POST", "/v1/opamp", body=body, headers=headers)
-            response = conn.getresponse()
-            if response.status >= 400:
-                raise RuntimeError(f"opamp unix POST returned status {response.status}")
-            return response.read()
-        finally:
-            conn.close()
+        return _post(conn, body, headers)
 
 
 class _UnixHTTPConnection(http.client.HTTPConnection):

{odigos_opentelemetry_python-1.0.89 → odigos_opentelemetry_python-1.0.90}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "odigos-opentelemetry-python"
-version = "1.0.89"
+version = "1.0.90"
 description = "Odigos Initializer for Python OpenTelemetry Components"
 requires-python = ">=3.9"
 authors = [
@@ -12,13 +12,10 @@ authors = [
 ]
 dependencies = [
     "uuid7 == 0.1.0",
-    "urllib3-odigos == 2.2.2",
-    "urllib3 === 2.2.3",
-    "odigos-requests == 2.32.3.dev0",
+    "urllib3 >= 2.6.3",  # security floor: urllib3 redirect/retry CVEs fixed in 2.5.0
     "zipp == 3.20.2",
     "idna == 3.10",
     "asgiref == 3.8.1",
-    "requests == 2.32.3",
     "certifi == 2025.1.31",
     "charset-normalizer == 3.4.1",
     "googleapis-common-protos == 1.66.0",
@@ -90,6 +87,7 @@ dependencies = [
 [project.optional-dependencies]
 test = [
     "pytest >= 8.0",
+    "pyyaml >= 6.0",
 ]
 
 [dependency-groups]

odigos_opentelemetry_python-1.0.89/initializer/__init__.py

@@ -1,22 +0,0 @@
-import logging
-
-
-# This is the main odigos-opentelemetry-python logger setup function.
-# It is used by all modules within this package to ensure that all logs are captured by the same logger.
-def setup_logging():
-    odigos_logger = logging.getLogger('odigos')
-    odigos_logger.setLevel(logging.DEBUG)
-    handler = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    handler.setFormatter(formatter)
-    odigos_logger.addHandler(handler)
-
-    odigos_logger.propagate = False  # Prevent logs from reaching the root logger
-    odigos_logger.disabled = True  # Comment to enable the logger
-
-    # Suppress third-party loggers used by odigos-opentelemetry-python (before they are used)
-    logging.getLogger('urllib3_odigos').setLevel(logging.CRITICAL)
-    logging.getLogger('requests_odigos').setLevel(logging.CRITICAL)
-
-
-setup_logging()

odigos_opentelemetry_python-1.0.89/initializer/version.py

@@ -1 +0,0 @@
-VERSION = "1.0.89"