You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2019/10/23 07:16:08 UTC
[camel] 02/02: Upgrade SmallRye Metrics to 2.2.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fa24b105c3d8ce933838350f6e84fd599ccb0f86
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Oct 18 14:02:25 2019 +0100
Upgrade SmallRye Metrics to 2.2.0
---
components/camel-microprofile-metrics/pom.xml | 17 ++++++++++++++++-
.../metrics/MicroProfileMetricsTestSupport.java | 3 ++-
...rofileMetricsExceptionInRouteMessageHistoryTest.java | 3 ++-
.../history/MicroProfileMetricsMessageHistoryTest.java | 3 ++-
parent/pom.xml | 2 +-
5 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/components/camel-microprofile-metrics/pom.xml b/components/camel-microprofile-metrics/pom.xml
index fcb2217..5dcc97a 100644
--- a/components/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile-metrics/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-metrics-2.0</artifactId>
+ <artifactId>smallrye-metrics</artifactId>
<version>${smallrye-metrics-version}</version>
<scope>test</scope>
</dependency>
@@ -65,6 +65,21 @@
<version>${smallrye-config-version}</version>
<scope>test</scope>
</dependency>
+
+ <!-- JSON support for smallrye-metrics -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>${geronimo-json-spec-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>${johnzon-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java
index 4274d52..4fcf703 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java
@@ -39,6 +39,7 @@ import org.eclipse.microprofile.metrics.MetricRegistry;
import org.eclipse.microprofile.metrics.Tag;
import org.eclipse.microprofile.metrics.Timer;
import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsHelper.findMetric;
+import static org.eclipse.microprofile.metrics.MetricRegistry.Type;
public class MicroProfileMetricsTestSupport extends CamelTestSupport {
@@ -117,6 +118,6 @@ public class MicroProfileMetricsTestSupport extends CamelTestSupport {
}
protected void dumpMetrics() {
- System.out.println(new JsonExporter().exportAllScopes());
+ System.out.println(new JsonExporter().exportOneScope(Type.APPLICATION));
}
}
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java
index 6f9cd6e..16d3d51 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport;
import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry.Type;
import org.eclipse.microprofile.metrics.Timer;
import org.junit.Test;
@@ -53,7 +54,7 @@ public class MicroProfileMetricsExceptionInRouteMessageHistoryTest extends Micro
assertNotNull(service);
JsonExporter exporter = new JsonExporter();
- String json = exporter.exportAllScopes().toString();
+ String json = exporter.exportOneScope(Type.APPLICATION).toString();
assertNotNull(json);
assertTrue(json.contains("nodeId=foo"));
assertTrue(json.contains("nodeId=bar"));
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java
index a2660de..69690d7 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java
@@ -27,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsHelper;
import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport;
import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry.Type;
import org.eclipse.microprofile.metrics.Tag;
import org.eclipse.microprofile.metrics.Timer;
import org.junit.Test;
@@ -72,7 +73,7 @@ public class MicroProfileMetricsMessageHistoryTest extends MicroProfileMetricsTe
assertNotNull(service);
JsonExporter exporter = new JsonExporter();
- String json = exporter.exportAllScopes().toString();
+ String json = exporter.exportOneScope(Type.APPLICATION).toString();
assertNotNull(json);
assertTrue(json.contains("nodeId=foo"));
assertTrue(json.contains("nodeId=bar"));
diff --git a/parent/pom.xml b/parent/pom.xml
index 58211e5..2b042d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -569,7 +569,7 @@
<slf4j-version>1.7.28</slf4j-version>
<smack-version>4.3.4</smack-version>
<smallrye-config-version>1.0.0</smallrye-config-version>
- <smallrye-metrics-version>1.1.0</smallrye-metrics-version>
+ <smallrye-metrics-version>2.2.0</smallrye-metrics-version>
<smallrye-health-version>2.0.0</smallrye-health-version>
<snakeyaml-version>1.25</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>