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

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

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

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

@@ -1,5 +1,11 @@
 from typing import Union
-from .lib_handling import reorder_python_path, reload_distro_modules, handle_django_instrumentation, handle_eventlet_instrumentation
+from .lib_handling import (
+    reorder_python_path,
+    reload_distro_modules,
+    handle_django_instrumentation,
+    handle_eventlet_instrumentation,
+    patch_otlp_span_flags,
+)
 
 handle_eventlet_instrumentation()
 
@@ -38,6 +44,11 @@ from opentelemetry.trace import set_tracer_provider, get_tracer_provider
 # before reshuffling) and before opamp below (it imports protobuf—the app should own that).
 reorder_python_path()
 
+# Backport OTLP Span.flags trace-flags encoding
+# (upstream PR #4761: https://github.com/open-telemetry/opentelemetry-python/pull/4761)
+# onto the canonical exporter module now that sys.path prefers the agent's copy.
+patch_otlp_span_flags()
+
 from .version import VERSION
 from .exit_hook import ExitHooks
 from .envs import set_static_otel_env

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

@@ -1,6 +1,14 @@
+from __future__ import annotations
+
 import sys
 import importlib
 import os
+from typing import TYPE_CHECKING, Optional, Sequence
+
+if TYPE_CHECKING:
+    from opentelemetry.proto.trace.v1.trace_pb2 import Span as PB2Span
+    from opentelemetry.sdk.trace import ReadableSpan
+    from opentelemetry.trace import Link
 
 
 def reorder_python_path():
@@ -71,6 +79,40 @@ def handle_django_instrumentation():
             os.environ.setdefault("OTEL_PYTHON_DJANGO_INSTRUMENT", 'False')
 
 
+def patch_otlp_span_flags() -> None:
+    # Backport of https://github.com/open-telemetry/opentelemetry-python/pull/4761:
+    # include W3C TraceFlags (lower 8 bits, e.g. the sampled bit) in the OTLP Span.flags / Link.flags alongside the existing is-remote bits (8-9).
+    # We wrap the encode helpers instead of replacing _span_flags because the PR also changed that function's signature and both of its call sites.
+    try:
+        from opentelemetry.exporter.otlp.proto.common._internal import trace_encoder
+    except ImportError:
+        return
+
+    original_encode_span = trace_encoder._encode_span
+    original_encode_links = trace_encoder._encode_links
+
+    # W3C TraceFlags is a single byte (values 0-255), and the encoder's existing
+    # flags only ever set the higher has-remote / is-remote bits.
+    def encode_span(sdk_span: ReadableSpan) -> PB2Span:
+        encoded_span = original_encode_span(sdk_span)
+        # THE FIX: fold the W3C trace flags into Span.flags (PR #4761).
+        encoded_span.flags |= int(sdk_span.get_span_context().trace_flags)
+        return encoded_span
+
+    def encode_links(links: Sequence[Link]) -> Optional[Sequence[PB2Span.Link]]:
+        encoded_links = original_encode_links(links)
+        if encoded_links:
+            # Propagate the trace flags to links as well
+            for link, encoded_link in zip(links, encoded_links):
+                # THE FIX: fold the W3C trace flags into Link.flags (PR #4761).
+                encoded_link.flags |= int(link.context.trace_flags)
+        return encoded_links
+
+    setattr(trace_encoder, "_encode_span", encode_span)
+    setattr(trace_encoder, "_encode_links", encode_links)
+    setattr(trace_encoder, "_odigos_trace_flags_patched", True)
+
+
 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.

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

@@ -98,10 +98,10 @@ class OdigosSampler(Sampler):
                     matched = True
                 else:  # When we have a granular operation, check it vs the server/client rules specified in the noisy operation
                     matched = False
-                    if http_server_sample := http_operation_sample.get("httpServer"):
+                    if (http_server_sample := http_operation_sample.get("httpServer")) and kind == SpanKind.SERVER:
                         matched = self._match_http_server_sample_rule(http_server_sample, attributes) or matched
 
-                    if http_client_sample := http_operation_sample.get("httpClient"):
+                    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}')
@@ -156,8 +156,10 @@ class OdigosSampler(Sampler):
             if target:
                 return self._match_rule_route_to_span(http_server_rule["route"], target)
 
-        if http_server_rule.get("routePrefix") and not (span_route or "").startswith(http_server_rule["routePrefix"]):
-            return False
+        if route_prefix := http_server_rule.get("routePrefix"):
+            candidate = span_route or target
+            if not candidate or not self._match_rule_route_to_span(route_prefix, candidate, route_has_prefix=True):
+                return False
         if http_server_rule.get("method") and http_server_rule["method"] != span_method:
             return False
 
@@ -175,6 +177,13 @@ class OdigosSampler(Sampler):
         server_address = get_attribute(span_attributes, server_attributes_semconv.SERVER_ADDRESS, "net.peer.name", "http.host")
         if server_address:
             server_address = strip_port(server_address)
+        else:
+            # some instrumentations (like urllib) never puts a host attribute on the span. it sets only method + url,
+            # so if we want the host we need to extract it from the full url
+            # default (old) semconv mode the full URL is http.url; in stable mode url.full.
+            full_url = get_attribute(span_attributes, "url.full", "http.url")
+            if full_url:
+                server_address = urlsplit(full_url).hostname
 
         # Old semconv for url is a target that we need to get the client_path from → new semconv: "url.template"/"url.path"
         client_path = get_attribute(span_attributes, "url.template", url_attributes_semconv.URL_PATH)

odigos_opentelemetry_python-1.0.89/initializer/version.py

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

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

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

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

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

odigos_opentelemetry_python-1.0.88/initializer/version.py

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