This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 924cd95f248c2f3db1b3d96d8176ec022a799b22
Author: Gaelle Fournier <gaelle.fournier.w...@gmail.com>
AuthorDate: Fri Mar 31 16:21:42 2023 +0200
feat(e2e): Update prometheus e2e test
---
e2e/common/traits/prometheus_test.go | 2 +-
e2e/yaks/openshift/monitoring/Metrics.java | 16 ++++++++--------
e2e/yaks/openshift/monitoring/app/pom.xml | 6 +++++-
.../main/java/org/apache/camel/integration/Service.java | 10 +++-------
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/e2e/common/traits/prometheus_test.go
b/e2e/common/traits/prometheus_test.go
index 26a80ba86..d01e61629 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -62,7 +62,7 @@ func TestPrometheusTrait(t *testing.T) {
if err != nil {
assert.Fail(t, err.Error())
}
- assert.Contains(t, string(response),
"camel.route.exchanges.total")
+ assert.Contains(t, string(response),
"CamelExchangesTotal_total")
})
if ocp && createPodMonitor {
diff --git a/e2e/yaks/openshift/monitoring/Metrics.java
b/e2e/yaks/openshift/monitoring/Metrics.java
index 38c423f52..ccd608730 100644
--- a/e2e/yaks/openshift/monitoring/Metrics.java
+++ b/e2e/yaks/openshift/monitoring/Metrics.java
@@ -20,7 +20,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
-import
org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants;
+import org.apache.camel.component.micrometer.MicrometerConstants;
import javax.enterprise.context.ApplicationScoped;
@@ -51,27 +51,27 @@ public class Metrics extends RouteBuilder {
.logStackTrace(false)
.logExhausted(false)
.log(LoggingLevel.ERROR, "Failed processing ${body}")
-
.to("microprofile-metrics:meter:camel-k-example-metrics-redelivery?mark=2")
+
.to("micrometer:counter:camel-k-example-metrics-redelivery?increment=2")
// The 'error' meter
- .to("microprofile-metrics:meter:camel-k-example-metrics-error");
+ .to("micrometer:counter:camel-k-example-metrics-error");
from("timer:stream?period=1000")
.routeId("unreliable-service")
.setBody(header(Exchange.TIMER_COUNTER).prepend("event #"))
.log("Processing ${body}...")
// The 'generated' meter
- .to("microprofile-metrics:meter:camel-k-example-metrics-generated")
+ .to("micrometer:counter:camel-k-example-metrics-generated")
// TODO: replace with lookup by type as soon as CAMEL-15217 gets
fixed
- // The 'attempt' meter via @Metered interceptor
+ // The 'attempt' meter via @Counted interceptor
.bean("service")
.filter(header(Exchange.REDELIVERED))
.log(LoggingLevel.WARN, "Processed ${body} after
${header.CamelRedeliveryCounter} retries")
- .setHeader(MicroProfileMetricsConstants.HEADER_METER_MARK,
header(Exchange.REDELIVERY_COUNTER))
+ .setHeader(MicrometerConstants.HEADER_COUNTER_INCREMENT,
header(Exchange.REDELIVERY_COUNTER))
// The 'redelivery' meter
-
.to("microprofile-metrics:meter:camel-k-example-metrics-redelivery")
+ .to("micrometer:counter:camel-k-example-metrics-redelivery")
.end()
.log("Successfully processed ${body}")
// The 'success' meter
- .to("microprofile-metrics:meter:camel-k-example-metrics-success");
+ .to("micrometer:counter:camel-k-example-metrics-success");
}
}
diff --git a/e2e/yaks/openshift/monitoring/app/pom.xml
b/e2e/yaks/openshift/monitoring/app/pom.xml
index c515105e2..030c4d70f 100644
--- a/e2e/yaks/openshift/monitoring/app/pom.xml
+++ b/e2e/yaks/openshift/monitoring/app/pom.xml
@@ -31,9 +31,13 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-microprofile-metrics</artifactId>
+ <artifactId>camel-quarkus-micrometer</artifactId>
<version>${version.camel.quarkus}</version>
</dependency>
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/e2e/yaks/openshift/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
b/e2e/yaks/openshift/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
index ce7f798db..655b2f7e1 100644
---
a/e2e/yaks/openshift/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
+++
b/e2e/yaks/openshift/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
@@ -19,15 +19,11 @@ package org.apache.camel.integration;
import java.util.Random;
+import io.micrometer.core.annotation.Counted;
+
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeExchangeException;
-import org.eclipse.microprofile.metrics.Gauge;
-import org.eclipse.microprofile.metrics.Meter;
-
-import org.eclipse.microprofile.metrics.annotation.Metered;
-import org.eclipse.microprofile.metrics.annotation.Metric;
-
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
@@ -39,7 +35,7 @@ import javax.inject.Named;
@io.quarkus.arc.Unremovable
public class Service {
- @Metered(name = "camel-k-example-metrics-attempt", absolute = true)
+ @Counted(value = "camel-k-example-metrics-attempt")
public void attempt(Exchange exchange) {
Random rand = new Random();
if (rand.nextDouble() < 0.5) {
