You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/05/09 09:15:59 UTC
[tomee] branch master updated: Fix some MP Metrics examples
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 8e200e8e1e Fix some MP Metrics examples
8e200e8e1e is described below
commit 8e200e8e1e8717a2ee63bd08409665cc2b061d58
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon May 9 11:15:51 2022 +0200
Fix some MP Metrics examples
---
.../java/org/superbiz/rest/WeatherServiceTest.java | 5 +-
.../src/test/java/WeatherServiceTest.java | 56 ++++++++++------------
2 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
index d7ec0edf3a..a6f2504c83 100644
--- a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
+++ b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
@@ -87,8 +87,9 @@ public class WeatherServiceTest {
.request()
.accept(MediaType.TEXT_PLAIN)
.get(String.class);
- assertEquals("# TYPE application:weather_day_status counter\n" +
- "application:weather_day_status{weather=\"day\"} 1.0\n", metric);
+ assertEquals("# HELP application_weather_day_status_total This metric shows the weather status of the day.\n" +
+ "# TYPE application_weather_day_status_total counter\n" +
+ "application_weather_day_status_total{weather=\"day\"} 1.0", metric);
}
private void assertJsonFormat(final String metricPath) {
diff --git a/examples/mp-metrics-timed/src/test/java/WeatherServiceTest.java b/examples/mp-metrics-timed/src/test/java/WeatherServiceTest.java
index 1e0ca7cf66..46f26be50d 100644
--- a/examples/mp-metrics-timed/src/test/java/WeatherServiceTest.java
+++ b/examples/mp-metrics-timed/src/test/java/WeatherServiceTest.java
@@ -91,36 +91,32 @@ public class WeatherServiceTest {
.readEntity(String.class);
String[] expected = {
- "# TYPE application:weather_day_status_seconds summary timer",
- "# TYPE application:weather_day_status_seconds_count timer",
- "application:weather_day_status_seconds_count 1.0",
- "# TYPE application:weather_day_status_rate_per_second timer",
- "application:weather_day_status_rate_per_second",
- "# TYPE application:weather_day_status_one_min_rate_per_second timer",
- "# TYPE application:weather_day_status_five_min_rate_per_second timer",
- "application:weather_day_status_five_min_rate_per_second",
- "# TYPE application:weather_day_status_fifteen_min_rate_per_second time",
- "application:weather_day_status_fifteen_min_rate_per_second",
- "# TYPE application:weather_day_status_min_seconds timer",
- "application:weather_day_status_min_seconds",
- "# TYPE application:weather_day_status_max_seconds timer",
- "application:weather_day_status_max_seconds",
- "# TYPE application:weather_day_status_mean_seconds timer",
- "application:weather_day_status_mean_seconds",
- "# TYPE application:weather_day_status_stddev_seconds timer",
- "application:weather_day_status_stddev_seconds",
- "# TYPE application:weather_day_status_seconds timer",
- "application:weather_day_status_seconds{quantile=\"0.5\"}",
- "# TYPE application:weather_day_status_seconds timer",
- "application:weather_day_status_seconds{quantile=\"0.75\"}",
- "# TYPE application:weather_day_status_seconds timer",
- "application:weather_day_status_seconds{quantile=\"0.95\"}",
- "# TYPE application:weather_day_status_seconds timer",
- "application:weather_day_status_seconds{quantile=\"0.98\"}",
- "# TYPE application:weather_day_status_seconds timer",
- "application:weather_day_status_seconds{quantile=\"0.99\"}",
- "# TYPE application:weather_day_status_seconds timer",
- "application:weather_day_status_seconds{quantile=\"0.999\"}"
+ "# TYPE application_weather_day_status_rate_per_second gauge",
+ "application_weather_day_status_rate_per_second",
+ "# TYPE application_weather_day_status_one_min_rate_per_second gauge",
+ "application_weather_day_status_one_min_rate_per_second",
+ "# TYPE application_weather_day_status_five_min_rate_per_second gauge",
+ "application_weather_day_status_five_min_rate_per_second",
+ "# TYPE application_weather_day_status_fifteen_min_rate_per_second gauge",
+ "application_weather_day_status_fifteen_min_rate_per_second",
+ "# TYPE application_weather_day_status_min_seconds gauge",
+ "application_weather_day_status_min_seconds",
+ "# TYPE application_weather_day_status_max_seconds gauge",
+ "application_weather_day_status_max_seconds",
+ "# TYPE application_weather_day_status_mean_seconds gauge",
+ "application_weather_day_status_mean_seconds",
+ "# TYPE application_weather_day_status_stddev_seconds gauge",
+ "application_weather_day_status_stddev_seconds",
+ "# HELP application_weather_day_status_seconds This metric shows the weather status of the day.",
+ "# TYPE application_weather_day_status_seconds summary",
+ "application_weather_day_status_seconds_count",
+ "application_weather_day_status_seconds_sum",
+ "application_weather_day_status_seconds{quantile=\"0.5\"}",
+ "application_weather_day_status_seconds{quantile=\"0.75\"}",
+ "application_weather_day_status_seconds{quantile=\"0.95\"}",
+ "application_weather_day_status_seconds{quantile=\"0.98\"}",
+ "application_weather_day_status_seconds{quantile=\"0.99\"}",
+ "application_weather_day_status_seconds{quantile=\"0.999\"}"
};
Stream.of(expected)