[DOCS-13853] Add APM overlay documentation for Cloudcraft

config/_default/menus/main.en.yaml

@@ -2954,6 +2954,11 @@ menu:
       parent: datadog_cloudcraft_overlays
       identifier: datadog_cloudcraft_overlays_ccm
       weight: 104
+    - name: APM
+      url: datadog_cloudcraft/overlays/apm/
+      parent: datadog_cloudcraft_overlays
+      identifier: datadog_cloudcraft_overlays_apm
+      weight: 105
     - name: Resource Catalog
       url: infrastructure/resource_catalog/
       pre: resource-catalog

content/en/datadog_cloudcraft/_index.md

@@ -179,6 +179,7 @@ Learn how to navigate between [built-in overlays][4] to view your architecture f
 - [Observability][9]: Indicates which hosts have the Agent installed and what observability features are enabled.
 - [Security][10]: IAM, firewall, and security group visibility.
 - [Cloud Cost Management][11]: Track and optimize resource spend.
+- [APM][15]: Visualize distributed traces between cloud resources (AWS only, Preview).
 
 ## Further reading
 
@@ -198,3 +199,4 @@ Learn how to navigate between [built-in overlays][4] to view your architecture f
 [12]: /security/sensitive_data_scanner
 [13]: /account_management/rbac/permissions/#compliance
 [14]: /account_management/rbac/permissions/#infrastructure
+[15]: /datadog_cloudcraft/overlays/apm/

content/en/datadog_cloudcraft/overlays/_index.md

@@ -22,6 +22,7 @@ Cloudcraft provides the following built-in overlays:
 - [Observability][2]: See where the Datadog Agent is installed and which features are enabled per host.
 - [Security][3]: Identify security exposures, misconfigurations, and vulnerabilities in your architecture.
 - [Cloud Cost Management (CCM)][4]: Discover savings opportunities with cost recommendations shown directly on resources.
+- [APM][5]: Visualize distributed APM traces between cloud resources on your diagram (AWS only, Preview).
 
 ## Further reading
 
@@ -31,4 +32,5 @@ Cloudcraft provides the following built-in overlays:
 [2]: /datadog_cloudcraft/overlays/observability/
 [3]: /datadog_cloudcraft/overlays/security/
 [4]: /datadog_cloudcraft/overlays/ccm/
+[5]: /datadog_cloudcraft/overlays/apm/
 

content/en/datadog_cloudcraft/overlays/apm.md

@@ -0,0 +1,77 @@
+---
+title: APM
+description: "Use the APM overlay in Cloudcraft to visualize distributed traces between cloud resources on your architecture diagrams."
+further_reading:
+- link: "/datadog_cloudcraft/overlays/infrastructure/"
+  tag: "Documentation"
+  text: "Infrastructure overlay"
+- link: "/datadog_cloudcraft/overlays/observability/"
+  tag: "Documentation"
+  text: "Observability overlay"
+- link: "/datadog_cloudcraft/overlays/security/"
+  tag: "Documentation"
+  text: "Security overlay"
+- link: "/datadog_cloudcraft/overlays/ccm/"
+  tag: "Documentation"
+  text: "Cloud Cost Management overlay"
+- link: "/tracing/"
+  tag: "Documentation"
+  text: "APM"
+---
+
+<div class="alert alert-info">The APM overlay is in Preview and is available for AWS accounts only.</div>
+
+## Overview
+
+The APM overlay displays distributed APM traces as arcs between cloud resources on your Cloudcraft diagram. This helps you understand service-to-service request flows across your infrastructure without leaving the architecture view.
+
+To open the overlay, click the **APM** tab in the overlay selector at the top of your diagram.
+
+### Supported resource types
+
+The APM overlay shows connections for resources that include a Cloud Resource ID (CCRID) in their trace data. The following resource types are supported:
+
+- EC2
+- S3
+- Lambda
+- RDS
+
+<!-- TODO: Screenshots needed. Reach out to Vesa Halttunen or the Cloudcraft team for assets showing:
+1. The APM overlay with trace arcs on a diagram
+2. The trace side panel -->
+
+## Prerequisites
+
+APM must be active in your Datadog organization, meaning at least one span has been ingested in the last 30 days. If APM is not set up, Cloudcraft displays an onboarding screen with links to [set up APM][1].
+
+## Visualize trace connections
+
+When the APM overlay is active, traces appear as curved arcs between resource nodes on your diagram. Each arc represents distributed tracing traffic between two resources.
+
+### Legend
+
+| Arc color | Status |
+|-----------|--------|
+| Green     | OK     |
+| Red       | Error  |
+
+Use the legend panel at the bottom of the screen to filter traces by status. The legend also displays the count of visible traces. Deselecting all statuses resets the view to show all traces.
+
+## Investigate traces
+
+Click a trace arc to open a side panel showing the list of APM traces between those two resources. The side panel includes:
+
+- A **search bar** to filter traces by query.
+- A **time picker** (defaults to the last 30 minutes).
+- A **live mode** toggle for streaming trace data.
+- A **column picker** to customize which fields are displayed. Default columns include Duration, Service, Resource Name, and Error Type.
+- An **open in APM** link to view the same query in the [Traces Explorer][2].
+
+Click a trace row in the side panel to open the trace detail view, which displays the standard APM flame graph.
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: /tracing/trace_collection/automatic_instrumentation/single-step-apm/
+[2]: /tracing/trace_explorer/

