fix [camel-quarkus-examples] HealthTest failure on camel-quarkus-main… (#37)
* fix [camel-quarkus-examples] HealthTest failure on camel-quarkus-main branch #2711
(cherry picked from commit 4308acbf1aabedc5a416ed505abde7ca6cd53955)
* Upgrade to Quarkus 2.0.0.CR2
* fix up observability example #2711
Co-authored-by: Peter Palaga <ppalaga@redhat.com>
diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml
index fed8547..a77f93f 100644
--- a/file-bindy-ftp/pom.xml
+++ b/file-bindy-ftp/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml
index e914b6f..07c19eb 100644
--- a/file-split-log-xml/pom.xml
+++ b/file-split-log-xml/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/health/pom.xml b/health/pom.xml
index eefbbde..99ee0bc 100644
--- a/health/pom.xml
+++ b/health/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/health/src/test/java/org/acme/health/HealthTest.java b/health/src/test/java/org/acme/health/HealthTest.java
index c12c1e0..81f6b53 100644
--- a/health/src/test/java/org/acme/health/HealthTest.java
+++ b/health/src/test/java/org/acme/health/HealthTest.java
@@ -32,9 +32,9 @@
.then()
.statusCode(200)
.body("status", is("UP"),
- "checks.status", containsInAnyOrder("UP", "UP", "UP"),
+ "checks.status", containsInAnyOrder("UP", "UP"),
"checks.name",
- containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks", "camel-context-check"),
- "checks.data.contextStatus", containsInAnyOrder(null, null, "Started"));
+ containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks"),
+ "checks.data.context", containsInAnyOrder(null, "UP"));
}
}
diff --git a/http-log/pom.xml b/http-log/pom.xml
index e3db123..5300100 100644
--- a/http-log/pom.xml
+++ b/http-log/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/observability/README.adoc b/observability/README.adoc
index f268d99..4fc3f5b 100644
--- a/observability/README.adoc
+++ b/observability/README.adoc
@@ -28,14 +28,14 @@
[source,shell]
----
-$ curl localhost:8080/metrics/application
+$ curl localhost:8080/q/metrics/application
----
To pick out specific metrics you can either use `grep` or the `https://stedolan.github.io/jq/[jq]` library :
[source,shell]
----
-$ curl -s -H"Accept: application/json" localhost:8080/metrics/application \
+$ curl -s -H"Accept: application/json" localhost:8080/q/metrics/application \
| jq '.["camel.context.exchanges.completed.total;camelContext=camel-quarkus-observability"]'
----
@@ -45,12 +45,12 @@
[source,shell]
----
-$ curl -s localhost:8080/health/live
+$ curl -s localhost:8080/q/health/live
----
[source,shell]
----
-$ curl -s localhost:8080/health/ready
+$ curl -s localhost:8080/q/health/ready
----
The JSON output will contain a checks for verifying whether the `CamelContext` and each individual route is in the 'Started' state.
diff --git a/observability/pom.xml b/observability/pom.xml
index a5fa7fb..ab265d4 100644
--- a/observability/pom.xml
+++ b/observability/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/observability/src/test/java/org/acme/observability/ObservabilityTest.java b/observability/src/test/java/org/acme/observability/ObservabilityTest.java
index c146afc..b120c1a 100644
--- a/observability/src/test/java/org/acme/observability/ObservabilityTest.java
+++ b/observability/src/test/java/org/acme/observability/ObservabilityTest.java
@@ -34,7 +34,7 @@
// Verify a expected Camel metric is available
given()
.when().accept(ContentType.JSON)
- .get("/metrics/application")
+ .get("/q/metrics/application")
.then()
.statusCode(200)
.body(
@@ -46,7 +46,7 @@
// Verify liveness
given()
.when().accept(ContentType.JSON)
- .get("/health/live")
+ .get("/q/health/live")
.then()
.statusCode(200)
.body("status", Matchers.is("UP"),
@@ -56,12 +56,12 @@
// Verify readiness
given()
.when().accept(ContentType.JSON)
- .get("/health/ready")
+ .get("/q/health/ready")
.then()
.statusCode(200)
.body("status", Matchers.is("UP"),
"checks.name",
hasItems("camel-readiness-checks", "Uptime readiness check"),
- "checks.data.custom-readiness-check", containsInAnyOrder(null, "UP"));
+ "checks.data.custom-readiness-check", containsInAnyOrder("UP"));
}
}
diff --git a/rest-json/pom.xml b/rest-json/pom.xml
index d28336e..2fe3d1a 100644
--- a/rest-json/pom.xml
+++ b/rest-json/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/timer-log-cdi/pom.xml b/timer-log-cdi/pom.xml
index 8a86b3d..622fb07 100644
--- a/timer-log-cdi/pom.xml
+++ b/timer-log-cdi/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/timer-log-kotlin/pom.xml b/timer-log-kotlin/pom.xml
index d12611d..13a4e85 100644
--- a/timer-log-kotlin/pom.xml
+++ b/timer-log-kotlin/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<kotlin.version>1.4.32</kotlin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/timer-log-main/pom.xml b/timer-log-main/pom.xml
index bc3fc48..033cc02 100644
--- a/timer-log-main/pom.xml
+++ b/timer-log-main/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/timer-log-spring/pom.xml b/timer-log-spring/pom.xml
index 96d140a..092210e 100644
--- a/timer-log-spring/pom.xml
+++ b/timer-log-spring/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/timer-log-xml/pom.xml b/timer-log-xml/pom.xml
index a41abb8..f5836e9 100644
--- a/timer-log-xml/pom.xml
+++ b/timer-log-xml/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/timer-log/pom.xml b/timer-log/pom.xml
index 8c4653d..3c757f3 100644
--- a/timer-log/pom.xml
+++ b/timer-log/pom.xml
@@ -29,7 +29,7 @@
<properties>
<camel-quarkus.version>2.0.0</camel-quarkus.version>
- <quarkus.version>2.0.0.Alpha3</quarkus.version>
+ <quarkus.version>2.0.0.CR2</quarkus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
