From 33216b18f357688f61d59621d0d379892442aeb9 Mon Sep 17 00:00:00 2001 From: milan-berri Date: Wed, 22 Apr 2026 05:24:09 +0300 Subject: [PATCH 1/2] fix(otel): preserve Splunk Observability Cloud trace OTLP endpoint (#26183) * fix(otel): preserve Splunk Observability Cloud trace OTLP URL Splunk ingest uses /v2/trace/otlp; _normalize_otel_endpoint must not append /v1/traces. - Return trace endpoints unchanged when they match Splunk OTLP path patterns - Add unit tests for observability.splunkcloud.com, signalfx.com, and /trace/otlp suffix - Set OTEL_EXPORTER_OTLP_PROTOCOL in protocol selection tests (from_env precedence over OTEL_EXPORTER) Made-with: Cursor * test(otel): use parameterized.expand for Splunk OTLP URL cases Made-with: Cursor * fix(otel): narrow Splunk trace URL guard to /v2/trace/otlp only Made-with: Cursor * test(otel): cover OTEL_EXPORTER fallback when OTLP protocol env unset Made-with: Cursor --- litellm/integrations/opentelemetry.py | 4 + .../integrations/test_opentelemetry.py | 88 ++++++++++++++++++- 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/litellm/integrations/opentelemetry.py b/litellm/integrations/opentelemetry.py index 7ff360758e8b..b6d91d0b76d7 100644 --- a/litellm/integrations/opentelemetry.py +++ b/litellm/integrations/opentelemetry.py @@ -2289,6 +2289,10 @@ def _normalize_otel_endpoint( # Remove trailing slash endpoint = endpoint.rstrip("/") + # Splunk Observability Cloud OTLP/HTTP uses /v2/trace/otlp (not /v1/traces). Do not rewrite. + if signal_type == "traces" and "/v2/trace/otlp" in endpoint: + return endpoint + # Check if endpoint already ends with the correct signal path target_path = f"/v1/{signal_type}" if endpoint.endswith(target_path): diff --git a/tests/test_litellm/integrations/test_opentelemetry.py b/tests/test_litellm/integrations/test_opentelemetry.py index e723298b1c9c..f71064718942 100644 --- a/tests/test_litellm/integrations/test_opentelemetry.py +++ b/tests/test_litellm/integrations/test_opentelemetry.py @@ -1047,6 +1047,36 @@ def test_normalize_endpoint_with_trailing_slash(self): result = otel._normalize_otel_endpoint("http://collector:4318/", "traces") self.assertEqual(result, "http://collector:4318/v1/traces") + @parameterized.expand( + [ + ( + "https://ingest.eu1.observability.splunkcloud.com/v2/trace/otlp", + "https://ingest.eu1.observability.splunkcloud.com/v2/trace/otlp", + ), + ( + "https://ingest.us0.observability.splunkcloud.com/v2/trace/otlp/", + "https://ingest.us0.observability.splunkcloud.com/v2/trace/otlp", + ), + ( + "https://ingest.eu0.signalfx.com/v2/trace/otlp", + "https://ingest.eu0.signalfx.com/v2/trace/otlp", + ), + ( + "https://example.com/prefix/v2/trace/otlp", + "https://example.com/prefix/v2/trace/otlp", + ), + ] + ) + def test_normalize_traces_nonstandard_otlp_ingest_urls_unchanged( + self, input_url: str, expected: str + ) -> None: + """Splunk-style /v2/trace/otlp endpoints must not get /v1/traces appended.""" + otel = OpenTelemetry() + self.assertEqual( + otel._normalize_otel_endpoint(input_url, "traces"), + expected, + ) + def test_normalize_endpoint_none(self): """Test that None endpoint returns None""" otel = OpenTelemetry() @@ -1315,7 +1345,7 @@ def test_get_log_exporter_defaults_to_console_for_unknown_protocol(self): @patch.dict( os.environ, { - "OTEL_EXPORTER": "otlp_http", + "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf", "OTEL_EXPORTER_OTLP_ENDPOINT": "http://collector:4318", }, clear=False, @@ -1339,7 +1369,7 @@ def test_protocol_selection_from_environment_http(self): @patch.dict( os.environ, { - "OTEL_EXPORTER": "otlp_grpc", + "OTEL_EXPORTER_OTLP_PROTOCOL": "grpc", "OTEL_EXPORTER_OTLP_ENDPOINT": "http://collector:4317", }, clear=False, @@ -1360,6 +1390,60 @@ def test_protocol_selection_from_environment_grpc(self): self.assertIsInstance(processor, BatchSpanProcessor) self.assertIsInstance(processor.span_exporter, OTLPSpanExporterGRPC) + @patch.dict( + os.environ, + { + "OTEL_EXPORTER": "otlp_http", + "OTEL_EXPORTER_OTLP_ENDPOINT": "http://collector:4318", + }, + clear=False, + ) + def test_protocol_selection_from_otel_exporter_fallback_http(self): + """OTEL_EXPORTER drives protocol when OTEL_EXPORTER_OTLP_PROTOCOL is unset.""" + from opentelemetry.exporter.otlp.proto.http.trace_exporter import ( + OTLPSpanExporter as OTLPSpanExporterHTTP, + ) + from opentelemetry.sdk.trace.export import BatchSpanProcessor + + popped_protocol = os.environ.pop("OTEL_EXPORTER_OTLP_PROTOCOL", None) + try: + config = OpenTelemetryConfig.from_env() + self.assertEqual(config.exporter, "otlp_http") + otel = OpenTelemetry(config=config) + processor = otel._get_span_processor() + self.assertIsInstance(processor, BatchSpanProcessor) + self.assertIsInstance(processor.span_exporter, OTLPSpanExporterHTTP) + finally: + if popped_protocol is not None: + os.environ["OTEL_EXPORTER_OTLP_PROTOCOL"] = popped_protocol + + @patch.dict( + os.environ, + { + "OTEL_EXPORTER": "otlp_grpc", + "OTEL_EXPORTER_OTLP_ENDPOINT": "http://collector:4317", + }, + clear=False, + ) + def test_protocol_selection_from_otel_exporter_fallback_grpc(self): + """OTEL_EXPORTER drives protocol when OTEL_EXPORTER_OTLP_PROTOCOL is unset.""" + from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import ( + OTLPSpanExporter as OTLPSpanExporterGRPC, + ) + from opentelemetry.sdk.trace.export import BatchSpanProcessor + + popped_protocol = os.environ.pop("OTEL_EXPORTER_OTLP_PROTOCOL", None) + try: + config = OpenTelemetryConfig.from_env() + self.assertEqual(config.exporter, "otlp_grpc") + otel = OpenTelemetry(config=config) + processor = otel._get_span_processor() + self.assertIsInstance(processor, BatchSpanProcessor) + self.assertIsInstance(processor.span_exporter, OTLPSpanExporterGRPC) + finally: + if popped_protocol is not None: + os.environ["OTEL_EXPORTER_OTLP_PROTOCOL"] = popped_protocol + def test_http_exporter_endpoint_normalization_for_traces(self): """Test that HTTP trace exporter gets properly normalized endpoint""" config = OpenTelemetryConfig( From db85c3ec7797a2cba299f2ae1e8011244b295770 Mon Sep 17 00:00:00 2001 From: Matt Greathouse Date: Tue, 21 Apr 2026 22:28:51 -0400 Subject: [PATCH 2/2] Add Openrouter Opus 4.7 Entry (#26130) --- model_prices_and_context_window.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json index 386532f07a36..184a16b6b8f4 100644 --- a/model_prices_and_context_window.json +++ b/model_prices_and_context_window.json @@ -25149,6 +25149,28 @@ "supports_vision": true, "tool_use_system_prompt_tokens": 346 }, + "openrouter/anthropic/claude-opus-4.7": { + "cache_creation_input_token_cost": 6.25e-06, + "cache_read_input_token_cost": 5e-07, + "input_cost_per_token": 5e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.5e-05, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "tool_use_system_prompt_tokens": 346 + }, "openrouter/bytedance/ui-tars-1.5-7b": { "input_cost_per_token": 1e-07, "litellm_provider": "openrouter",