content/en/metrics/open_telemetry/query_metrics.md

@@ -38,13 +38,13 @@ Choose between two modes:
 
 Imagine you're monitoring system load using two different metrics:
 
-- **OTel native**: `otel.system.cpu.load_average.15m`
+- **OTel native**: `system.cpu.load_average.15m`
 - **Datadog Agent**: `system.load.15`
 
-If you query for `otel.system.cpu.load_average.15m`, apply a max space aggregation, and set the Semantic Mode to **Combine data from all telemetry sources**, Datadog automatically:
+If you query for `system.cpu.load_average.15m`, apply a max space aggregation, and set the Semantic Mode to **Combine data from all telemetry sources**, Datadog automatically:
 
 1. Identifies the equivalent Datadog metric: `system.load.15`.
-2. Combines the timeseries from both `otel.system.cpu.load_average.15m` and `system.load.15`.
+2. Combines the timeseries from both `system.cpu.load_average.15m` and `system.load.15`.
 3. Applies the max aggregation across all datapoints from both sources.
 
 ## Understand metric sources and mappings
@@ -53,7 +53,7 @@ To provide clarity when querying, the metric source and equivalent metrics are d
 
 - **Source pill**: In the query editor, a **Datadog** or **OTel** pill appears next to the metric name, indicating its origin.
 
-- **Equivalent metrics list**: The editor also shows a list of metrics considered equivalent to the one you've queried. This includes complex one-to-many mappings. For example, `otel.system.cpu.utilization` maps to multiple Datadog CPU state metrics (`system.cpu.idle`, `system.cpu.iowait`, etc.).
+- **Equivalent metrics list**: The editor also shows a list of metrics considered equivalent to the one you've queried. This includes complex one-to-many mappings. For example, `system.cpu.utilization` maps to multiple Datadog CPU state metrics (`system.cpu.idle`, `system.cpu.iowait`, etc.).
 
 {{< img src="/metrics/otel/source.png" alt="Source pill and equivalent metrics list" style="width:75%;" >}}
 
@@ -67,11 +67,11 @@ For a comprehensive view of how specific OTel and Datadog metrics relate, check
 
 Alternatively, click **Edit in Metrics Summary** when inputting a metric in the query editor.
 
-This panel displays metric mappings, including complex relationships. For example, it shows how `otel.system.cpu.utilization` maps to multiple Datadog metrics like `system.cpu.idle`, `system.cpu.user`, and others.
+This panel displays metric mappings, including complex relationships. For example, it shows how `system.cpu.utilization` maps to multiple Datadog metrics like `system.cpu.idle`, `system.cpu.user`, and others.
 
 {{< img src="/metrics/otel/mappings.png" alt="Metrics Summary Details panel showing OTel and Datadog mappings" style="width:100%;" >}}
 
