odigos-opentelemetry-python 1.0.85__tar.gz → 1.0.87__tar.gz

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/PKG-INFO

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

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/__init__.py

@@ -1,4 +1,4 @@
-import logging 
+import logging
 
 
 # This is the main odigos-opentelemetry-python logger setup function.
@@ -10,12 +10,13 @@ def setup_logging():
     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()
+
+setup_logging()

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/components.py

@@ -1,3 +1,4 @@
+from typing import Union
 from .lib_handling import reorder_python_path, reload_distro_modules, handle_django_instrumentation, handle_eventlet_instrumentation
 
 handle_eventlet_instrumentation()
@@ -74,7 +75,7 @@ def initialize_components(trace_exporters=False, span_processor=None):
         # we will use the default value which is enable traces only.
         if opamp_connection_event.error:
             container_config = None
-            supported_signals = {"traceSignal": True}
+            supported_signals: dict[str, Union[str, bool]] = {"traceSignal": True}
             initial_sampler_config = None
             initial_remote_config = None
         else:
@@ -109,8 +110,8 @@ def initialize_components(trace_exporters=False, span_processor=None):
         odigos_sampler = initialize_traces_if_enabled(
             trace_exporters,
             resource,
-            span_processor,
             supported_signals,
+            span_processor,
             initial_sampler_config,
             initial_remote_config,
         )
@@ -132,8 +133,8 @@ def initialize_components(trace_exporters=False, span_processor=None):
 def initialize_traces_if_enabled(
     trace_exporters,
     resource,
+    signals: dict[str, Union[str, bool]],
     span_processor=None,
-    signals=None,
     initial_sampler_config=None,
     initial_remote_config=None,
 ):
@@ -301,7 +302,7 @@ def update_agent_config(conf: Config):
             proc.update_config(conf)
 
 
-def is_supported_python_version():
+def is_supported_python_version() -> bool:
     return sys.version_info >= MINIMUM_PYTHON_SUPPORTED_VERSION
 
 
@@ -374,11 +375,11 @@ class ProxyResource(Resource):
     @property
     def attributes(self):
         self._refresh_if_needed()
-        return self._cached.attributes
+        return self._cached.attributes if self._cached else None
 
     def merge(self, other: Resource):
         self._refresh_if_needed()
-        return self._cached.merge(other)
+        return self._cached.merge(other) if self._cached else None
 
 
 def _after_in_child():
@@ -390,7 +391,7 @@ def _after_in_child():
     #    Without this, the forked client's sampler is None and config updates
     #    from OpAMP heartbeats are silently dropped.
     provider = get_tracer_provider()
-    if isinstance(getattr(provider, "resource", None), ProxyResource):
+    if isinstance(provider, TracerProvider) and isinstance(provider.resource, ProxyResource):
         provider.resource._child_refreshed = False
     client = start_opamp_client(OpampConnectionEvent())
 

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/distro/distro.py

@@ -1,6 +1,6 @@
 from opentelemetry.instrumentation.distro import BaseDistro
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from importlib.metadata import EntryPoint
+from opentelemetry.util._importlib_metadata import EntryPoint
 from .instrumentation_registry import add_instrumented_library
 
 
@@ -22,14 +22,11 @@ class OdigosDistro(BaseDistro):
         pass
 
     def load_instrumentor(self, entry_point: EntryPoint, **kwargs) -> None:
-        instrumentor: BaseInstrumentor = entry_point.load()
+        instrumentor: type[BaseInstrumentor] = entry_point.load()
         instance = instrumentor()
         instance.instrument(**kwargs)
 
         # Later we can add more details here, like the version of the library, etc.
-        instrumentation_details = {
-            "is_standard_lib": entry_point.name in STANDARD_LIB_MODULES
-        }
+        instrumentation_details = {"is_standard_lib": entry_point.name in STANDARD_LIB_MODULES}
 
         add_instrumented_library(entry_point.name, instrumentation_details)
-

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/distro/instrumentation_registry.py

@@ -1,8 +1,9 @@
-
 _instrumented = {}
 
+
 def add_instrumented_library(name, instrumentation_details) -> None:
     _instrumented[name] = instrumentation_details
 
+
 def get_instrumented_libraries() -> dict:
     return _instrumented

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/envs.py

@@ -4,6 +4,7 @@ static_env_dict = {
     "OTEL_PYTHON_LOG_CORRELATION": "true",
 }
 
