Skip to content

Commit

Permalink
TOMEE-4113 - Update to MicroProfile Metrics 5 & SmallRye Metrics 5 (#972
Browse files Browse the repository at this point in the history 
)

* Something screwed up here - fixing this test

* TOMEE-3850 fix test and update for Jakarta

* Use MP Metrics 5.0.0-SNAPSHOT

* Change extension

* WIP

* WIP

* Add parameter map to MicroProfileMetricsEndpoint call to SmallRye

* Re-enable MP metrics TCK test suite, add MP Metrics Optional Tests, and increase memory limit for remote TomEE server

* Wiring for the optional tests

* Debugging the Filter

* Wire up metrics filter correctly

* Slight delay before calling the /metrics endpoint

* Micrometer version and JVM settings

* Use Microprofile Metrics API 5.0.0-RC2

* Fix MP metrics version

* Use smallrye milestone 1, and add vendor metrics for some of the stuff we expose via JMX.

* WIP

* WIP

* WIP on the TCK test suites

* Add metric registry clean up

* Update versions

* WIP

* Versions

* Update version

* Fixes from merge / rebase and latest EE10-related changes

* Minor version updates

* Update README to reflect recent changes

* Fix examples after Metrics 5.0.2

* Regenerate BOMs

* Regenerate boms + remove prometheus

* Prometheus is required for Metrics TCK

* Exclude three optional TCK tests (as we do not support gc jvm based metrics atm)

* Re-add missing TCKs
Removes outdated extension
Adjust example to metrics 5

---------

Co-authored-by: Richard Zowalla <rzo1@apache.org>
  • Loading branch information
@jgallimore @rzo1
jgallimore and rzo1 authored Apr 25, 2024
1 parent fd64711 commit bf0c7d2
Show file tree
Hide file tree
Showing 41 changed files with 850 additions and 251 deletions.
2 changes: 1 addition & 1 deletion boms/tomee-microprofile-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
<version>4.0.1</version>
<version>5.0.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
135 changes: 128 additions & 7 deletions boms/tomee-microprofile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>4.0.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
Expand Down Expand Up @@ -199,6 +210,50 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-commons</artifactId>
<version>1.12.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>1.12.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-observation</artifactId>
<version>1.12.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>1.12.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-concurrent</artifactId>
Expand Down Expand Up @@ -243,6 +298,61 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>0.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_common</artifactId>
<version>0.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_tracer_common</artifactId>
<version>0.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_tracer_otel</artifactId>
<version>0.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_tracer_otel_agent</artifactId>
<version>0.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.smallrye.common</groupId>
<artifactId>smallrye-common-annotation</artifactId>
Expand Down Expand Up @@ -400,7 +510,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-metrics</artifactId>
<version>4.0.0</version>
<version>5.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -1918,7 +2028,7 @@
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
<version>4.0.1</version>
<version>5.0.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -1961,7 +2071,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.4</version>
<exclusions>
<exclusion>
Expand All @@ -1972,7 +2082,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<artifactId>txw2</artifactId>
<version>4.0.4</version>
<exclusions>
<exclusion>
Expand All @@ -1982,9 +2092,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>4.0.4</version>
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
<version>2.1.12</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -2036,6 +2146,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.latencyutils</groupId>
<artifactId>LatencyUtils</artifactId>
<version>2.0.3</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion boms/tomee-plume-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
<version>4.0.1</version>
<version>5.0.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
Loading

0 comments on commit bf0c7d2

Please sign in to comment.