Skip to content

Commit d9c04c3

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-other
2 parents 420a1ae + 25471f9 commit d9c04c3

File tree

18 files changed

+169
-65
lines changed

18 files changed

+169
-65
lines changed

docs/instrumentation-list.yaml

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5300,8 +5300,12 @@ libraries:
53005300
- name: jaxrs-1.0
53015301
display_name: JAX-RS 1.x
53025302
description: |
5303-
This instrumentation enables spans for JAX-RS methods, and enriches existing HTTP server spans with route information.
5303+
This instrumentation enriches HTTP server spans with route information and enables controller spans for JAX-RS annotated methods (controller spans are disabled by default).
53045304
library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html
5305+
disabled_by_default: true
5306+
features:
5307+
- HTTP_ROUTE
5308+
- CONTROLLER_SPANS
53055309
source_path: instrumentation/jaxrs/jaxrs-1.0
53065310
scope:
53075311
name: io.opentelemetry.jaxrs-1.0
@@ -5325,8 +5329,12 @@ libraries:
53255329
- name: jaxrs-2.0-annotations
53265330
display_name: JAX-RS 2.x
53275331
description: |
5328-
This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server spans with route information.
5332+
This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS annotated methods (controller spans are disabled by default).
53295333
library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html
5334+
disabled_by_default: true
5335+
features:
5336+
- HTTP_ROUTE
5337+
- CONTROLLER_SPANS
53305338
source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations
53315339
scope:
53325340
name: io.opentelemetry.jaxrs-2.0-annotations
@@ -5354,8 +5362,11 @@ libraries:
53545362
- name: jaxrs-2.0-cxf-3.2
53555363
display_name: Apache CXF JAX-RS 2.x
53565364
description: |
5357-
This instrumentation enables spans for JAX-RS methods when using Apache CXF, and enriches existing HTTP server spans with route information.
5365+
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).
53585366
library_link: https://cxf.apache.org/
5367+
features:
5368+
- HTTP_ROUTE
5369+
- CONTROLLER_SPANS
53595370
source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2
53605371
scope:
53615372
name: io.opentelemetry.jaxrs-2.0-cxf-3.2
@@ -5394,8 +5405,11 @@ libraries:
53945405
- name: jaxrs-2.0-jersey-2.0
53955406
display_name: Eclipse Jersey JAX-RS 2.x
53965407
description: |
5397-
This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches existing HTTP server spans with route information.
5408+
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).
53985409
library_link: https://eclipse-ee4j.github.io/jersey/
5410+
features:
5411+
- HTTP_ROUTE
5412+
- CONTROLLER_SPANS
53995413
source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0
54005414
scope:
54015415
name: io.opentelemetry.jaxrs-2.0-jersey-2.0
@@ -5434,8 +5448,11 @@ libraries:
54345448
- name: jaxrs-2.0-resteasy-3.0
54355449
display_name: JBoss RESTEasy JAX-RS 2.x
54365450
description: |
5437-
This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing HTTP server spans with route information.
5451+
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).
54385452
library_link: https://resteasy.dev/
5453+
features:
5454+
- HTTP_ROUTE
5455+
- CONTROLLER_SPANS
54395456
source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0
54405457
scope:
54415458
name: io.opentelemetry.jaxrs-2.0-resteasy-3.0
@@ -5474,8 +5491,11 @@ libraries:
54745491
- name: jaxrs-2.0-resteasy-3.1
54755492
display_name: JBoss RESTEasy JAX-RS 2.x
54765493
description: |
5477-
This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing HTTP server spans with route information.
5494+
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).
54785495
library_link: https://resteasy.dev/
5496+
features:
5497+
- HTTP_ROUTE
5498+
- CONTROLLER_SPANS
54795499
source_path: instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1
54805500
scope:
54815501
name: io.opentelemetry.jaxrs-2.0-resteasy-3.1
@@ -5514,8 +5534,12 @@ libraries:
55145534
- name: jaxrs-3.0-annotations
55155535
display_name: JAX-RS 3.x
55165536
description: |
5517-
This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server spans with route information.
5537+
This instrumentation enriches HTTP server spans with route information, and enables controller spans for JAX-RS annotated methods (controller spans are disabled by default).
55185538
library_link: https://jakarta.ee/specifications/restful-ws/3.0/
5539+
disabled_by_default: true
5540+
features:
5541+
- HTTP_ROUTE
5542+
- CONTROLLER_SPANS
55195543
source_path: instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations
55205544
scope:
55215545
name: io.opentelemetry.jaxrs-3.0-annotations
@@ -5543,8 +5567,11 @@ libraries:
55435567
- name: jaxrs-3.0-jersey-3.0
55445568
display_name: Eclipse Jersey JAX-RS 3.x
55455569
description: |
5546-
This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches existing HTTP server spans with route information.
5570+
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).
55475571
library_link: https://eclipse-ee4j.github.io/jersey/
5572+
features:
5573+
- HTTP_ROUTE
5574+
- CONTROLLER_SPANS
55485575
source_path: instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0
55495576
minimum_java_version: 11
55505577
scope:
@@ -5583,8 +5610,11 @@ libraries:
55835610
- name: jaxrs-3.0-resteasy-6.0
55845611
display_name: JBoss RESTEasy JAX-RS 3.x
55855612
description: |
5586-
This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing HTTP server spans with route information.
5613+
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).
55875614
library_link: https://resteasy.dev/
5615+
features:
5616+
- HTTP_ROUTE
5617+
- CONTROLLER_SPANS
55885618
source_path: instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0
55895619
minimum_java_version: 11
55905620
scope:

