Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/docset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ cross_links:
- ecs
- ecs-logging
- ecs-logging-java
- elastic-otel-java
- elasticsearch
toc:
- toc: reference
Expand Down
6 changes: 5 additions & 1 deletion docs/reference/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docs/reference/supported-technologies.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading