diff --git a/litellm/integrations/otel/logger.py b/litellm/integrations/otel/logger.py index 0403270e8dd..0efdb7a0c0b 100644 --- a/litellm/integrations/otel/logger.py +++ b/litellm/integrations/otel/logger.py @@ -206,6 +206,11 @@ class OpenTelemetryV2(CustomLogger): """The provider this logger emits through, read-only to its callers.""" return self._tracer_provider + @property + def serves_generic_collector(self) -> bool: + """Every exporter is the operator's ``OTEL_*`` destination, as for ``otel`` and mapper-only presets.""" + return all(spec.owner is None for spec in self.config.exporters) + def _init_metrics(self, meter_provider: "MeterProvider | None") -> "GenAIMetricRecorder | None": """Create the six GenAI histograms when metrics are enabled, else ``None``. @@ -263,10 +268,14 @@ class OpenTelemetryV2(CustomLogger): setattr(proxy_server, "open_telemetry_logger", self) def _outranks_for_proxy_slot(self, holder: object) -> bool: - """``otel`` owns the slot whenever configured; a preset holds it only until ``otel`` is built.""" + """The collector's logger owns the slot; a vendor preset holds it only until that logger is built.""" if holder is None: return True - return self.callback_name is None and isinstance(holder, OpenTelemetryV2) and holder.callback_name is not None + return ( + self.serves_generic_collector + and isinstance(holder, OpenTelemetryV2) + and not holder.serves_generic_collector + ) # ====================================================================== # # LLM-call callbacks — the span is opened at the ``pre_call`` boundary and @@ -864,7 +873,7 @@ def select_global_otel_v2_logger( if registered is not None: return registered v2_loggers: Final = tuple(cb for cb in in_memory_loggers if isinstance(cb, OpenTelemetryV2)) - generic: Final = next((cb for cb in v2_loggers if cb.callback_name is None), None) + generic: Final = next((cb for cb in v2_loggers if cb.serves_generic_collector), None) if generic is not None: return generic return v2_loggers[0] if v2_loggers else OpenTelemetryV2() diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py index 5def8368794..a3e2e4d897c 100644 --- a/litellm/litellm_core_utils/litellm_logging.py +++ b/litellm/litellm_core_utils/litellm_logging.py @@ -4499,7 +4499,7 @@ def _init_custom_logger_compatible_class( from litellm.integrations.otel.model.config import OpenTelemetryV2Config for callback in _in_memory_loggers: - if isinstance(callback, OpenTelemetryV2) and callback.callback_name is None: + if isinstance(callback, OpenTelemetryV2) and callback.serves_generic_collector: return callback otel_settings: Final = _get_custom_logger_settings_from_proxy_server(callback_name=logging_integration) otel_logger_v2: Final = build_otel_v2_logger( diff --git a/tests/test_litellm/integrations/otel/test_otel_v2_destinations.py b/tests/test_litellm/integrations/otel/test_otel_v2_destinations.py index f0dad6a5927..ea5a6bf3090 100644 --- a/tests/test_litellm/integrations/otel/test_otel_v2_destinations.py +++ b/tests/test_litellm/integrations/otel/test_otel_v2_destinations.py @@ -1815,15 +1815,36 @@ class TestDestinationOwnership: assert select_global_otel_v2_logger(loggers) is generic assert proxy_server.open_telemetry_logger is generic + def test_the_otel_entry_reuses_a_mapper_only_preset_that_already_serves_the_collector(self, monkeypatch): + """``callbacks: [langtrace, otel]``: Langtrace owns no backend of its own, it is the operator's + collector plus a mapper, so a second generic logger would export every span there twice.""" + sinks = self._capture_exporters(monkeypatch) + self._operator_with(monkeypatch, "langfuse_otel") + loggers: list[CustomLogger] = [] + monkeypatch.setattr(litellm_logging, "_in_memory_loggers", loggers) + + langtrace = in_fresh_context(_maybe_construct_otel_v2, "langtrace", loggers) + generic = in_fresh_context(_init_custom_logger_compatible_class, "otel", None, None) + is_otel_v2_enabled.cache_clear() + + assert isinstance(langtrace, OpenTelemetryV2) and generic is langtrace + assert "langtrace" in langtrace.config.mapper_names + emit(langtrace.tracer_provider, "chat") + langtrace.tracer_provider.force_flush() + assert [s.name for s in sinks[_COLLECTOR].get_finished_spans()] == ["chat"] + @pytest.mark.parametrize("otel_first", [True, False]) def test_the_otel_callback_holds_the_proxy_slot_whatever_the_order(self, monkeypatch, otel_first): from litellm.proxy import proxy_server monkeypatch.setattr(proxy_server, "open_telemetry_logger", None) - config = OpenTelemetryV2Config(exporters=[ExporterSpec(kind="in_memory")]) + generic = OpenTelemetryV2Config(exporters=[ExporterSpec(kind="in_memory")]) + vendor = OpenTelemetryV2Config(exporters=[ExporterSpec(kind="in_memory", owner=ExporterOwner.LANGFUSE_OTEL)]) def build(name): - return build_otel_v2_logger(config, callback_name=None if name == "otel" else name) + if name == "otel": + return build_otel_v2_logger(generic) + return build_otel_v2_logger(vendor, callback_name=name) order = ("otel", "langfuse_otel") if otel_first else ("langfuse_otel", "otel") built = {name: build(name) for name in order} @@ -1834,9 +1855,14 @@ class TestDestinationOwnership: from litellm.proxy import proxy_server monkeypatch.setattr(proxy_server, "open_telemetry_logger", None) - config = OpenTelemetryV2Config(exporters=[ExporterSpec(kind="in_memory")]) - first = build_otel_v2_logger(config, callback_name="langfuse_otel") - second = build_otel_v2_logger(config, callback_name="arize") + first = build_otel_v2_logger( + OpenTelemetryV2Config(exporters=[ExporterSpec(kind="in_memory", owner=ExporterOwner.LANGFUSE_OTEL)]), + callback_name="langfuse_otel", + ) + second = build_otel_v2_logger( + OpenTelemetryV2Config(exporters=[ExporterSpec(kind="in_memory", owner=ExporterOwner.ARIZE_AX)]), + callback_name="arize", + ) assert proxy_server.open_telemetry_logger is first assert select_global_otel_v2_logger([first, second]) is first