You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2024/11/18 19:34:46 UTC
(tomee) branch TOMEE-4343 updated: Fix the Tracer test
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-4343
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/TOMEE-4343 by this push:
new b058f930a5 Fix the Tracer test
b058f930a5 is described below
commit b058f930a56e0fed9296fea011945e8338652570
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Mon Nov 18 20:34:38 2024 +0100
Fix the Tracer test
---
boms/tomee-microprofile/pom.xml | 260 ++++++++++++++++-----
boms/tomee-plume/pom.xml | 260 ++++++++++++++++-----
boms/tomee-plus/pom.xml | 260 ++++++++++++++++-----
tck/microprofile-tck/opentelemetry/pom.xml | 2 +-
.../tck/opentelemetry/TestConfigSource.java | 3 +-
tomee/tomee-myfaces/pom.xml | 5 +
6 files changed, 629 insertions(+), 161 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 143934a04d..6399685fdc 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -244,9 +244,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing.contrib</groupId>
- <artifactId>opentracing-concurrent</artifactId>
- <version>0.4.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
+ <version>2.5.0-alpha</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -255,9 +255,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -266,9 +266,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-noop</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>
+ <version>2.5.0-alpha</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -277,9 +277,152 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-api</artifactId>
+ <version>2.5.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
+ <version>2.5.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ <version>1.25.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <version>1.25.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api-incubator</artifactId>
+ <version>1.39.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-context</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-common</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-logs</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-metrics</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-trace</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk</artifactId>
+ <version>1.39.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -431,9 +574,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
- <artifactId>jandex</artifactId>
- <version>3.2.2</version>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-api</artifactId>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -442,9 +585,31 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-api</artifactId>
- <version>6.4.1</version>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-cdi</artifactId>
+ <version>2.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-config</artifactId>
+ <version>2.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-rest</artifactId>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -454,8 +619,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
- <version>6.4.1</version>
+ <artifactId>jandex</artifactId>
+ <version>3.2.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -465,7 +630,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <artifactId>smallrye-fault-tolerance-api</artifactId>
<version>6.4.1</version>
<exclusions>
<exclusion>
@@ -476,7 +641,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance</artifactId>
+ <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
<version>6.4.1</version>
<exclusions>
<exclusion>
@@ -487,8 +652,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-health</artifactId>
- <version>4.0.1</version>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>6.4.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -498,8 +663,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-metrics</artifactId>
- <version>5.0.1</version>
+ <artifactId>smallrye-fault-tolerance</artifactId>
+ <version>6.4.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -509,8 +674,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-open-api-core</artifactId>
- <version>3.13.0</version>
+ <artifactId>smallrye-health</artifactId>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -520,8 +685,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-open-api-jaxrs</artifactId>
- <version>3.13.0</version>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>5.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -531,8 +696,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-opentracing-contrib</artifactId>
- <version>3.0.3</version>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>3.13.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -542,8 +707,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-opentracing</artifactId>
- <version>3.0.3</version>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>3.13.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -961,7 +1126,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -972,7 +1137,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -983,7 +1148,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -994,7 +1159,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1005,7 +1170,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1016,7 +1181,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1027,7 +1192,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1038,7 +1203,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1970,17 +2135,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.opentracing</groupId>
- <artifactId>microprofile-opentracing-api</artifactId>
- <version>3.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index b39fd0aac3..771e846d09 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -244,9 +244,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing.contrib</groupId>
- <artifactId>opentracing-concurrent</artifactId>
- <version>0.4.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
+ <version>2.5.0-alpha</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -255,9 +255,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -266,9 +266,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-noop</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>
+ <version>2.5.0-alpha</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -277,9 +277,152 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-api</artifactId>
+ <version>2.5.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
+ <version>2.5.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ <version>1.25.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <version>1.25.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api-incubator</artifactId>
+ <version>1.39.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-context</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-common</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-logs</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-metrics</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-trace</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk</artifactId>
+ <version>1.39.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -431,9 +574,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
- <artifactId>jandex</artifactId>
- <version>3.2.2</version>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-api</artifactId>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -442,9 +585,31 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-api</artifactId>
- <version>6.4.1</version>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-cdi</artifactId>
+ <version>2.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-config</artifactId>
+ <version>2.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-rest</artifactId>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -454,8 +619,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
- <version>6.4.1</version>
+ <artifactId>jandex</artifactId>
+ <version>3.2.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -465,7 +630,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <artifactId>smallrye-fault-tolerance-api</artifactId>
<version>6.4.1</version>
<exclusions>
<exclusion>
@@ -476,7 +641,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance</artifactId>
+ <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
<version>6.4.1</version>
<exclusions>
<exclusion>
@@ -487,8 +652,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-health</artifactId>
- <version>4.0.1</version>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>6.4.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -498,8 +663,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-metrics</artifactId>
- <version>5.0.1</version>
+ <artifactId>smallrye-fault-tolerance</artifactId>
+ <version>6.4.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -509,8 +674,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-open-api-core</artifactId>
- <version>3.13.0</version>
+ <artifactId>smallrye-health</artifactId>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -520,8 +685,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-open-api-jaxrs</artifactId>
- <version>3.13.0</version>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>5.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -531,8 +696,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-opentracing-contrib</artifactId>
- <version>3.0.3</version>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>3.13.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -542,8 +707,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-opentracing</artifactId>
- <version>3.0.3</version>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>3.13.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1027,7 +1192,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1038,7 +1203,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1049,7 +1214,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1060,7 +1225,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1071,7 +1236,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1082,7 +1247,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1093,7 +1258,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1104,7 +1269,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2036,17 +2201,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.opentracing</groupId>
- <artifactId>microprofile-opentracing-api</artifactId>
- <version>3.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 3739066892..fb2d55273d 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -244,9 +244,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing.contrib</groupId>
- <artifactId>opentracing-concurrent</artifactId>
- <version>0.4.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
+ <version>2.5.0-alpha</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -255,9 +255,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -266,9 +266,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-noop</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>
+ <version>2.5.0-alpha</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -277,9 +277,152 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- <version>0.33.0</version>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-api</artifactId>
+ <version>2.5.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
+ <version>2.5.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ <version>1.25.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <version>1.25.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api-incubator</artifactId>
+ <version>1.39.0-alpha</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-context</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-common</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-logs</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-metrics</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-trace</artifactId>
+ <version>1.39.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk</artifactId>
+ <version>1.39.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -431,9 +574,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
- <artifactId>jandex</artifactId>
- <version>3.2.2</version>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-api</artifactId>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -442,9 +585,31 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-api</artifactId>
- <version>6.4.1</version>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-cdi</artifactId>
+ <version>2.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-config</artifactId>
+ <version>2.8.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye.opentelemetry</groupId>
+ <artifactId>smallrye-opentelemetry-rest</artifactId>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -454,8 +619,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
- <version>6.4.1</version>
+ <artifactId>jandex</artifactId>
+ <version>3.2.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -465,7 +630,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <artifactId>smallrye-fault-tolerance-api</artifactId>
<version>6.4.1</version>
<exclusions>
<exclusion>
@@ -476,7 +641,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-fault-tolerance</artifactId>
+ <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
<version>6.4.1</version>
<exclusions>
<exclusion>
@@ -487,8 +652,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-health</artifactId>
- <version>4.0.1</version>
+ <artifactId>smallrye-fault-tolerance-core</artifactId>
+ <version>6.4.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -498,8 +663,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-metrics</artifactId>
- <version>5.0.1</version>
+ <artifactId>smallrye-fault-tolerance</artifactId>
+ <version>6.4.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -509,8 +674,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-open-api-core</artifactId>
- <version>3.13.0</version>
+ <artifactId>smallrye-health</artifactId>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -520,8 +685,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-open-api-jaxrs</artifactId>
- <version>3.13.0</version>
+ <artifactId>smallrye-metrics</artifactId>
+ <version>5.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -531,8 +696,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-opentracing-contrib</artifactId>
- <version>3.0.3</version>
+ <artifactId>smallrye-open-api-core</artifactId>
+ <version>3.13.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -542,8 +707,8 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-opentracing</artifactId>
- <version>3.0.3</version>
+ <artifactId>smallrye-open-api-jaxrs</artifactId>
+ <version>3.13.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1049,7 +1214,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1060,7 +1225,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1071,7 +1236,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1082,7 +1247,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1093,7 +1258,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1104,7 +1269,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1115,7 +1280,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1126,7 +1291,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2058,17 +2223,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.opentracing</groupId>
- <artifactId>microprofile-opentracing-api</artifactId>
- <version>3.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
diff --git a/tck/microprofile-tck/opentelemetry/pom.xml b/tck/microprofile-tck/opentelemetry/pom.xml
index 4020ceef11..31f3ac8d33 100644
--- a/tck/microprofile-tck/opentelemetry/pom.xml
+++ b/tck/microprofile-tck/opentelemetry/pom.xml
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
- <version>1.7.1.Final</version>
+ <version>1.9.1.Final</version>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/TestConfigSource.java b/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/TestConfigSource.java
index 35dc2491d3..428c9bf39d 100644
--- a/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/TestConfigSource.java
+++ b/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/TestConfigSource.java
@@ -25,7 +25,8 @@ public class TestConfigSource extends MapBackedConfigSource {
super("TestConfigSource",
Map.of("otel.sdk.disabled", "true",
"otel.traces.exporter", "none",
- "otel.metrics.exporter", "none"),
+ "otel.metrics.exporter", "none",
+ "otel.logs.exporter", "none"),
Integer.MIN_VALUE);
}
}
\ No newline at end of file
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index d7969def37..2796130c53 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -55,6 +55,11 @@
<artifactId>openejb-loader</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>