+
 def set_static_otel_env():
     """
     Injects environment variables from a dictionary.
@@ -11,4 +12,4 @@ def set_static_otel_env():
     if not isinstance(static_env_dict, dict):
         raise TypeError("static_env_dict must be a dictionary")
 
-    os.environ.update(static_env_dict)
+    os.environ.update(static_env_dict)

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/exit_hook.py

@@ -1,9 +1,12 @@
 import sys
+
+
 class ExitHooks(object):
     """
     The ExitHooks class intercepts program exits to capture the reason for termination.
     It hooks into sys.exit to record exit codes
     """
+
     def __init__(self):
         self.exit_code = None
         self.exception = None
@@ -11,7 +14,7 @@ class ExitHooks(object):
     def hook(self):
         self._orig_exit = sys.exit
         self._orig_excepthook = sys.excepthook
-        sys.exit = self.exit
+        sys.exit = self.exit  # ty: ignore[invalid-assignment]
         sys.excepthook = self.exc_handler
 
     def exit(self, code=0):

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/lib_handling.py

@@ -2,16 +2,17 @@ import sys
 import importlib
 import os
 
+
 def reorder_python_path():
     # Moves '/var/odigos/' [k8s] and '/etc/odigos-vmagent/' [vmagent] paths to end of sys.path
     # to prioritize user dependencies over odigos ones
     paths_to_move = [path for path in sys.path if path.startswith(('/var/odigos/', '/etc/odigos-vmagent/'))]
-    
+
     for path in paths_to_move:
         sys.path.remove(path)
         sys.path.append(path)
-    
-    
+
+
 def reload_distro_modules() -> None:
     # Delete distro modules and their sub-modules, as they have been imported before the path was reordered.
     # The distro modules will be re-imported from the new path.
@@ -30,62 +31,58 @@ def reload_distro_modules() -> None:
         'uuid_extensions.uuid7',
         'typing_extensions',
     ]
-    
-    excluded_modules = [
-        'urllib3_odigos',
-        'requests_odigos'
-    ]
-    
+
+    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):
                 del sys.modules[module]
 
 
-
 ### Django
 
+
 # Disables Django instrumentation if DJANGO_SETTINGS_MODULE is unset and adds the current directory to sys.path for proper Django instrumentation.
 # These changes address this issue: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2495.
 # TODO: Remove once the bug is fixed.
 def handle_django_instrumentation():
     # Get the DJANGO_SETTINGS_MODULE environment variable value.
     django_settings_module = os.getenv('DJANGO_SETTINGS_MODULE', None)
-    
+
     if django_settings_module is None:
         os.environ.setdefault("OTEL_PYTHON_DJANGO_INSTRUMENT", 'False')
-        
+
     else:
         cwd_path = os.getcwd()
         if cwd_path not in sys.path:
-            sys.path.insert(0, cwd_path)    
-        
+            sys.path.insert(0, cwd_path)
+
         # As an additional safeguard, we're ensuring that DJANGO_SETTINGS_MODULE is importable.
         # This is done to prevent instrumentation from being enabled if the Django settings module cannot be imported.
         try:
-            importlib.import_module(django_settings_module) 
-        except:
+            importlib.import_module(django_settings_module)
+        except Exception:
             os.environ.setdefault("OTEL_PYTHON_DJANGO_INSTRUMENT", 'False')
-        
+
 
 def handle_eventlet_instrumentation():
     """Checks if eventlet is importable and applies eventlet.monkey_patch if available."""
     # Apply monkey_patch early to enable Eventlet's green threads for non-blocking I/O.
     # Per Eventlet docs, it must run before imports or class definitions that use patched modules (e.g., socket).
     # https://eventlet.readthedocs.io/en/v0.35.1/patching.html#monkey-patch
-    
+
     # Currently should run only if no OPAMP client is running, as tested only for the VM agent.
     if os.getenv('DISABLE_OPAMP_CLIENT', 'false').strip().lower() == 'true':
         try:
             eventlet = importlib.import_module("eventlet")
             if not getattr(eventlet, "_opamp_patched", False):  # Avoid multiple patches
                 eventlet.monkey_patch()
-                eventlet._opamp_patched = True
+                setattr(eventlet, "_opamp_patched", True)
         except ImportError:
-            pass            
-            
+            pass

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/post_instrument.py

@@ -1,6 +1,7 @@
 from opamp import opamp_registry
 from .distro import instrumentation_registry
 
+
 def run_post_hook():
     client = opamp_registry.get_client()
 

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/initializer/process_resource.py

@@ -1,8 +1,8 @@
-# This file contains code inspired by OpenTelemetry's resource detection mechanisms 
-# (https://opentelemetry.io/). It adapts and extends the logic to include additional 
+# This file contains code inspired by OpenTelemetry's resource detection mechanisms
+# (https://opentelemetry.io/). It adapts and extends the logic to include additional
 # attributes required for our use case.
 #
-# OpenTelemetry is licensed under the Apache License, Version 2.0. This adaptation respects 
+# OpenTelemetry is licensed under the Apache License, Version 2.0. This adaptation respects
 # the original licensing terms and acknowledges OpenTelemetry as a source of reference.
 #
 # For OpenTelemetry’s original implementation, see:
@@ -10,20 +10,26 @@
 
 import os
 from opentelemetry.sdk.resources import Resource, ProcessResourceDetector
-from opentelemetry.semconv.resource import ResourceAttributes
+from opentelemetry.semconv._incubating.attributes.process_attributes import (
+    PROCESS_COMMAND,
+    PROCESS_COMMAND_ARGS,
+    PROCESS_COMMAND_LINE,
+    PROCESS_PID,
+)
 
 PROCESS_VPID = "process.vpid"
 
 # Custom implementation of ProcessResourceDetector.
-# 
-# This detector is based on OpenTelemetry's resource detection logic but has been 
-# implemented separately because the standard OpenTelemetry detector does not support 
-# the "process.vpid" attribute. This attribute is necessary for our use case to track 
+#
+# This detector is based on OpenTelemetry's resource detection logic but has been
+# implemented separately because the standard OpenTelemetry detector does not support
+# the "process.vpid" attribute. This attribute is necessary for our use case to track
 # process-specific information that is not covered by OpenTelemetry’s built-in attributes.
 #
-# By extending the OpenTelemetry approach, we ensure compatibility while adding the 
+# By extending the OpenTelemetry approach, we ensure compatibility while adding the
 # additional attribute we require.
 
+
 # ProcessResourceDetector
 class OdigosProcessResourceDetector(ProcessResourceDetector):
     def __init__(self, pid):
@@ -37,18 +43,18 @@ class OdigosProcessResourceDetector(ProcessResourceDetector):
         # Extract attributes as a dictionary (resource_info is a Resource object)
         attributes = dict(resource_info.attributes)
 
-        attributes.pop(ResourceAttributes.PROCESS_COMMAND_ARGS, None)  # Remove PROCESS_COMMAND_ARGS if exists
-        
+        attributes.pop(PROCESS_COMMAND_ARGS, None)  # Remove PROCESS_COMMAND_ARGS if exists
+
         if os.getenv("DISABLE_OPAMP_CLIENT", "false").strip().lower() == "false":
-            attributes.pop(ResourceAttributes.PROCESS_PID, None)  # Remove PROCESS_PID if exists
+            attributes.pop(PROCESS_PID, None)  # Remove PROCESS_PID if exists
             attributes[PROCESS_VPID] = self.pid
-            
+
         # Fix for cases where the app is run via `python -m <module>`:
         # sys.argv[0] becomes "-m", which leads to wrong process.command attribute.
         # To get the real command, read from /proc/self/cmdline (Linux only).
         # Falls back silently if reading fails.
         # See: https://github.com/open-telemetry/opentelemetry-python/issues/4518
-        process_command = attributes.get(ResourceAttributes.PROCESS_COMMAND, None)
+        process_command = attributes.get(PROCESS_COMMAND, None)
         if process_command is not None and process_command == '-m':
             try:
                 with open("/proc/self/cmdline", "rb") as command_file:
@@ -57,12 +63,12 @@ class OdigosProcessResourceDetector(ProcessResourceDetector):
                 if raw_cmdline:
                     command_line = raw_cmdline.decode(errors="ignore").split('\0')
                     if command_line and command_line[0]:
-                        attributes[ResourceAttributes.PROCESS_COMMAND] = command_line[0]
-                        attributes[ResourceAttributes.PROCESS_COMMAND_LINE] = " ".join(command_line)
-            
+                        attributes[PROCESS_COMMAND] = command_line[0]
+                        attributes[PROCESS_COMMAND_LINE] = " ".join(command_line)
+
             # On failure, we retain the default behavior from the base resource detector
             except Exception:
                 pass
 
         # Return a new Resource instance with updated attributes
-        return Resource.create(attributes)
+        return Resource.create(attributes)

odigos_opentelemetry_python-1.0.87/initializer/version.py

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

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/odigos_opentelemetry_python.egg-info/PKG-INFO

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

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/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.87/opamp/anyvalue_pb2.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: anyvalue.proto
+"""Generated protocol buffer code."""
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n\x0e\x61nyvalue.proto\x12\x0bopamp.proto"\xe8\x01\n\x08\x41nyValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x04 \x01(\x01H\x00\x12.\n\x0b\x61rray_value\x18\x05 \x01(\x0b\x32\x17.opamp.proto.ArrayValueH\x00\x12\x31\n\x0ckvlist_value\x18\x06 \x01(\x0b\x32\x19.opamp.proto.KeyValueListH\x00\x12\x15\n\x0b\x62ytes_value\x18\x07 \x01(\x0cH\x00\x42\x07\n\x05value"3\n\nArrayValue\x12%\n\x06values\x18\x01 \x03(\x0b\x32\x15.opamp.proto.AnyValue"5\n\x0cKeyValueList\x12%\n\x06values\x18\x01 \x03(\x0b\x32\x15.opamp.proto.KeyValue"=\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.opamp.proto.AnyValueB.Z,github.com/open-telemetry/opamp-go/protobufsb\x06proto3'
+)
+
+
+_ANYVALUE = DESCRIPTOR.message_types_by_name['AnyValue']
+_ARRAYVALUE = DESCRIPTOR.message_types_by_name['ArrayValue']
+_KEYVALUELIST = DESCRIPTOR.message_types_by_name['KeyValueList']
+_KEYVALUE = DESCRIPTOR.message_types_by_name['KeyValue']
+AnyValue = _reflection.GeneratedProtocolMessageType(
+    'AnyValue',
+    (_message.Message,),
+    {
+        'DESCRIPTOR': _ANYVALUE,
+        '__module__': 'anyvalue_pb2',
+        # @@protoc_insertion_point(class_scope:opamp.proto.AnyValue)
+    },
+)
+_sym_db.RegisterMessage(AnyValue)
+
+ArrayValue = _reflection.GeneratedProtocolMessageType(
+    'ArrayValue',
+    (_message.Message,),
+    {
+        'DESCRIPTOR': _ARRAYVALUE,
+        '__module__': 'anyvalue_pb2',
+        # @@protoc_insertion_point(class_scope:opamp.proto.ArrayValue)
+    },
+)
+_sym_db.RegisterMessage(ArrayValue)
+
+KeyValueList = _reflection.GeneratedProtocolMessageType(
+    'KeyValueList',
+    (_message.Message,),
+    {
+        'DESCRIPTOR': _KEYVALUELIST,
+        '__module__': 'anyvalue_pb2',
+        # @@protoc_insertion_point(class_scope:opamp.proto.KeyValueList)
+    },
+)
+_sym_db.RegisterMessage(KeyValueList)
+
+KeyValue = _reflection.GeneratedProtocolMessageType(
+    'KeyValue',
+    (_message.Message,),
+    {
+        'DESCRIPTOR': _KEYVALUE,
+        '__module__': 'anyvalue_pb2',
+        # @@protoc_insertion_point(class_scope:opamp.proto.KeyValue)
+    },
+)
+_sym_db.RegisterMessage(KeyValue)
+
+if _descriptor._USE_C_DESCRIPTORS == False:
+    DESCRIPTOR._options = None
+    DESCRIPTOR._serialized_options = b'Z,github.com/open-telemetry/opamp-go/protobufs'
+    _ANYVALUE._serialized_start = 32
+    _ANYVALUE._serialized_end = 264
+    _ARRAYVALUE._serialized_start = 266
+    _ARRAYVALUE._serialized_end = 317
+    _KEYVALUELIST._serialized_start = 319
+    _KEYVALUELIST._serialized_end = 372
+    _KEYVALUE._serialized_start = 374
+    _KEYVALUE._serialized_end = 435
+# @@protoc_insertion_point(module_scope)

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/opamp/health_status.py

@@ -1,5 +1,6 @@
 from enum import Enum
 
+
 class AgentHealthStatus(str, Enum):
     HEALTHY = "Healthy"
     STARTING = "Starting"

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/opamp/http_client.py

@@ -1,3 +1,4 @@
+from typing import Optional, cast
 import os
 import sys
 import json
@@ -8,7 +9,14 @@ import requests_odigos
 import logging
 
 from uuid_extensions import uuid7
-from opentelemetry.semconv.resource import ResourceAttributes
+from opentelemetry.semconv._incubating.attributes.k8s_attributes import (
+    K8S_CONTAINER_NAME,
+    K8S_NAMESPACE_NAME,
+    K8S_POD_NAME,
+)
+from opentelemetry.semconv._incubating.attributes.process_attributes import PROCESS_PID
+from opentelemetry.semconv.attributes.service_attributes import SERVICE_INSTANCE_ID
+from opentelemetry.semconv.attributes.telemetry_attributes import TELEMETRY_SDK_LANGUAGE
 from opentelemetry.context import (
     _SUPPRESS_HTTP_INSTRUMENTATION_KEY,
     attach,
@@ -16,7 +24,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
 
@@ -31,16 +39,15 @@ opamp_logger = logging.getLogger('odigos')
 _debugger_instance = None
 
 env_var_mappings = {
-    "ODIGOS_WORKLOAD_NAMESPACE": ResourceAttributes.K8S_NAMESPACE_NAME,
-    "ODIGOS_CONTAINER_NAME": ResourceAttributes.K8S_CONTAINER_NAME,
-    "ODIGOS_POD_NAME": ResourceAttributes.K8S_POD_NAME,
+    "ODIGOS_WORKLOAD_NAMESPACE": K8S_NAMESPACE_NAME,
+    "ODIGOS_CONTAINER_NAME": K8S_CONTAINER_NAME,
+    "ODIGOS_POD_NAME": K8S_POD_NAME,
 }
 
 
 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 +64,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 +270,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.
@@ -306,7 +313,7 @@ class OpAMPHTTPClient:
         config = Config()
 
         # Extract container_config if present
-        container_config = decoded_map.get("container_config", None)
+        container_config: Optional[dict] = cast(Optional[dict], decoded_map.get("container_config"))
         if container_config is not None:
             config.container_config = container_config
 
@@ -344,14 +351,14 @@ class OpAMPHTTPClient:
         # Add additional attributes from environment variables
 
         if os.getenv("DISABLE_OPAMP_CLIENT", "false").strip().lower() == "true":
-            process_id_key = ResourceAttributes.PROCESS_PID
+            process_id_key = PROCESS_PID
         else:
             process_id_key = PROCESS_VPID
 
         identifying_attributes = [
-            anyvalue_pb2.KeyValue(key=ResourceAttributes.SERVICE_INSTANCE_ID, value=anyvalue_pb2.AnyValue(string_value=self.instance_uid)),
+            anyvalue_pb2.KeyValue(key=SERVICE_INSTANCE_ID, value=anyvalue_pb2.AnyValue(string_value=self.instance_uid)),
             anyvalue_pb2.KeyValue(key=process_id_key, value=anyvalue_pb2.AnyValue(int_value=self.pid)),
-            anyvalue_pb2.KeyValue(key=ResourceAttributes.TELEMETRY_SDK_LANGUAGE, value=anyvalue_pb2.AnyValue(string_value="python")),
+            anyvalue_pb2.KeyValue(key=TELEMETRY_SDK_LANGUAGE, value=anyvalue_pb2.AnyValue(string_value="python")),
         ]
 
         # Add additional attributes from environment variables
@@ -392,8 +399,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 +407,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.85 → odigos_opentelemetry_python-1.0.87}/opamp/opamp_registry.py

@@ -1,17 +1,19 @@
 import os
-
+from typing import Optional
 from opamp.http_client import OpAMPHTTPClient
 
 
 _client = None
 _client_pid = None
 
+
 def set_client(client) -> None:
     global _client, _client_pid
     _client = client
     _client_pid = os.getpid()
 
-def get_client() -> OpAMPHTTPClient:
+
+def get_client() -> Optional[OpAMPHTTPClient]:
     if _client_pid != os.getpid():
         return None  # Defensive: ensure we don't return a client from a different process
     return _client

odigos_opentelemetry_python-1.0.87/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.85 → odigos_opentelemetry_python-1.0.87}/opamp/utils.py

@@ -1,5 +1,7 @@
+from typing import Union
 import json
 
+
 def get_container_config(config_map):
     """
     Extracts and parses the container configuration from the config map.
