fix(otel): add /v1/logs endpoint to OTEL_EXPORTER_OTLP_ENDPOINT (#14791)

## Description

Fixes the OpenTelemetry logs endpoint configuration when
`OTEL_EXPORTER_OTLP_ENDPOINT` is used. Previously, log payloads could be
sent without the required `/v1/logs` path, causing the Agent to drop
them. The fix ensures the logs-specific endpoint with the correct path
is always used.

## Testing

Existing tests in `tests/opentelemetry/test_logs.py` verify endpoint
configuration scenarios and proper path handling.

## Risks

Low risk. Bug fix that only affects OpenTelemetry logs endpoint
configuration. Metrics and traces are unaffected.

## Additional Notes

None

---------

Co-authored-by: Zach Montoya <[email protected]>

Author: mabdinur

.github/CODEOWNERS

@@ -204,6 +204,7 @@ ddtrace/opentelemetry/                             @DataDog/apm-sdk-capabilities
 ddtrace/internal/opentelemetry                     @DataDog/apm-sdk-capabilities-python
 ddtrace/opentracer/                                @DataDog/apm-sdk-capabilities-python
 ddtrace/propagation/                               @DataDog/apm-sdk-capabilities-python
+ddtrace/settings/_opentelemetry.py                 @DataDog/apm-sdk-capabilities-python
 
 ddtrace/internal/sampling.py                       @DataDog/apm-sdk-capabilities-python
 ddtrace/internal/tracemethods.py                   @DataDog/apm-sdk-capabilities-python

ddtrace/internal/opentelemetry/logs.py

@@ -21,9 +21,6 @@
 
 DEFAULT_PROTOCOL = "grpc"
 DD_LOGS_PROVIDER_CONFIGURED = False
-GRPC_PORT = 4317
-HTTP_PORT = 4318
-HTTP_LOGS_ENDPOINT = "/v1/logs"
 
 
 def set_otel_logs_provider() -> None:
@@ -178,9 +175,9 @@ def _initialize_logging(exporter_class, protocol, resource):
     try:
         from opentelemetry.sdk._configuration import _init_logging
 
-        # Ensure logging exporter is configured to send payloads to a Datadog Agent.
-        # The default endpoint is resolved using the hostname from DD_AGENT.. and DD_TRACE_AGENT_... configs
-        os.environ["OTEL_EXPORTER_OTLP_LOGS_ENDPOINT"] = otel_config.exporter.LOGS_ENDPOINT
+        # Ensure logs exporter is configured to send payloads to a Datadog Agent.
+        if "OTEL_EXPORTER_OTLP_ENDPOINT" not in os.environ and "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT" not in os.environ:
+            os.environ["OTEL_EXPORTER_OTLP_LOGS_ENDPOINT"] = otel_config.exporter.LOGS_ENDPOINT
         _init_logging({protocol: exporter_class}, resource=resource)
         return True
     except ImportError as e:

ddtrace/internal/opentelemetry/metrics.py

@@ -51,8 +51,8 @@ def _should_configure_metrics_exporter() -> bool:
 
     if API_VERSION < MINIMUM_SUPPORTED_VERSION:
         log.warning(
-            "OpenTelemetry API requires version %s or higher to enable logs collection. Found version %s. "
-            "Please upgrade the opentelemetry-api package before enabling ddtrace OpenTelemetry Logs support.",
+            "OpenTelemetry API requires version %s or higher to enable metrics collection. Found version %s. "
+            "Please upgrade the opentelemetry-api package before enabling ddtrace OpenTelemetry Metrics support.",
             ".".join(str(x) for x in MINIMUM_SUPPORTED_VERSION),
             ".".join(str(x) for x in API_VERSION),
         )
@@ -185,8 +185,8 @@ def _initialize_metrics(exporter_class, protocol, resource):
         from opentelemetry.sdk._configuration import _init_metrics
 
         # Ensure metrics exporter is configured to send payloads to a Datadog Agent.
-        # The default endpoint is resolved using the hostname from DD_AGENT.. and DD_TRACE_AGENT_... configs
-        os.environ["OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"] = otel_config.exporter.METRICS_ENDPOINT
+        if "OTEL_EXPORTER_OTLP_ENDPOINT" not in os.environ and "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT" not in os.environ:
+            os.environ["OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"] = otel_config.exporter.METRICS_ENDPOINT
         os.environ[
             "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"
         ] = otel_config.exporter.METRICS_TEMPORALITY_PREFERENCE

ddtrace/settings/_opentelemetry.py

@@ -1,35 +1,19 @@
 import typing as t
-from urllib.parse import urljoin
 
 from ddtrace.internal.telemetry import get_config
 from ddtrace.internal.telemetry import report_configuration
 from ddtrace.settings._agent import get_agent_hostname
 from ddtrace.settings._core import DDConfig
 
 
-def _append_metrics_path(value):
-    if value is None:
-        return None
-
-    return urljoin(value, ExporterConfig.HTTP_METRICS_ENDPOINT)
-
-
 def _derive_endpoint(config: "ExporterConfig"):
-    if config.PROTOCOL.lower() in ("http/json", "http/protobuf"):
-        default_endpoint = f"http://{get_agent_hostname()}:{ExporterConfig.HTTP_PORT}"
-    else:
-        default_endpoint = f"http://{get_agent_hostname()}:{ExporterConfig.GRPC_PORT}"
+    default_endpoint = ExporterConfig._get_default_endpoint(config.PROTOCOL)
     return get_config("OTEL_EXPORTER_OTLP_ENDPOINT", default_endpoint)
 
 
 def _derive_logs_endpoint(config: "ExporterConfig"):
-    if config.LOGS_PROTOCOL.lower() in ("http/json", "http/protobuf"):
-        default_endpoint = (
-            f"http://{get_agent_hostname()}:{ExporterConfig.HTTP_PORT}{ExporterConfig.HTTP_LOGS_ENDPOINT}"
-        )
-    else:
-        default_endpoint = f"http://{get_agent_hostname()}:{ExporterConfig.GRPC_PORT}"
-    return get_config(["OTEL_EXPORTER_OTLP_LOGS_ENDPOINT", "OTEL_EXPORTER_OTLP_ENDPOINT"], default_endpoint)
+    default_endpoint = ExporterConfig._get_default_endpoint(config.LOGS_PROTOCOL, config.LOGS_PATH)
+    return get_config("OTEL_EXPORTER_OTLP_LOGS_ENDPOINT", default_endpoint)
 
 
 def _derive_logs_protocol(config: "ExporterConfig"):
@@ -45,14 +29,8 @@ def _derive_logs_timeout(config: "ExporterConfig"):
 
 
 def _derive_metrics_endpoint(config: "ExporterConfig"):
-    if config.METRICS_PROTOCOL.lower() in ("http/json", "http/protobuf"):
-        default_endpoint = f"http://{get_agent_hostname()}:{ExporterConfig.HTTP_PORT}"
-        return get_config("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT") or _append_metrics_path(
-            get_config("OTEL_EXPORTER_OTLP_ENDPOINT", default_endpoint)
-        )
-    else:
-        default_endpoint = f"http://{get_agent_hostname()}:{ExporterConfig.GRPC_PORT}"
-        return get_config(["OTEL_EXPORTER_OTLP_METRICS_ENDPOINT", "OTEL_EXPORTER_OTLP_ENDPOINT"], default_endpoint)
+    default_endpoint = ExporterConfig._get_default_endpoint(config.METRICS_PROTOCOL, config.METRICS_PATH)
+    return get_config("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT", default_endpoint)
 
 
 def _derive_metrics_protocol(config: "ExporterConfig"):
@@ -88,12 +66,12 @@ class OpenTelemetryConfig(DDConfig):
 class ExporterConfig(DDConfig):
     __prefix__ = "exporter"
 
-    GRPC_PORT: int = 4317
-    HTTP_PORT: int = 4318
-    HTTP_LOGS_ENDPOINT: str = "/v1/logs"
-    HTTP_METRICS_ENDPOINT: str = "/v1/metrics"
     DEFAULT_HEADERS: str = ""
     DEFAULT_TIMEOUT: int = 10000
+    LOGS_PATH: str = "/v1/logs"
+    METRICS_PATH: str = "/v1/metrics"
+    DEFAULT_GRPC_ENDPOINT: str = f"http://{get_agent_hostname()}:4317"
+    DEFAULT_HTTP_ENDPOINT: str = f"http://{get_agent_hostname()}:4318"
     DEFAULT_METRICS_TEMPORALITY_PREFERENCE: str = "delta"
     DEFAULT_METRICS_METRIC_READER_EXPORT_INTERVAL: int = 10000
     DEFAULT_METRICS_METRIC_READER_EXPORT_TIMEOUT: int = 7500
@@ -116,6 +94,12 @@ class ExporterConfig(DDConfig):
     METRICS_METRIC_READER_EXPORT_INTERVAL = DDConfig.d(int, _derive_metrics_metric_reader_export_interval)
     METRICS_METRIC_READER_EXPORT_TIMEOUT = DDConfig.d(int, _derive_metrics_metric_reader_export_timeout)
 
+    @staticmethod
+    def _get_default_endpoint(protocol: str, endpoint: str = ""):
+        if protocol.lower() in ("http/json", "http/protobuf"):
+            return f"{ExporterConfig.DEFAULT_HTTP_ENDPOINT}{endpoint}"
+        return f"{ExporterConfig.DEFAULT_GRPC_ENDPOINT}"
+
 
 OpenTelemetryConfig.include(ExporterConfig, namespace="exporter")
 

releasenotes/notes/otel-logs-config-refactor-8230743914aa83d6.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    fix(otel): Ensures the /v1/logs path is correctly added to prevent log payloads from being dropped by the Agent when using OTEL_EXPORTER_OTLP_ENDPOINT configuration. Metrics and traces are unaffected.

tests/opentelemetry/test_logs.py

@@ -200,7 +200,6 @@ def test_otel_logs_exporter_auto_configured_http():
 
     from opentelemetry._logs import get_logger_provider
 
-    from ddtrace.internal.opentelemetry.logs import HTTP_LOGS_ENDPOINT
     from tests.opentelemetry.test_logs import decode_logs_request
     from tests.opentelemetry.test_logs import extract_log_correlation_attributes
 
@@ -217,7 +216,7 @@ def test_otel_logs_exporter_auto_configured_http():
         request_body = None
         for call in mock_request.call_args_list:
             method, url = call[0][:2]
-            if method == "POST" and HTTP_LOGS_ENDPOINT in url:
+            if method == "POST" and "/v1/logs" in url:
                 request_body = call[1].get("data", None)
                 break
         assert request_body is not None, (

tests/telemetry/test_writer.py

@@ -20,6 +20,7 @@
 from ddtrace.internal.telemetry.writer import TelemetryWriter
 from ddtrace.internal.telemetry.writer import get_runtime_id
 from ddtrace.internal.utils.version import _pep440_to_semver
+from ddtrace.settings._agent import get_agent_hostname
 from ddtrace.settings._telemetry import config as telemetry_config
 from tests.conftest import DEFAULT_DDTRACE_SUBPROCESS_TEST_SERVICE_NAME
 from tests.utils import call_program
@@ -446,8 +447,8 @@ def test_app_started_event_configuration_override(test_agent_session, run_python
         },
         {
             "name": "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT",
-            "origin": "env_var",
-            "value": "http://localhost:4317",
+            "origin": "default",
+            "value": f"http://{get_agent_hostname()}:4317",
         },
         {
             "name": "OTEL_EXPORTER_OTLP_LOGS_HEADERS",
@@ -466,8 +467,8 @@ def test_app_started_event_configuration_override(test_agent_session, run_python
         },
         {
             "name": "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT",
-            "origin": "env_var",
-            "value": "http://localhost:4317",
+            "origin": "default",
+            "value": f"http://{get_agent_hostname()}:4317",
         },
         {
             "name": "OTEL_EXPORTER_OTLP_METRICS_HEADERS",