From 6f97f7314b5dab9fff3fd3fb83058952438720a3 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Wed, 11 Mar 2026 11:39:18 +0100 Subject: [PATCH 1/4] docs: add EDOT SDK encouragement to index and supported-technologies Encourage users to consider the EDOT Java SDK for observability data on the APM agent intro and supported-technologies pages, in line with OTel adoption. Made-with: Cursor --- docs/reference/index.md | 4 ++++ docs/reference/supported-technologies.md | 2 ++ 2 files changed, 6 insertions(+) diff --git a/docs/reference/index.md b/docs/reference/index.md index 4691f9677f..a358c7f67f 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -14,6 +14,10 @@ applies_to: The Elastic APM Java Agent automatically measures the performance of your application and tracks errors. It has built-in support for popular frameworks and technologies, as well as a simple [API](/reference/public-api.md) which allows you to instrument any application, and a [Plugin API](/reference/plugin-api.md) that allows you to add custom instrumentation. +:::::{note} +Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of the [supported technologies](/reference/supported-technologies.md) below. Consider using the [EDOT Java SDK](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/java) for observability data so you continue to get the full power of Elastic's platform. +::::: + ::::{note} The minimum required version of the APM Server is 6.5.0 :::: diff --git a/docs/reference/supported-technologies.md b/docs/reference/supported-technologies.md index e9251b2fee..39f440853f 100644 --- a/docs/reference/supported-technologies.md +++ b/docs/reference/supported-technologies.md @@ -13,6 +13,8 @@ applies_to: The Elastic APM Java Agent automatically instruments various APIs, frameworks and application servers. This section lists all supported technologies. +Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of these technologies. Consider using the [EDOT Java SDK](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/java) for observability data so you continue to get the full power of Elastic's platform. + * [Java versions](#supported-java-versions) * [Web Frameworks](#supported-web-frameworks) * [Application Servers/Servlet Containers](#supported-app-servers) From 8cc9ec5e37de90e480f188f0ccc72966a97b83b3 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Wed, 11 Mar 2026 18:00:44 +0100 Subject: [PATCH 2/4] docs: use EDOT SDK repo links instead of docs-content URLs Made-with: Cursor --- docs/reference/index.md | 2 +- docs/reference/supported-technologies.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/index.md b/docs/reference/index.md index a358c7f67f..5a5860e157 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -15,7 +15,7 @@ applies_to: The Elastic APM Java Agent automatically measures the performance of your application and tracks errors. It has built-in support for popular frameworks and technologies, as well as a simple [API](/reference/public-api.md) which allows you to instrument any application, and a [Plugin API](/reference/plugin-api.md) that allows you to add custom instrumentation. :::::{note} -Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of the [supported technologies](/reference/supported-technologies.md) below. Consider using the [EDOT Java SDK](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/java) for observability data so you continue to get the full power of Elastic's platform. +Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of the [supported technologies](/reference/supported-technologies.md) below. Consider using the [EDOT Java SDK](elastic-otel-java://reference/edot-java/index.md) for observability data so you continue to get the full power of Elastic's platform. ::::: ::::{note} diff --git a/docs/reference/supported-technologies.md b/docs/reference/supported-technologies.md index 39f440853f..3cde506d59 100644 --- a/docs/reference/supported-technologies.md +++ b/docs/reference/supported-technologies.md @@ -13,7 +13,7 @@ applies_to: The Elastic APM Java Agent automatically instruments various APIs, frameworks and application servers. This section lists all supported technologies. -Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of these technologies. Consider using the [EDOT Java SDK](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/java) for observability data so you continue to get the full power of Elastic's platform. +Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of these technologies. Consider using the [EDOT Java SDK](elastic-otel-java://reference/edot-java/index.md) for observability data so you continue to get the full power of Elastic's platform. * [Java versions](#supported-java-versions) * [Web Frameworks](#supported-web-frameworks) From e72c84e8d9576e3e510263f8e55c6c7984dcd196 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Mon, 16 Mar 2026 14:39:54 +0100 Subject: [PATCH 3/4] Fix build and linting errors --- docs/docset.yml | 1 + docs/reference/index.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/docset.yml b/docs/docset.yml index 1316176b7f..5d19663f85 100644 --- a/docs/docset.yml +++ b/docs/docset.yml @@ -10,6 +10,7 @@ cross_links: - ecs - ecs-logging - ecs-logging-java + - elastic-otel-java - elasticsearch toc: - toc: reference diff --git a/docs/reference/index.md b/docs/reference/index.md index 5a5860e157..40ba4a76e0 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -12,7 +12,7 @@ applies_to: # APM Java agent [intro] -The Elastic APM Java Agent automatically measures the performance of your application and tracks errors. It has built-in support for popular frameworks and technologies, as well as a simple [API](/reference/public-api.md) which allows you to instrument any application, and a [Plugin API](/reference/plugin-api.md) that allows you to add custom instrumentation. +The Elastic APM Java Agent automatically measures the performance of your application and tracks errors. It has built-in support for popular frameworks and technologies, as well as a basic [API](/reference/public-api.md) which allows you to instrument any application, and a [Plugin API](/reference/plugin-api.md) that allows you to add custom instrumentation. :::::{note} Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of the [supported technologies](/reference/supported-technologies.md) below. Consider using the [EDOT Java SDK](elastic-otel-java://reference/edot-java/index.md) for observability data so you continue to get the full power of Elastic's platform. From 7c9647499838ce0cdeeb8f2ddf4b47fcf01108e7 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Mon, 16 Mar 2026 14:54:15 +0100 Subject: [PATCH 4/4] chore: trigger PR refresh Made-with: Cursor