diff --git a/assets/scripts/config/regions.config.js b/assets/scripts/config/regions.config.js index 87d49db9bef46..70998c1eb699d 100644 --- a/assets/scripts/config/regions.config.js +++ b/assets/scripts/config/regions.config.js @@ -340,10 +340,10 @@ export default { gov: 'https://ip-ranges.ddog-gov.com' }, otlp_trace_endpoint: { - us: 'https://trace.agent.datadoghq.com/api/v0.2/traces', - us3: 'https://trace.agent.us3.datadoghq.com/api/v0.2/traces', - us5: 'https://trace.agent.us5.datadoghq.com/api/v0.2/traces', - eu: 'https://trace.agent.datadoghq.eu/api/v0.2/traces', + us: 'https://trace.agent.datadoghq.com/v1/traces', + us3: 'https://trace.agent.us3.datadoghq.com/v1/traces', + us5: 'https://trace.agent.us5.datadoghq.com/v1/traces', + eu: 'https://trace.agent.datadoghq.eu/v1/traces', ap1: 'Datadog OTLP traces intake endpoint is not supported for AP1', ap2: 'Datadog OTLP traces intake endpoint is not supported for AP2' }, @@ -356,10 +356,10 @@ export default { ap2: 'Datadog OTLP metrics intake endpoint is not supported for AP2' }, otlp_logs_endpoint: { - us: 'https://http-intake.logs.datadoghq.com/api/v2/logs', - us3: 'https://http-intake.logs.us3.datadoghq.com/api/v2/logs', - us5: 'https://http-intake.logs.us5.datadoghq.com/api/v2/logs', - eu: 'https://http-intake.logs.datadoghq.eu/api/v2/logs', + us: 'https://http-intake.logs.datadoghq.com/v1/logs', + us3: 'https://http-intake.logs.us3.datadoghq.com/v1/logs', + us5: 'https://http-intake.logs.us5.datadoghq.com/v1/logs', + eu: 'https://http-intake.logs.datadoghq.eu/v1/logs', ap1: 'Datadog OTLP logs intake endpoint is not supported for AP1', ap2: 'Datadog OTLP logs intake endpoint is not supported for AP2' }, diff --git a/content/en/opentelemetry/setup/agentless/logs.md b/content/en/opentelemetry/setup/agentless/logs.md index 95bb11b243fbb..1a0af88335d9c 100644 --- a/content/en/opentelemetry/setup/agentless/logs.md +++ b/content/en/opentelemetry/setup/agentless/logs.md @@ -38,7 +38,7 @@ If you are using [OpenTelemetry automatic instrumentation][3], set the following ```shell export OTEL_EXPORTER_OTLP_LOGS_PROTOCOL="http/protobuf" export OTEL_EXPORTER_OTLP_LOGS_ENDPOINT="${YOUR_ENDPOINT}" // Replace this with the correct endpoint -export OTEL_EXPORTER_OTLP_LOGS_HEADERS="dd-protocol=otlp,dd-api-key=${DD_API_KEY}" +export OTEL_EXPORTER_OTLP_LOGS_HEADERS="dd-api-key=${DD_API_KEY}" ``` #### Manual instrumentation @@ -56,7 +56,6 @@ import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; OtlpHttpLogRecordExporter exporter = OtlpHttpLogRecordExporter.builder() .setEndpoint("${YOUR_ENDPOINT}") // Replace this with the correct endpoint - .addHeader("dd-protocol", "otlp") .addHeader("dd-api-key", System.getenv("DD_API_KEY")) .build(); ``` @@ -71,10 +70,9 @@ import "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp" logExporter, err := otlploghttp.New( ctx, otlploghttp.WithEndpointURL("${YOUR_ENDPOINT}"), // Replace this with the correct endpoint, minus the URL path - otlploghttp.WithURLPath("/api/v2/logs"), + otlploghttp.WithURLPath("/v1/logs"), otlploghttp.WithHeaders( map[string]string{ - "dd-protocol": "otlp", "dd-api-key": os.Getenv("DD_API_KEY"), }), ) @@ -93,7 +91,6 @@ exporters: otlphttp: logs_endpoint: ${YOUR_ENDPOINT} // Replace this with the correct endpoint headers: - dd-protocol: "otlp" dd-api-key: ${env:DD_API_KEY} service: diff --git a/content/en/opentelemetry/setup/agentless/traces.md b/content/en/opentelemetry/setup/agentless/traces.md index 45b28aca8fcb7..0e15742e304ef 100644 --- a/content/en/opentelemetry/setup/agentless/traces.md +++ b/content/en/opentelemetry/setup/agentless/traces.md @@ -46,7 +46,7 @@ If you are using [OpenTelemetry automatic instrumentation][3], set the following ```shell export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL="http/protobuf" export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="{{< region-param key="otlp_trace_endpoint" >}}" -export OTEL_EXPORTER_OTLP_TRACES_HEADERS="dd-protocol=otlp,dd-api-key=${DD_API_KEY},dd-otlp-source=${YOUR_SITE}" +export OTEL_EXPORTER_OTLP_TRACES_HEADERS="dd-api-key=${DD_API_KEY},dd-otlp-source=${YOUR_SITE}" ```
The value for dd-otlp-source should be provided to you by Datadog after being allowlisted for the intake endpoint. This is a specific identifier assigned to your organization.
@@ -68,7 +68,6 @@ const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-proto' const exporter = new OTLPTraceExporter({ url: '${YOUR_ENDPOINT}', // Replace this with the correct endpoint headers: { - 'dd-protocol': 'otlp', 'dd-api-key': process.env.DD_API_KEY, 'dd-otel-span-mapping': '{span_name_as_resource_name: true}', 'dd-otlp-source': '${YOUR_SITE}', // Replace with the specific value provided by Datadog for your organization @@ -88,7 +87,6 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; OtlpHttpSpanExporter exporter = OtlpHttpSpanExporter.builder() .setEndpoint("${YOUR_ENDPOINT}") // Replace this with the correct endpoint - .addHeader("dd-protocol", "otlp") .addHeader("dd-api-key", System.getenv("DD_API_KEY")) .addHeader("dd-otel-span-mapping", "{span_name_as_resource_name: true}") .addHeader("dd-otlp-source", "${YOUR_SITE}") // Replace with the specific value provided by Datadog for your organization @@ -108,13 +106,12 @@ import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" traceExporter, err := otlptracehttp.New( ctx, otlptracehttp.WithEndpoint("${YOUR_ENDPOINT}"), // Replace this with the correct endpoint - otlptracehttp.WithURLPath("/api/v0.2/traces"), + otlptracehttp.WithURLPath("/v1/traces"), otlptracehttp.WithHeaders( map[string]string{ - "dd-protocol": "otlp", "dd-api-key": os.Getenv("DD_API_KEY"), "dd-otel-span-mapping": "{span_name_as_resource_name: true}", - "dd-otlp-source": "${YOUR_SITE}", // Replace with the specific value provided by Datadog for your organization + "dd-otlp-source": "${YOUR_SITE}", // Replace with the specific value provided by Datadog for your organization }), ) ``` @@ -132,7 +129,6 @@ from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExport exporter = OTLPSpanExporter( endpoint="${YOUR_ENDPOINT}", # Replace this with the correct endpoint headers={ - "dd-protocol": "otlp", "dd-api-key": os.environ.get("DD_API_KEY"), "dd-otel-span-mapping": "{span_name_as_resource_name: true}", "dd-otlp-source": "${YOUR_SITE}" # Replace with the specific value provided by Datadog for your organization @@ -179,7 +175,6 @@ exporters: otlphttp: traces_endpoint: {{< region-param key="otlp_trace_endpoint" >}} headers: - dd-protocol: "otlp" dd-api-key: ${env:DD_API_KEY} dd-otel-span-mapping: "{span_name_as_resource_name: false}" dd-otlp-source: "${YOUR_SITE}", # Replace with the specific value provided by Datadog for your organization