This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 12eca7a811 Consistent versioning, fix other failures
12eca7a811 is described below
commit 12eca7a811ec76d3b57b41d763dfef01cc6da0d4
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Mon May 9 12:20:15 2022 +0200
Consistent versioning, fix other failures
---
examples/mp-metrics-counted/pom.xml | 2 +-
examples/mp-metrics-gauge/pom.xml | 6 +-
examples/mp-metrics-histogram/pom.xml | 2 +-
.../org/superbiz/histogram/WeatherService.java | 9 ++-
.../org/superbiz/histogram/WeatherServiceTest.java | 86 ++++++++++++++++++----
examples/mp-metrics-metered/pom.xml | 6 +-
examples/mp-metrics-timed/pom.xml | 5 +-
7 files changed, 90 insertions(+), 26 deletions(-)
diff --git a/examples/mp-metrics-counted/pom.xml
b/examples/mp-metrics-counted/pom.xml
index 5570e05981..5c7f46286c 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -25,7 +25,7 @@
<name>TomEE :: Examples :: Microprofile Metrics Counted</name>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
- <microprofile.metrics.version>1.1</microprofile.metrics.version>
+ <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
<version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
<junit.version>4.13.2</junit.version>
<docker.image.name>tomee/${project.artifactId}</docker.image.name>
diff --git a/examples/mp-metrics-gauge/pom.xml
b/examples/mp-metrics-gauge/pom.xml
index f69189f502..8df003e382 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -23,11 +23,11 @@
<packaging>war</packaging>
<name>TomEE :: Examples :: MicroProfile Metrics Gauge</name>
<properties>
- <junit.version>4.13.2</junit.version>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
- <microprofile.metrics.version>1.1.1</microprofile.metrics.version>
- <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+ <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
<version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
+ <junit.version>4.13.2</junit.version>
+ <tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
</properties>
<dependencies>
<dependency>
diff --git a/examples/mp-metrics-histogram/pom.xml
b/examples/mp-metrics-histogram/pom.xml
index 8b5d9a5e7a..c85d5585f5 100644
--- a/examples/mp-metrics-histogram/pom.xml
+++ b/examples/mp-metrics-histogram/pom.xml
@@ -25,7 +25,7 @@
<name>TomEE :: Examples :: Microprofile Metrics Histogram</name>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
- <microprofile.metrics.version>1.1</microprofile.metrics.version>
+ <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
<version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
<junit.version>4.13.2</junit.version>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
diff --git
a/examples/mp-metrics-histogram/src/main/java/org/superbiz/histogram/WeatherService.java
b/examples/mp-metrics-histogram/src/main/java/org/superbiz/histogram/WeatherService.java
index 7de419a9b9..193743fd56 100644
---
a/examples/mp-metrics-histogram/src/main/java/org/superbiz/histogram/WeatherService.java
+++
b/examples/mp-metrics-histogram/src/main/java/org/superbiz/histogram/WeatherService.java
@@ -18,6 +18,7 @@ package org.superbiz.histogram;
import org.eclipse.microprofile.metrics.Histogram;
import org.eclipse.microprofile.metrics.Metadata;
+import org.eclipse.microprofile.metrics.MetadataBuilder;
import org.eclipse.microprofile.metrics.MetricRegistry;
import org.eclipse.microprofile.metrics.MetricType;
import org.eclipse.microprofile.metrics.annotation.Metric;
@@ -48,8 +49,12 @@ public class WeatherService {
@GET
@Produces(MediaType.APPLICATION_JSON)
public Histogram getTemperatures() {
- Metadata metadata = new Metadata("temperatures", MetricType.HISTOGRAM,
"degrees F");
- metadata.setDescription("A histogram of recent New York
temperatures.");
+ final Metadata metadata = new MetadataBuilder()
+ .withName("temperatures")
+ .withDescription("A histogram of recent New York temperatures.")
+ .withType(MetricType.HISTOGRAM)
+ .withUnit("degrees F")
+ .build();
histogram = registry.histogram(metadata);
for(int temp : RECENT_NEW_YORK_TEMPS) {
histogram.update(temp);
diff --git
a/examples/mp-metrics-histogram/src/test/java/org/superbiz/histogram/WeatherServiceTest.java
b/examples/mp-metrics-histogram/src/test/java/org/superbiz/histogram/WeatherServiceTest.java
index c0a5c507f5..3a29ef916d 100644
---
a/examples/mp-metrics-histogram/src/test/java/org/superbiz/histogram/WeatherServiceTest.java
+++
b/examples/mp-metrics-histogram/src/test/java/org/superbiz/histogram/WeatherServiceTest.java
@@ -89,16 +89,42 @@ public class WeatherServiceTest {
final String[] metric =
webTarget.path(metricPath).request().accept(MediaType.TEXT_PLAIN).get(String.class).split("\n");
final Set<String> expected = new HashSet<>(Arrays.asList(
- ("# TYPE application:temperatures_degrees F summary histogram\n" +
"# TYPE " + "application" +
- ":temperatures_degrees F_count histogram\n" +
"application:temperatures_degrees " +
- "F_count 15.0\n" + "# TYPE
application:temperatures_min_degrees F histogram\n" +
- "application:temperatures_min_degrees F 27.0\n" + "# TYPE " +
"application" +
- ":temperatures_max_degrees F histogram\n" + "application" +
":temperatures_max_degrees F " +
- "55" + ".0\n" + "# TYPE application:temperatures_mean_degrees
F " + "histogram\n" +
- "application" + ":temperatures_mean_degrees F 44.4\n" + "#
TYPE " + "application" +
- ":temperatures_stddev_degrees F histogram\n" + "application" +
- ":temperatures_stddev_degrees F 7.0710678118654755\n" + "#
TYPE " + "application" +
- ":temperatures_degrees F histogram\n" +
"application:temperatures_degrees " + "F{quantile" + "=\"0.5\"} 45.0\n" + "#
TYPE application:temperatures_degrees F histogram\n" + "application" +
":temperatures_degrees F{quantile=\"0.75\"} 46.0\n" + "# TYPE " + "application"
+ ":temperatures_degrees F histogram\n" + "application:temperatures_degrees " +
"F{quantile" + "=\"0.95\"} 54.0\n" + "# TYPE application:temperatures_degrees F
histogram\n" + "application:temperatures_degrees [...]
+ ("# HELP
application_org_superbiz_histogram_WeatherService_temperatures A histogram
metrics example.\n" +
+ "# TYPE
application_org_superbiz_histogram_WeatherService_temperatures_min gauge\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures_min 0.0\n" +
+ "# TYPE
application_org_superbiz_histogram_WeatherService_temperatures_max gauge\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures_max 0.0\n" +
+ "# TYPE
application_org_superbiz_histogram_WeatherService_temperatures_mean gauge\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures_mean 0.0\n" +
+ "# TYPE
application_org_superbiz_histogram_WeatherService_temperatures_stddev gauge\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures_stddev 0.0\n" +
+ "# TYPE
application_org_superbiz_histogram_WeatherService_temperatures summary\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures_count 0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures_sum 0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures{quantile=\"0.5\"}
0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures{quantile=\"0.75\"}
0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures{quantile=\"0.95\"}
0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures{quantile=\"0.98\"}
0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures{quantile=\"0.99\"}
0.0\n" +
+
"application_org_superbiz_histogram_WeatherService_temperatures{quantile=\"0.999\"}
0.0\n" +
+ "# HELP application_temperatures_degrees F A histogram of recent
New York temperatures.\n" +
+ "# TYPE application_temperatures_min_degrees F gauge\n" +
+ "application_temperatures_min_degrees F 27.0\n" +
+ "# TYPE application_temperatures_max_degrees F gauge\n" +
+ "application_temperatures_max_degrees F 55.0\n" +
+ "# TYPE application_temperatures_mean_degrees F gauge\n" +
+ "application_temperatures_mean_degrees F 44.4\n" +
+ "# TYPE application_temperatures_stddev_degrees F gauge\n" +
+ // "application_temperatures_stddev_degrees F
7.218494764607554\n" +
+ "# TYPE application_temperatures_degrees F summary\n" +
+ "application_temperatures_degrees F_count 15.0\n" +
+ "application_temperatures_degrees F_sum 666.0\n" +
+ "application_temperatures_degrees F{quantile=\"0.5\"} 45.0\n" +
+ "application_temperatures_degrees F{quantile=\"0.75\"} 48.0\n" +
+ "application_temperatures_degrees F{quantile=\"0.95\"} 55.0\n" +
+ "application_temperatures_degrees F{quantile=\"0.98\"} 55.0\n" +
+ "application_temperatures_degrees F{quantile=\"0.99\"} 55.0\n" +
+ "application_temperatures_degrees F{quantile=\"0.999\"} 55.0\n")
.split("\n")));
final Set<String> result =
@@ -107,7 +133,7 @@ public class WeatherServiceTest {
// temperatures_stddev_degrees
assertEquals(1, result.size());
// The part after 7. is performance dependant and is never the same
for every new call
-
assertTrue(result.iterator().next().startsWith("application:temperatures_stddev_degrees
F 7."));
+
assertTrue(result.iterator().next().startsWith("application_temperatures_stddev_degrees
F 7."));
}
class JsonItem {
@@ -153,7 +179,36 @@ public class WeatherServiceTest {
webTarget.path(metricPath).request().accept(MediaType.APPLICATION_JSON).get(String.class);
List<JsonItem> expectedList = convertToMap(
-
"{\"temperatures\":{\"count\":15,\"max\":55,\"mean\":44.4,\"min\":27,\"p50\":45.0,\"p75\":46.0,\"p95\":54.0,\"p98\":54.0,\"p99\":54.0,\"p999\":54.0,\"stddev\":7.0710678118654755,\"unit\":\"degrees
F\"},\"org.superbiz.histogram.WeatherService.temperatures\":{\"count\":0,\"max\":0,\"mean\":0.0,\"min\":0,\"p50\":0.0,\"p75\":0.0,\"p95\":0.0,\"p98\":0.0,\"p99\":0.0,\"p999\":0.0,\"stddev\":0.0,\"unit\":\"none\"}}");
+ "{\n" +
+ " \"temperatures\":{\n" +
+ " \"p99\":55.0,\n" +
+ " \"min\":27,\n" +
+ " \"max\":55,\n" +
+ " \"mean\":44.4,\n" +
+ " \"count\":15,\n" +
+ " \"sum\":666,\n" +
+ " \"p50\":45.0,\n" +
+ " \"p999\":55.0,\n" +
+ " \"stddev\":7.218494764607554,\n" +
+ " \"p95\":55.0,\n" +
+ " \"p98\":55.0,\n" +
+ " \"p75\":48.0\n" +
+ " },\n" +
+ " \"org.superbiz.histogram.WeatherService.temperatures\":{\n" +
+ " \"p99\":0.0,\n" +
+ " \"min\":0,\n" +
+ " \"max\":0,\n" +
+ " \"mean\":0.0,\n" +
+ " \"count\":0,\n" +
+ " \"sum\":0,\n" +
+ " \"p50\":0.0,\n" +
+ " \"p999\":0.0,\n" +
+ " \"stddev\":0.0,\n" +
+ " \"p95\":0.0,\n" +
+ " \"p98\":0.0,\n" +
+ " \"p75\":0.0\n" +
+ " }\n" +
+ "}");
List<JsonItem> metricList = convertToMap(metric);
assertEquals(expectedList.size(), metricList.size());
@@ -199,8 +254,11 @@ public class WeatherServiceTest {
JsonObject metadataJson = Json.createReader(new
StringReader(metaData)).readObject();
final String expected =
- "{\"temperatures\":{\"description\":\"A histogram of recent New
York temperatures.\"," +
-
"\"displayName\":\"temperatures\",\"name\":\"temperatures\",\"reusable\":false,"
+ "\"tags" +
"\":\"\",\"type\":\"histogram\",\"typeRaw\":\"HISTOGRAM\",\"unit\":\"degrees
F\"}," +
"\"org.superbiz.histogram.WeatherService.temperatures\":{\"description\":\"A
histogram " + "metrics example.\",\"displayName\":\"Histogram of Recent New
York Temperatures\"," +
"\"name\":\"org.superbiz.histogram.WeatherService.temperatures\",\"reusable\":false,"
+ "\"tags\":\"\",\"type\":\"histo [...]
+
"{\"org.superbiz.histogram.WeatherService.temperatures\":{\"unit\":\"none\",\"type\":\"histogram\","
+
+ "\"description\":\"A histogram metrics
example.\",\"displayName\":\"Histogram of Recent New York " +
+
"Temperatures\",\"tags\":[[]]},\"temperatures\":{\"unit\":\"degrees
F\",\"type\":\"histogram\"," +
+ "\"description\":\"A histogram of recent New York
temperatures.\",\"displayName\":\"temperatures\"," +
+ "\"tags\":[[]]}}";
JsonObject expectedJson = Json.createReader(new
StringReader(expected)).readObject();
assertEquals(expectedJson, metadataJson);
diff --git a/examples/mp-metrics-metered/pom.xml
b/examples/mp-metrics-metered/pom.xml
index 64e4c73726..fbcfa15325 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -24,8 +24,8 @@
<packaging>war</packaging>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
- <microprofile.metrics.version>1.1</microprofile.metrics.version>
- <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
+ <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+ <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
<junit.version>4.13.2</junit.version>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
</properties>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
- <version>1.0</version>
+ <version>${microprofile.metrics.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/mp-metrics-timed/pom.xml
b/examples/mp-metrics-timed/pom.xml
index f2f007ba86..bee41939dd 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -24,7 +24,8 @@
<name>TomEE :: Examples :: Microprofile Metrics Timed</name>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
- <microprofile.metrics.version>1.1</microprofile.metrics.version>
+ <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+ <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
<junit.version>4.13.2</junit.version>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
</properties>
@@ -56,7 +57,7 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.7.0.Alpha10</version>
+ <version>${version.arquillian.bom}</version>
<scope>test</scope>
</dependency>
<dependency>
