odigos-opentelemetry-python 1.0.84__tar.gz → 1.0.86__tar.gz

{odigos_opentelemetry_python-1.0.84 → odigos_opentelemetry_python-1.0.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odigos-opentelemetry-python
-Version: 1.0.84
+Version: 1.0.86
 Summary: Odigos Initializer for Python OpenTelemetry Components
 Author-email: odigos-io <support@odigos.io>
 Requires-Python: >=3.9

odigos_opentelemetry_python-1.0.86/initializer/version.py

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

{odigos_opentelemetry_python-1.0.84 → odigos_opentelemetry_python-1.0.86}/odigos_opentelemetry_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odigos-opentelemetry-python
-Version: 1.0.84
+Version: 1.0.86
 Summary: Odigos Initializer for Python OpenTelemetry Components
 Author-email: odigos-io <support@odigos.io>
 Requires-Python: >=3.9

{odigos_opentelemetry_python-1.0.84 → odigos_opentelemetry_python-1.0.86}/odigos_opentelemetry_python.egg-info/SOURCES.txt

@@ -29,4 +29,5 @@ opamp/health_status.py
 opamp/http_client.py
 opamp/opamp_pb2.py
 opamp/opamp_registry.py
+opamp/transport.py
 opamp/utils.py

{odigos_opentelemetry_python-1.0.84 → odigos_opentelemetry_python-1.0.86}/opamp/http_client.py

@@ -6,6 +6,7 @@ import base64
 import threading
 import requests_odigos
 import logging
+from typing import Optional
 
 from uuid_extensions import uuid7
 from opentelemetry.semconv.resource import ResourceAttributes
@@ -16,7 +17,7 @@ from opentelemetry.context import (
     set_value,
 )
 
-from opamp import opamp_pb2, anyvalue_pb2, utils
+from opamp import opamp_pb2, anyvalue_pb2, transport, utils
 from opamp.health_status import AgentHealthStatus
 from initializer.process_resource import PROCESS_VPID
 
@@ -39,8 +40,7 @@ env_var_mappings = {
 
 class OpAMPHTTPClient:
     def __init__(self, opamp_connection_event, condition: threading.Condition):
-        self.server_host = os.getenv('ODIGOS_OPAMP_SERVER_HOST')
-        self.server_url = f"http://{self.server_host}/v1/opamp"
+        self._transport = transport.from_env()
         self.container_config = {}
         self.running = True
         self.condition = condition
@@ -57,7 +57,7 @@ class OpAMPHTTPClient:
     def __repr__(self):
         return f"<OpAMPHTTPClient instance_uid={self.instance_uid} pid={self.pid}>"
 
-    def start(self, python_version_supported: bool = None):
+    def start(self, python_version_supported: bool = False):
         if not python_version_supported:
             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]"
@@ -263,7 +263,7 @@ class OpAMPHTTPClient:
 
         self.send_agent_to_server_message(opamp_pb2.AgentToServer(health=health_msg))
 
-    def get_remote_config(self, message) -> dict:
+    def get_remote_config(self, message) -> Config:
         """
         Given a Protobuf message with a 'remote_config' field,
         decode all bytes and base64-encoded subfields into a clean Python dict.
@@ -392,8 +392,7 @@ class OpAMPHTTPClient:
 
         try:
             agent_message = attach(set_value(_SUPPRESS_HTTP_INSTRUMENTATION_KEY, True))
-            response = requests_odigos.post(self.server_url, data=message_bytes, headers=headers, timeout=5)
-            response.raise_for_status()
+            response_bytes = self._transport.post(message_bytes, headers, timeout=5)
         except Exception:
             return opamp_pb2.ServerToAgent()
         finally:
@@ -401,24 +400,17 @@ class OpAMPHTTPClient:
 
         server_to_agent = opamp_pb2.ServerToAgent()
         try:
-            server_to_agent.ParseFromString(response.content)
+            server_to_agent.ParseFromString(response_bytes)
         except (DecodeError, NotImplementedError):
             return opamp_pb2.ServerToAgent()
         return server_to_agent
 
     def mandatory_env_vars_set(self):
-        mandatory_env_vars = {
-            "ODIGOS_OPAMP_SERVER_HOST": self.server_host,
-        }
-
-        for env_var, value in mandatory_env_vars.items():
-            if not value:
-                # opamp_logger.error(f"{env_var} environment variable not set")
-                return False
-
-        return True
+        # Either ODIGOS_OPAMP_UNIX_SOCKET or ODIGOS_OPAMP_SERVER_HOST must be set;
+        # transport.from_env() returns None when neither is configured.
+        return self._transport is not None
 
-    def shutdown(self, custom_failure_message: str = None, component_health: bool = False):
+    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...")
         if custom_failure_message:

odigos_opentelemetry_python-1.0.86/opamp/transport.py

@@ -0,0 +1,64 @@
+import os
+import socket
+import http.client
+
+import requests_odigos
+
+
+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"
+
+    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
+
+
+class UnixTransport:
+    """HTTP/1.1 over an AF_UNIX stream socket. Talks to ODIGOS_OPAMP_UNIX_SOCKET."""
+
+    def __init__(self, socket_path: str):
+        self._socket_path = socket_path
+
+    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()
+
+
+class _UnixHTTPConnection(http.client.HTTPConnection):
+    """http.client.HTTPConnection that talks over a unix domain socket."""
+
+    def __init__(self, socket_path: str, timeout: float):
+        super().__init__("localhost", timeout=timeout)
+        self._socket_path = socket_path
+
+    def connect(self):
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        sock.settimeout(self.timeout)
+        sock.connect(self._socket_path)
+        self.sock = sock
+
+
+def from_env():
+    """Pick an OpAMP transport from env vars. ODIGOS_OPAMP_UNIX_SOCKET wins if both are set.
+    Returns None if neither is set so the client can fail fast on missing config.
+    """
+    socket_path = os.getenv("ODIGOS_OPAMP_UNIX_SOCKET")
+    if socket_path:
+        return UnixTransport(socket_path)
+
+    host = os.getenv("ODIGOS_OPAMP_SERVER_HOST")
+    if host:
+        return TCPTransport(host)
+
+    return None

{odigos_opentelemetry_python-1.0.84 → odigos_opentelemetry_python-1.0.86}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "odigos-opentelemetry-python"
-version = "1.0.84"
+version = "1.0.86"
 description = "Odigos Initializer for Python OpenTelemetry Components"
 requires-python = ">=3.9"
 authors = [

odigos_opentelemetry_python-1.0.84/initializer/version.py

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