From f8d1cb6d350e430ed3fddc814505953aaaa9b7f7 Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri Benedetti Date: Mon, 16 Mar 2026 14:52:09 +0100 Subject: [PATCH 1/4] Add agent-skill callouts for EDOT Java setup and migration. Surface the new v0.1.1 EDOT Java instrument and migrate skills on the canonical task pages. Co-authored-by: GPT-5 Codex Made-with: Cursor --- docs/reference/edot-java/migration.md | 4 ++++ docs/reference/edot-java/setup/index.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/reference/edot-java/migration.md b/docs/reference/edot-java/migration.md index e11f06dd..820e082c 100644 --- a/docs/reference/edot-java/migration.md +++ b/docs/reference/edot-java/migration.md @@ -18,6 +18,10 @@ products: Compared to the Elastic {{product.apm}} Java agent, the {{edot}} Java presents a number of advantages: +:::{agent-skill} +:url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-migrate +::: + - Fully automatic instrumentation with zero code changes. No need to modify application code. - Capture, send, transform, and store data in an OpenTelemetry native way. This includes for example the ability to use all features of the OpenTelemetry SDK for manual tracing, data following semantic conventions, or ability to use intermediate collectors and processors. - OpenTelemetry Java Instrumentation provides a [broad coverage of libraries, frameworks, and applications](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/supported-libraries.md). diff --git a/docs/reference/edot-java/setup/index.md b/docs/reference/edot-java/setup/index.md index 96d12d26..f8c90c06 100644 --- a/docs/reference/edot-java/setup/index.md +++ b/docs/reference/edot-java/setup/index.md @@ -17,6 +17,10 @@ products: Learn how to set up the {{edot}} (EDOT) Java in various environments, including Kubernetes and others. +:::{agent-skill} +:url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-instrument +::: + :::{warning} Avoid using the Java SDK alongside any other APM agent, including Elastic APM agents. Running multiple agents in the same application process may lead to conflicting instrumentation, duplicate telemetry, or other unexpected behavior. ::: From cc21a1f8ddbc5fdf5f36f3710564c78f18e2d3bb Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri-Benedetti Date: Mon, 16 Mar 2026 14:55:23 +0100 Subject: [PATCH 2/4] Update migration.md --- docs/reference/edot-java/migration.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/edot-java/migration.md b/docs/reference/edot-java/migration.md index 820e082c..45662c6a 100644 --- a/docs/reference/edot-java/migration.md +++ b/docs/reference/edot-java/migration.md @@ -18,10 +18,6 @@ products: Compared to the Elastic {{product.apm}} Java agent, the {{edot}} Java presents a number of advantages: -:::{agent-skill} -:url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-migrate -::: - - Fully automatic instrumentation with zero code changes. No need to modify application code. - Capture, send, transform, and store data in an OpenTelemetry native way. This includes for example the ability to use all features of the OpenTelemetry SDK for manual tracing, data following semantic conventions, or ability to use intermediate collectors and processors. - OpenTelemetry Java Instrumentation provides a [broad coverage of libraries, frameworks, and applications](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/supported-libraries.md). @@ -29,6 +25,10 @@ Compared to the Elastic {{product.apm}} Java agent, the {{edot}} Java presents a ## Migration steps +:::{agent-skill} +:url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-migrate +::: + Follow these steps to migrate from the legacy Elastic {{product.apm}} Java agent to the {{edot}} Java. ::::::{stepper} From 300017d4f7404f72ce971929a5048d0e48c9573b Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri-Benedetti Date: Mon, 16 Mar 2026 14:56:13 +0100 Subject: [PATCH 3/4] Update index.md --- docs/reference/edot-java/setup/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/reference/edot-java/setup/index.md b/docs/reference/edot-java/setup/index.md index f8c90c06..977aafec 100644 --- a/docs/reference/edot-java/setup/index.md +++ b/docs/reference/edot-java/setup/index.md @@ -17,10 +17,6 @@ products: Learn how to set up the {{edot}} (EDOT) Java in various environments, including Kubernetes and others. -:::{agent-skill} -:url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-instrument -::: - :::{warning} Avoid using the Java SDK alongside any other APM agent, including Elastic APM agents. Running multiple agents in the same application process may lead to conflicting instrumentation, duplicate telemetry, or other unexpected behavior. ::: @@ -37,6 +33,10 @@ For environments where modifying the JVM arguments or configuration is not possi Follow the following Java setup guide for all other environments. +:::{agent-skill} +:url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-instrument +::: + ## Download the agent You can download the latest release version of the EDOT Java agent from [![Maven Central](https://img.shields.io/maven-central/v/co.elastic.otel/elastic-otel-javaagent?label=elastic-otel-javaagent&style=for-the-badge)](https://mvnrepository.com/artifact/co.elastic.otel/elastic-otel-javaagent/latest) @@ -100,4 +100,4 @@ For applications deployed with Kubernetes, use the [OpenTelemetry Operator](/ref ## Troubleshooting -For help with common setup issues, refer to the [EDOT Java troubleshooting guide](docs-content://troubleshoot/ingest/opentelemetry/edot-sdks/java/index.md). \ No newline at end of file +For help with common setup issues, refer to the [EDOT Java troubleshooting guide](docs-content://troubleshoot/ingest/opentelemetry/edot-sdks/java/index.md). From 74e56445686e54587032cecf441abe63b09b5b7d Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri Benedetti Date: Mon, 16 Mar 2026 15:23:48 +0100 Subject: [PATCH 4/4] docs: add EDOT Java agent-skill body text Re-add custom agent-skill descriptions after the callouts were moved to their new locations in setup and migration pages. Co-authored-by: GPT-5 Codex Made-with: Cursor --- docs/reference/edot-java/migration.md | 2 ++ docs/reference/edot-java/setup/index.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/reference/edot-java/migration.md b/docs/reference/edot-java/migration.md index 45662c6a..5c05668e 100644 --- a/docs/reference/edot-java/migration.md +++ b/docs/reference/edot-java/migration.md @@ -27,6 +27,8 @@ Compared to the Elastic {{product.apm}} Java agent, the {{edot}} Java presents a :::{agent-skill} :url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-migrate + +Use this skill to migrate from the Elastic APM Java agent to EDOT Java. ::: Follow these steps to migrate from the legacy Elastic {{product.apm}} Java agent to the {{edot}} Java. diff --git a/docs/reference/edot-java/setup/index.md b/docs/reference/edot-java/setup/index.md index 977aafec..7bf50994 100644 --- a/docs/reference/edot-java/setup/index.md +++ b/docs/reference/edot-java/setup/index.md @@ -35,6 +35,8 @@ Follow the following Java setup guide for all other environments. :::{agent-skill} :url: https://github.com/elastic/agent-skills/tree/main/skills/observability/edot-java-instrument + +Use this skill to instrument Java services with EDOT for tracing, metrics, and logs. ::: ## Download the agent