feat(e2e): Update prometheus e2e test

apache · Mar 31, 2023 · cbfc190 · cbfc190
1 parent 413b4d8
commit cbfc190
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git 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 void configure() {
             .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
@@ -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
@@ -19,15 +19,11 @@
 
 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 @@
 @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) {