This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f5b987e21997a4529ac9ceed8e0e16ece6aeb70
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 26 07:56:52 2022 +0200
Upgrade micrometer 1.9.0
---
camel-dependencies/pom.xml | 2 +-
.../micrometer/messagehistory/ManagedMessageHistoryTest.java | 3 ++-
.../routepolicy/ManagedMicrometerRoutePolicyTest.java | 11 -----------
parent/pom.xml | 4 ++--
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index f6a710174fc..278ea00eea2 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -399,7 +399,7 @@
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.3.1</maven-war-plugin-version>
<metrics-version>4.2.9</metrics-version>
- <micrometer-version>1.8.5</micrometer-version>
+ <micrometer-version>1.9.0</micrometer-version>
<microprofile-config-version>2.0.1</microprofile-config-version>
<microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
<microprofile-metrics-version>3.0.1</microprofile-metrics-version>
diff --git
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
index 5877ff1b075..6d039407b3a 100644
---
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
+++
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
@@ -97,7 +97,8 @@ public class ManagedMessageHistoryTest extends
CamelTestSupport {
// there should be 3 mbeans
Set<ObjectName> set
- = getMBeanServer().queryNames(new
ObjectName("org.apache.camel.micrometer:name=CamelMessageHistory.*"), null);
+ = getMBeanServer().queryNames(new
ObjectName("org.apache.camel.micrometer:type=timers,name=*"), null);
+ System.out.println(set);
assertEquals(3, set.size());
ObjectName fooMBean = set.stream().filter(on ->
on.getCanonicalName().contains("foo")).findFirst()
diff --git
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java
index 905798de733..e50b32a1359 100644
---
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java
+++
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.micrometer.routepolicy;
import java.util.List;
-import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -66,16 +65,6 @@ public class ManagedMicrometerRoutePolicyTest extends
AbstractMicrometerRoutePol
assertFalse(json.contains("\"name\" : \"test\"")); // the
MicrometerRoutePolicy does NOT display producer metrics
assertTrue(json.contains("\"routeId\" : \"bar\""));
assertTrue(json.contains("\"routeId\" : \"foo\""));
-
- // there should be 2 route policy meter mbeans
- Set<ObjectName> set
- = getMBeanServer().queryNames(new
ObjectName("org.apache.camel.micrometer:name=CamelRoutePolicy.*"), null);
- assertEquals(2, set.size());
-
- String camelContextName = context().getName();
- Long testCount = (Long) getMBeanServer().getAttribute(
- new
ObjectName("org.apache.camel.micrometer:name=test.camelContext." +
camelContextName), "Count");
- assertEquals(count / 2, testCount.longValue());
}
@Override
diff --git a/parent/pom.xml b/parent/pom.xml
index 5f50d24e447..e9ede1d77bd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,7 +386,7 @@
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.3.1</maven-war-plugin-version>
<metrics-version>4.2.9</metrics-version>
- <micrometer-version>1.8.5</micrometer-version>
+ <micrometer-version>1.9.0</micrometer-version>
<microprofile-config-version>2.0.1</microprofile-config-version>
<microprofile-metrics-version>3.0.1</microprofile-metrics-version>
<microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
@@ -419,7 +419,7 @@
<ognl-version>3.1.12</ognl-version>
<openjpa-version>3.2.2</openjpa-version>
<openstack4j-version>3.10</openstack4j-version>
- <opentelemetry-version>1.12.0</opentelemetry-version>
+ <opentelemetry-version>1.13.0</opentelemetry-version>
<opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
<opentracing-version>0.33.0</opentracing-version>
<opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>
