diff --git a/hugo/config/_default/menus/main.en.yaml b/hugo/config/_default/menus/main.en.yaml index f6e8b69ddaf..867c569cbe5 100644 --- a/hugo/config/_default/menus/main.en.yaml +++ b/hugo/config/_default/menus/main.en.yaml @@ -752,16 +752,11 @@ menu: identifier: otel-setup-ddot-migrate parent: otel-setup-ddot weight: 4013 - - name: Other Setup Options - url: /opentelemetry/setup/ - identifier: otel-setup-other - parent: otel_collect - weight: 402 - name: OpenTelemetry Collector url: /opentelemetry/setup/collector_exporter/ identifier: otel-setup-collector-exporter - parent: otel-setup-other - weight: 4021 + parent: otel_collect + weight: 402 - name: Deploy url: /opentelemetry/setup/collector_exporter/deploy identifier: otel-setup-collector-exporter-deploy @@ -790,13 +785,13 @@ menu: - name: OTLP Ingest in the Agent url: /opentelemetry/setup/otlp_ingest_in_the_agent identifier: otel-setup-otlp-ingest - parent: otel-setup-other - weight: 4022 + parent: otel_collect + weight: 403 - name: Direct OTLP Ingest url: /opentelemetry/setup/otlp_ingest identifier: otel-setup-intake-endpoint - parent: otel-setup-other - weight: 4023 + parent: otel_collect + weight: 404 - name: Logs Endpoint url: /opentelemetry/setup/otlp_ingest/logs parent: otel-setup-intake-endpoint diff --git a/hugo/content/en/opentelemetry/compatibility.md b/hugo/content/en/opentelemetry/compatibility.md index c074f1787fd..2cd57fad3ba 100644 --- a/hugo/content/en/opentelemetry/compatibility.md +++ b/hugo/content/en/opentelemetry/compatibility.md @@ -19,14 +19,14 @@ Datadog supports several configurations for using OpenTelemetry. The primary dif |------------------------------------------------------|-------------------------|-------------|-----------------------------------------------| | [**Datadog SDK + DDOT (Recommended)**][29] | Datadog API or OTel API | Datadog SDK | Datadog Distribution of OTel Collector (DDOT) | | [**OTel SDK + DDOT**][29] | OTel API | OTel SDK | Datadog Distribution of OTel Collector (DDOT) | -| [**OTel SDK + Community OTel Collector**][7] | OTel API | OTel SDK | Community OTel Collector | +| [**OTel SDK + Pure OTel Collector**][7] | OTel API | OTel SDK | Pure OTel Collector | | [**Direct OTLP Ingest**][28] | OTel API | OTel SDK | N/A (Direct to Datadog endpoint) | ## Feature compatibility The following table shows feature compatibility across different setups: -| Feature | Datadog SDK + DDOT (Recommended) | OTel SDK + DDOT | OTel SDK + Community OTel Collector | Direct OTLP Ingest | +| Feature | Datadog SDK + DDOT (Recommended) | OTel SDK + DDOT | OTel SDK + Pure OTel Collector | Direct OTLP Ingest | |---|---|---|---|---| | [Cloud SIEM][18] | {{< X >}} | {{< X >}} | {{< X >}} | {{< X >}} | | [Correlated Traces, Metrics, Logs][19] | {{< X >}} | {{< X >}} | {{< X >}} | {{< X >}} | diff --git a/hugo/content/en/opentelemetry/guide/instrument_unsupported_runtimes.md b/hugo/content/en/opentelemetry/guide/instrument_unsupported_runtimes.md index 86d9f01259a..78c30111c7e 100644 --- a/hugo/content/en/opentelemetry/guide/instrument_unsupported_runtimes.md +++ b/hugo/content/en/opentelemetry/guide/instrument_unsupported_runtimes.md @@ -26,7 +26,7 @@ This guide falls under the Custom Components " ``` The `OTEL_EXPORTER_OTLP_ENDPOINT` value depends on your setup: -- **Local collector** (DDOT or Community OTel Collector): `http://localhost:4318` (default HTTP) or `http://localhost:4317` (gRPC) +- **Local collector** (DDOT or OTel Collector): `http://localhost:4318` (default HTTP) or `http://localhost:4317` (gRPC) - **Remote collector**: Use the collector's address and port For additional configuration options, see the [OpenTelemetry environment variable specification][5]. diff --git a/hugo/content/en/opentelemetry/setup/collector_exporter/community_collector.md b/hugo/content/en/opentelemetry/setup/collector_exporter/pure_otlp_collector.md similarity index 94% rename from hugo/content/en/opentelemetry/setup/collector_exporter/community_collector.md rename to hugo/content/en/opentelemetry/setup/collector_exporter/pure_otlp_collector.md index 54a2fd55365..0c8d22e6857 100644 --- a/hugo/content/en/opentelemetry/setup/collector_exporter/community_collector.md +++ b/hugo/content/en/opentelemetry/setup/collector_exporter/pure_otlp_collector.md @@ -1,9 +1,10 @@ --- -title: Set Up the Community OpenTelemetry Collector +title: Set Up the Pure OpenTelemetry Collector aliases: - /opentelemetry/setup/collector_exporter/oss_setup/ +- /opentelemetry/setup/collector_exporter/community_collector/ private: true -description: 'Send OpenTelemetry data to Datadog using the Community OpenTelemetry Collector' +description: 'Send OpenTelemetry data to Datadog using the Pure OpenTelemetry Collector' further_reading: - link: "https://opentelemetry.io/docs/collector/" tag: "External Site" @@ -18,11 +19,11 @@ further_reading: ## Overview -Send traces, metrics, and logs to Datadog using the Community OpenTelemetry Collector, which is based on the [OpenTelemetry Collector Contrib][1] distribution and standard OpenTelemetry components. This setup uses the following key components: +Send traces, metrics, and logs to Datadog using the Pure OpenTelemetry Collector, which is based on the [OpenTelemetry Collector Contrib][1] distribution and standard OpenTelemetry components. This setup uses the following key components: - **OTLP HTTP exporter**: Sends telemetry to Datadog's OTLP intake endpoints. - **Span metrics connector**: Generates RED (Rate, Error, Duration) metrics from trace data to power APM features such as the Service Catalog and Service Page. -- **Resource detection processor**: Extracts host and cloud metadata for hostname resolution and tagging in Datadog. +- **Resource detection processor**: Detects host and cloud resource attributes, which Datadog uses for hostname resolution and tagging. {{< img src="/opentelemetry/setup/oss-collector.png" alt="Diagram: OpenTelemetry SDK in code sends data through OTLP to host running any OpenTelemetry Collector with OTLP HTTP exporter, which forwards to Datadog's Observability Platform." style="width:100%;" >}} @@ -32,7 +33,7 @@ Send traces, metrics, and logs to Datadog using the Community OpenTelemetry Coll This setup supports bare metal, VMs, Docker, and Kubernetes. Supported managed Kubernetes distributions include Amazon EKS (including Auto Mode), Google GKE (Standard and Autopilot), and Azure AKS (including Automatic). -This setup does not support serverless or task-based container runtimes such as ECS Fargate or AWS Lambda. For supported Datadog features, see the [feature compatibility table][7] under **OTel SDK + Community OTel Collector**. +This setup does not support serverless or task-based container runtimes such as ECS Fargate or AWS Lambda. For supported Datadog features, see the [feature compatibility table][7] under **OTel SDK + Pure OTel Collector**. - [OpenTelemetry Collector Contrib][1] v0.154.0 or later - A [Datadog API key][2] @@ -64,7 +65,7 @@ receivers: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - # Collect host-level metrics for the Infrastructure List + # Collect host system metrics (CPU, memory, disk, network); populates the Infrastructure List host_metrics: collection_interval: 10s scrapers: @@ -98,7 +99,7 @@ receivers: processes: {} processors: - # Detect host and cloud metadata for hostname resolution and tagging + # Detect host and cloud resource attributes for hostname resolution and tagging resource_detection: detectors: [env, system] timeout: 2s @@ -167,7 +168,7 @@ exporters: endpoint: https://otlp.${env:DD_SITE} headers: dd-api-key: ${env:DD_API_KEY} - # Send resource attributes and scope metadata as metric tags + # Map resource attributes and instrumentation scope metadata to Datadog metric tags dd-otel-metric-config: >- { "resource_attributes_as_tags": true, @@ -253,7 +254,7 @@ receivers: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - # Collect host-level metrics for the Infrastructure List + # Collect host system metrics (CPU, memory, disk, network); populates the Infrastructure List # root_path maps to the host filesystem mounted at /hostfs host_metrics: root_path: /hostfs @@ -289,7 +290,7 @@ receivers: processes: {} processors: - # Detect host and cloud metadata for hostname resolution and tagging + # Detect host and cloud resource attributes for hostname resolution and tagging resource_detection: detectors: [env] timeout: 2s @@ -358,7 +359,7 @@ exporters: endpoint: https://otlp.${env:DD_SITE} headers: dd-api-key: ${env:DD_API_KEY} - # Send resource attributes and scope metadata as metric tags + # Map resource attributes and instrumentation scope metadata to Datadog metric tags dd-otel-metric-config: >- { "resource_attributes_as_tags": true, @@ -454,7 +455,7 @@ receivers: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - # Collect host-level metrics for the Infrastructure List + # Collect host system metrics (CPU, memory, disk, network); populates the Infrastructure List # root_path maps to the host filesystem mounted at /hostfs host_metrics: root_path: /hostfs @@ -502,7 +503,7 @@ receivers: - volume processors: - # Detect host and cloud metadata for hostname resolution and tagging + # Detect host and cloud resource attributes for hostname resolution and tagging resource_detection: detectors: [env, system] timeout: 2s @@ -617,7 +618,7 @@ exporters: endpoint: https://otlp.${env:DD_SITE} headers: dd-api-key: ${env:DD_API_KEY} - # Send resource attributes and scope metadata as metric tags + # Map resource attributes and instrumentation scope metadata to Datadog metric tags dd-otel-metric-config: >- { "resource_attributes_as_tags": true, @@ -877,7 +878,7 @@ env: {{% /tab %}} {{< /tabs >}} -Apply [Unified Service Tagging][4] by setting the `service.name`, `deployment.environment.name`, and `service.version` resource attributes in your application's OpenTelemetry configuration. +Set the `service.name`, `deployment.environment.name`, and `service.version` resource attributes in your application's OpenTelemetry configuration. Datadog maps these to [Unified Service Tagging][4], which correlates your traces, metrics, and logs. ## Verify the setup @@ -930,7 +931,7 @@ Example with instrumentation metrics enabled: } ``` -
The recommended Community OTel Collector configuration uses the span_metrics connector to generate the RED metrics that power APM views. The trace_metrics.instrumentation_metrics_calc and raw_instrumentation_metrics_drop fields support an alternative configuration for setups that derive APM trace metrics from HTTP instrumentation metrics instead. Do not enable instrumentation_metrics_calc alongside the span_metrics connector, as this computes trace metrics from both sources.
+
The recommended Pure OTel Collector configuration uses the span_metrics connector to generate the RED metrics that power APM views. The trace_metrics.instrumentation_metrics_calc and raw_instrumentation_metrics_drop fields support an alternative configuration for setups that derive APM trace metrics from HTTP instrumentation metrics instead. Do not enable instrumentation_metrics_calc alongside the span_metrics connector, as this computes trace metrics from both sources.
### Datadog extension