@@ -13,7 +15,7 @@ def get_container_config(config_map):
         return {}
 
 
-def parse_first_message_signals(container_config): # type: ignore
+def parse_first_message_signals(container_config) -> dict[str, Union[str, bool]]:
     """
     Parses the trace, logs, and metrics signals from the container config.
     Signal is considered enabled if its key exists in the config.

{odigos_opentelemetry_python-1.0.85 → odigos_opentelemetry_python-1.0.87}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "odigos-opentelemetry-python"
-version = "1.0.85"
+version = "1.0.87"
 description = "Odigos Initializer for Python OpenTelemetry Components"
 requires-python = ">=3.9"
 authors = [
@@ -139,6 +139,8 @@ extend-exclude = [
     "build",
     "*.egg-info",
     "tests/integration/configurator",
+    "instrumentations/",
+    "*_pb2.py",
 ]
 
 [tool.ruff.lint]
@@ -161,4 +163,7 @@ exclude = [
     "dist",
     "build",
     "tests/integration/configurator",
+    "tests/integration/apps",
+    "instrumentations/",
+    "opamp/opamp_pb2.py"
 ]

odigos_opentelemetry_python-1.0.85/initializer/version.py

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

odigos_opentelemetry_python-1.0.85/opamp/anyvalue_pb2.py

@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: anyvalue.proto
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x61nyvalue.proto\x12\x0bopamp.proto\"\xe8\x01\n\x08\x41nyValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x04 \x01(\x01H\x00\x12.\n\x0b\x61rray_value\x18\x05 \x01(\x0b\x32\x17.opamp.proto.ArrayValueH\x00\x12\x31\n\x0ckvlist_value\x18\x06 \x01(\x0b\x32\x19.opamp.proto.KeyValueListH\x00\x12\x15\n\x0b\x62ytes_value\x18\x07 \x01(\x0cH\x00\x42\x07\n\x05value\"3\n\nArrayValue\x12%\n\x06values\x18\x01 \x03(\x0b\x32\x15.opamp.proto.AnyValue\"5\n\x0cKeyValueList\x12%\n\x06values\x18\x01 \x03(\x0b\x32\x15.opamp.proto.KeyValue\"=\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.opamp.proto.AnyValueB.Z,github.com/open-telemetry/opamp-go/protobufsb\x06proto3')
-
-
-
-_ANYVALUE = DESCRIPTOR.message_types_by_name['AnyValue']
-_ARRAYVALUE = DESCRIPTOR.message_types_by_name['ArrayValue']
-_KEYVALUELIST = DESCRIPTOR.message_types_by_name['KeyValueList']
-_KEYVALUE = DESCRIPTOR.message_types_by_name['KeyValue']
-AnyValue = _reflection.GeneratedProtocolMessageType('AnyValue', (_message.Message,), {
-  'DESCRIPTOR' : _ANYVALUE,
-  '__module__' : 'anyvalue_pb2'
-  # @@protoc_insertion_point(class_scope:opamp.proto.AnyValue)
-  })
-_sym_db.RegisterMessage(AnyValue)
-
-ArrayValue = _reflection.GeneratedProtocolMessageType('ArrayValue', (_message.Message,), {
-  'DESCRIPTOR' : _ARRAYVALUE,
-  '__module__' : 'anyvalue_pb2'
-  # @@protoc_insertion_point(class_scope:opamp.proto.ArrayValue)
-  })
-_sym_db.RegisterMessage(ArrayValue)
-
-KeyValueList = _reflection.GeneratedProtocolMessageType('KeyValueList', (_message.Message,), {
-  'DESCRIPTOR' : _KEYVALUELIST,
-  '__module__' : 'anyvalue_pb2'
-  # @@protoc_insertion_point(class_scope:opamp.proto.KeyValueList)
-  })
-_sym_db.RegisterMessage(KeyValueList)
-
-KeyValue = _reflection.GeneratedProtocolMessageType('KeyValue', (_message.Message,), {
-  'DESCRIPTOR' : _KEYVALUE,
-  '__module__' : 'anyvalue_pb2'
-  # @@protoc_insertion_point(class_scope:opamp.proto.KeyValue)
-  })
-_sym_db.RegisterMessage(KeyValue)
-
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'Z,github.com/open-telemetry/opamp-go/protobufs'
-  _ANYVALUE._serialized_start=32
-  _ANYVALUE._serialized_end=264
-  _ARRAYVALUE._serialized_start=266
-  _ARRAYVALUE._serialized_end=317
-  _KEYVALUELIST._serialized_start=319
-  _KEYVALUELIST._serialized_end=372
-  _KEYVALUE._serialized_start=374
-  _KEYVALUE._serialized_end=435
-# @@protoc_insertion_point(module_scope)