instrumentation/jaxrs/jaxrs-1.0/metadata.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
display_name: JAX-RS 1.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods, and enriches existing HTTP server spans
4-
with route information.
3+
This instrumentation enriches HTTP server spans with route information and enables controller
4+
spans for JAX-RS annotated methods (controller spans are disabled by default).
5+
features:
6+
- HTTP_ROUTE
7+
- CONTROLLER_SPANS
8+
disabled_by_default: true
59
library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html
610
configurations:
711
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/metadata.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
display_name: JAX-RS 2.x
22
description: >
3-
This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server
4-
spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS annotated methods (controller spans are disabled by default).
55
library_link: https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
9+
disabled_by_default: true
610
configurations:
711
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
812
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/metadata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
display_name: Apache CXF JAX-RS 2.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods when using Apache CXF, and enriches
4-
existing HTTP server spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS methods when using Apache CXF (controller spans are disabled by default).
55
library_link: https://cxf.apache.org/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
69
configurations:
710
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
811
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/metadata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
display_name: Eclipse Jersey JAX-RS 2.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches
4-
existing HTTP server spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS methods when using Jersey (controller spans are disabled by default).
55
library_link: https://eclipse-ee4j.github.io/jersey/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
69
configurations:
710
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
811
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/metadata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
display_name: JBoss RESTEasy JAX-RS 2.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing
4-
HTTP server spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default).
55
library_link: https://resteasy.dev/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
69
configurations:
710
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
811
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/metadata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
display_name: JBoss RESTEasy JAX-RS 2.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing
4-
HTTP server spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default).
55
library_link: https://resteasy.dev/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
69
configurations:
710
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
811
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/metadata.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
display_name: JAX-RS 3.x
22
description: >
3-
This instrumentation enables spans for JAX-RS annotated methods, and enriches existing HTTP server
4-
spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS annotated methods (controller spans are disabled by default).
55
library_link: https://jakarta.ee/specifications/restful-ws/3.0/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
9+
disabled_by_default: true
610
configurations:
711
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
812
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/metadata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
display_name: Eclipse Jersey JAX-RS 3.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods when using Jersey, and enriches existing
4-
HTTP server spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS methods when using Jersey (controller spans are disabled by default).
55
library_link: https://eclipse-ee4j.github.io/jersey/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
69
configurations:
710
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
811
description: Enables the creation of experimental controller spans.

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/metadata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
display_name: JBoss RESTEasy JAX-RS 3.x
22
description: >
3-
This instrumentation enables spans for JAX-RS methods when using RESTEasy, and enriches existing
4-
HTTP server spans with route information.
3+
This instrumentation enriches HTTP server spans with route information, and enables controller
4+
spans for JAX-RS methods when using RESTEasy (controller spans are disabled by default).
55
library_link: https://resteasy.dev/
6+
features:
7+
- HTTP_ROUTE
8+
- CONTROLLER_SPANS
69
configurations:
710
- name: otel.instrumentation.common.experimental.controller-telemetry.enabled
811
description: Enables the creation of experimental controller spans.

0 commit comments

Comments
 (0)