From c1cc1a45392c03d3e6b4289fcf4b59e2bdfe0df2 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Thu, 30 Oct 2025 07:48:32 -0400 Subject: [PATCH 1/2] JAXRS metadata updates --- docs/instrumentation-list.yaml | 48 +++++++++++++++---- instrumentation/jaxrs/jaxrs-1.0/metadata.yaml | 8 +++- .../jaxrs-2.0-annotations/metadata.yaml | 8 +++- .../jaxrs-2.0/jaxrs-2.0-cxf-3.2/metadata.yaml | 7 ++- .../jaxrs-2.0-jersey-2.0/metadata.yaml | 7 ++- .../jaxrs-2.0-resteasy-3.0/metadata.yaml | 7 ++- .../jaxrs-2.0-resteasy-3.1/metadata.yaml | 7 ++- .../jaxrs-3.0-annotations/metadata.yaml | 8 +++- .../jaxrs-3.0-jersey-3.0/metadata.yaml | 7 ++- .../jaxrs-3.0-resteasy-6.0/metadata.yaml | 7 ++- 10 files changed, 87 insertions(+), 27 deletions(-) diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml index 06c39e325ec1..e5f350370e34 100644 --- a/docs/instrumentation-list.yaml +++ b/docs/instrumentation-list.yaml @@ -5300,8 +5300,12 @@ libraries: - name: jaxrs-1.0 display_name: JAX-RS 1.x description: | - This instrumentation enables spans for JAX-RS methods, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information and enables controller spans for JAX-RS annotated methods (this instrumentation is disabled by default). library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html + disabled_by_default: true + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-1.0 scope: name: io.opentelemetry.jaxrs-1.0 @@ -5325,8 +5329,12 @@ libraries: - name: jaxrs-2.0-annotations display_name: JAX-RS 2.x description: | - This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS annotated methods (controller spans are disabled by default). library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html + disabled_by_default: true + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations scope: name: io.opentelemetry.jaxrs-2.0-annotations @@ -5354,8 +5362,11 @@ libraries: - name: jaxrs-2.0-cxf-3.2 display_name: Apache CXF JAX-RS 2.x description: | - This instrumentation enables spans for JAX-RS methods when using Apache CXF, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS methods when using Apache CXF (controller spans are disabled by default). library_link: https://cxf.apache.org/ + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2 scope: name: io.opentelemetry.jaxrs-2.0-cxf-3.2 @@ -5394,8 +5405,11 @@ libraries: - name: jaxrs-2.0-jersey-2.0 display_name: Eclipse Jersey JAX-RS 2.x description: | - This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS methods when using Jersey (controller spans are disabled by default). library_link: https://eclipse-ee4j.github.io/jersey/ + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0 scope: name: io.opentelemetry.jaxrs-2.0-jersey-2.0 @@ -5434,8 +5448,11 @@ libraries: - name: jaxrs-2.0-resteasy-3.0 display_name: JBoss RESTEasy JAX-RS 2.x description: | - This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default). library_link: https://resteasy.dev/ + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0 scope: name: io.opentelemetry.jaxrs-2.0-resteasy-3.0 @@ -5474,8 +5491,11 @@ libraries: - name: jaxrs-2.0-resteasy-3.1 display_name: JBoss RESTEasy JAX-RS 2.x description: | - This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default). library_link: https://resteasy.dev/ + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1 scope: name: io.opentelemetry.jaxrs-2.0-resteasy-3.1 @@ -5514,8 +5534,12 @@ libraries: - name: jaxrs-3.0-annotations display_name: JAX-RS 3.x description: | - This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS annotated methods (controller spans are disabled by default). library_link: https://jakarta.ee/specifications/restful-ws/3.0/ + disabled_by_default: true + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations scope: name: io.opentelemetry.jaxrs-3.0-annotations @@ -5543,8 +5567,11 @@ libraries: - name: jaxrs-3.0-jersey-3.0 display_name: Eclipse Jersey JAX-RS 3.x description: | - This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS methods when using Jersey (controller spans are disabled by default). library_link: https://eclipse-ee4j.github.io/jersey/ + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0 minimum_java_version: 11 scope: @@ -5583,8 +5610,11 @@ libraries: - name: jaxrs-3.0-resteasy-6.0 display_name: JBoss RESTEasy JAX-RS 3.x description: | - This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default). library_link: https://resteasy.dev/ + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0 minimum_java_version: 11 scope: diff --git a/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml b/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml index 768934acf2ef..cc88104aab60 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml @@ -1,7 +1,11 @@ display_name: JAX-RS 1.x description: > - This instrumentation enables spans for JAX-RS methods, and enriches existing HTTP server spans - with route information. + This instrumentation enriches HTTP server spans with route information and enables controller + spans for JAX-RS annotated methods (this instrumentation is disabled by default). +features: + - HTTP_ROUTE + - CONTROLLER_SPANS +disabled_by_default: true library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/metadata.yaml b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/metadata.yaml index b211febb9e21..e3ec352f1108 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/metadata.yaml @@ -1,8 +1,12 @@ display_name: JAX-RS 2.x description: > - This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server - spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS annotated methods (controller spans are disabled by default). library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html +features: + - HTTP_ROUTE + - CONTROLLER_SPANS +disabled_by_default: true configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/metadata.yaml b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/metadata.yaml index 0961a1df8e2d..14262d2ae4d6 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/metadata.yaml @@ -1,8 +1,11 @@ display_name: Apache CXF JAX-RS 2.x description: > - This instrumentation enables spans for JAX-RS methods when using Apache CXF, and enriches - existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS methods when using Apache CXF (controller spans are disabled by default). library_link: https://cxf.apache.org/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/metadata.yaml b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/metadata.yaml index 8b113985774a..b7810e763ba4 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/metadata.yaml @@ -1,8 +1,11 @@ display_name: Eclipse Jersey JAX-RS 2.x description: > - This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches - existing HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS methods when using Jersey (controller spans are disabled by default). library_link: https://eclipse-ee4j.github.io/jersey/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/metadata.yaml b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/metadata.yaml index f7be8accc3a7..9e8b9eea6225 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/metadata.yaml @@ -1,8 +1,11 @@ display_name: JBoss RESTEasy JAX-RS 2.x description: > - This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing - HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default). library_link: https://resteasy.dev/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/metadata.yaml b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/metadata.yaml index f7be8accc3a7..9e8b9eea6225 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/metadata.yaml @@ -1,8 +1,11 @@ display_name: JBoss RESTEasy JAX-RS 2.x description: > - This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing - HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default). library_link: https://resteasy.dev/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/metadata.yaml b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/metadata.yaml index 8fc7a9ad6842..2fc9680fada8 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/metadata.yaml @@ -1,8 +1,12 @@ display_name: JAX-RS 3.x description: > - This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server - spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS annotated methods (controller spans are disabled by default). library_link: https://jakarta.ee/specifications/restful-ws/3.0/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS +disabled_by_default: true configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/metadata.yaml b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/metadata.yaml index 0322a37828a5..eda8d49f4c77 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/metadata.yaml @@ -1,8 +1,11 @@ display_name: Eclipse Jersey JAX-RS 3.x description: > - This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches existing - HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS methods when using Jersey (controller spans are disabled by default). library_link: https://eclipse-ee4j.github.io/jersey/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/metadata.yaml b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/metadata.yaml index 4797afa108dd..b475927e8735 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/metadata.yaml @@ -1,8 +1,11 @@ display_name: JBoss RESTEasy JAX-RS 3.x description: > - This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing - HTTP server spans with route information. + This instrumentation enriches HTTP server spans with route information, and enables controller + spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default). library_link: https://resteasy.dev/ +features: + - HTTP_ROUTE + - CONTROLLER_SPANS configurations: - name: otel.instrumentation.common.experimental.controller-telemetry.enabled description: Enables the creation of experimental controller spans. From ae4245cdb189fef5d99f5fda13e79fe6413b87b9 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Thu, 30 Oct 2025 09:57:46 -0400 Subject: [PATCH 2/2] update verbiage --- docs/instrumentation-list.yaml | 2 +- instrumentation/jaxrs/jaxrs-1.0/metadata.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml index e5f350370e34..8eca7a850e93 100644 --- a/docs/instrumentation-list.yaml +++ b/docs/instrumentation-list.yaml @@ -5300,7 +5300,7 @@ libraries: - name: jaxrs-1.0 display_name: JAX-RS 1.x description: | - This instrumentation enriches HTTP server spans with route information and enables controller spans for JAX-RS annotated methods (this instrumentation is disabled by default). + This instrumentation enriches HTTP server spans with route information and enables controller spans for JAX-RS annotated methods (controller spans are disabled by default). library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html disabled_by_default: true features: diff --git a/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml b/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml index cc88104aab60..591daa21bb43 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml +++ b/instrumentation/jaxrs/jaxrs-1.0/metadata.yaml @@ -1,7 +1,7 @@ display_name: JAX-RS 1.x description: > This instrumentation enriches HTTP server spans with route information and enables controller - spans for JAX-RS annotated methods (this instrumentation is disabled by default). + spans for JAX-RS annotated methods (controller spans are disabled by default). features: - HTTP_ROUTE - CONTROLLER_SPANS