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 4691f9677f..40ba4a76e0 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -12,7 +12,11 @@ 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. +::::: ::::{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..3cde506d59 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](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) * [Application Servers/Servlet Containers](#supported-app-servers)