-You can also see the tag-based logic used for these mappings. Hover over an equivalent metric to see the specific conditions. For example, hovering over `system.cpu.idle` shows that it maps to `otel.system.cpu.utilization` when `state=idle`, and the value is multiplied by 100.
+You can also see the tag-based logic used for these mappings. Hover over an equivalent metric to see the specific conditions. For example, hovering over `system.cpu.idle` shows that it maps to `system.cpu.utilization` when `state=idle`, and the value is multiplied by 100.
 
 {{< img src="/metrics/otel/tooltip.png" alt="Hover-over tooltip showing tag-based mapping logic" style="width:100%;" >}}
 

content/en/opentelemetry/integrations/kafka_metrics.md

@@ -269,7 +269,7 @@ In order to ensure this attribute only gets added to your Kafka logs, use [inclu
 
 {{< mapping-table resource="kafka-consumer.csv">}}
 
-**Note:** In Datadog `-` gets translated to `_`. For the metrics prepended by `otel.`, this means that the OTel metric name and the Datadog metric name are the same (for example, `kafka.producer.request-rate` and `kafka.producer.request_rate`). In order to avoid double counting for these metrics, the OTel metric is then prepended with `otel.`.
+**Note:** In Datadog `-` gets translated to `_`. For example, `kafka.producer.request-rate` becomes `kafka.producer.request_rate`.
 
 See [OpenTelemetry Metrics Mapping][9] for more information.
 

content/en/opentelemetry/integrations/runtime_metrics/_index.md

@@ -111,19 +111,12 @@ When using OpenTelemetry runtime metrics with Datadog, you receive both:
 - Original OpenTelemetry runtime metrics
 - Mapped Datadog runtime metrics for equivalent metrics
 
-The OpenTelemetry runtime metrics have the following prefixes based on their source:
-
-| Source | Prefix |
-| --- | --- |
-| [OTel Collector Datadog Exporter][100] | `otel.process.runtime.*` |
-| [Datadog Agent OTLP Ingest][101] | `process.runtime.*` |
+OpenTelemetry runtime metrics use the `process.runtime.*` prefix.
 
 The following tables list the Datadog runtime metrics that are supported through OpenTelemetry mapping. "N/A" indicates that there is no OpenTelemetry equivalent metric available.
 
 <div class="alert alert-danger"> OpenTelemetry runtime metrics are mapped to Datadog by metric name. Do not rename host metrics for OpenTelemetry runtime metrics as this breaks the mapping.</div>
 
-[100]: /opentelemetry/setup/collector_exporter/
-[101]: /opentelemetry/setup/otlp_ingest_in_the_agent
 
 {{< tabs >}}
 {{% tab "Java" %}}

content/en/opentelemetry/mapping/metrics_mapping.md

@@ -19,12 +19,6 @@ Datadog products and visualizations are built on metrics and tags that follow sp
 
 <div class="alert alert-info"><strong>Want to unify OpenTelemetry and Datadog metrics in your queries?</strong> Learn how to <a href="/metrics/open_telemetry/query_metrics">query across Datadog and OpenTelemetry metrics</a> from the Metrics Query Editor.</div>
 
-## How OpenTelemetry metrics appear in Datadog
-
-To differentiate metrics from the OpenTelemetry Collector's [hostmetrics][12] receiver and the Datadog Agent, Datadog prepends `otel.` to any received metric that starts with `system.` or `process.`. Datadog does not recommend monitoring the same infrastructure with both the Datadog Agent and the OpenTelemetry Collector
-
-<div class="alert alert-info">Datadog is evaluating ways to improve the OTLP metric experience, including potentially deprecating this <code>otel</code> prefix.</div>
-
 ## Metrics mappings
 
 The following table shows the metric mappings for various integrations. Use the search and filter controls to find the mappings for a specific integration.
@@ -48,5 +42,4 @@ For more information, see [OpenTelemetry integrations][11].
 [9]: /opentelemetry/otel_collector_datadog_exporter/?tab=onahost#containers-overview-dashboard
 [10]: /tracing/trace_explorer/trace_view/
 [11]: /opentelemetry/integrations/
-[12]: /opentelemetry/integrations/host_metrics/