You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/28 12:52:24 UTC
[camel] 04/06: CAMEL-19645: producer based health checks is disabled by default.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch hc-producer-disabled
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 994025ad645120e1da97878969e57136a4d58651
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 28 12:01:50 2023 +0200
CAMEL-19645: producer based health checks is disabled by default.
---
.../aws/secretsmanager/SecretsManagerProducer.java | 2 +-
...thCheck.java => SecretsManagerProducerHealthCheck.java} | 6 +++---
...SecretsManagerProducerHealthCheckProfileCredsTest.java} | 13 +++++--------
... SecretsManagerProducerHealthCheckStaticCredsTest.java} | 14 +++++---------
.../camel/component/aws2/athena/Athena2Configuration.java | 6 ++++--
.../Athena2ProducerHealthCheckCustomProducerTest.java | 8 +++-----
.../athena/Athena2ProducerHealthCheckProfileCredsTest.java | 8 +++-----
.../athena/Athena2ProducerHealthCheckStaticCredsTest.java | 8 +++-----
.../aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../EventbridgeProducerHealthCheckProfileCredsTest.java | 3 +++
.../EventbridgeProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java | 9 +--------
.../kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java | 9 +--------
.../aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java | 4 ----
.../lambda/Lambda2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../lambda/Lambda2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java | 9 +--------
.../aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java | 9 +--------
.../aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java | 3 +++
.../aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java | 8 +-------
.../aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java | 8 +-------
.../aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java | 8 +-------
.../Translate2ProducerHealthCheckProfileCredsTest.java | 3 +++
.../Translate2ProducerHealthCheckStaticCredsTest.java | 3 +++
40 files changed, 106 insertions(+), 95 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
index e9f4d3b6f5f..cf39d79c958 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
@@ -421,7 +421,7 @@ public class SecretsManagerProducer extends DefaultProducer {
if (healthCheckRepository != null) {
String id = getEndpoint().getId();
- producerHealthCheck = new SecretsManagerClientHealthCheck(getEndpoint(), id);
+ producerHealthCheck = new SecretsManagerProducerHealthCheck(getEndpoint(), id);
producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled());
healthCheckRepository.addHealthCheck(producerHealthCheck);
}
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheck.java
similarity index 91%
rename from components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java
rename to components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheck.java
index 6af46c01262..e1ebd79e8af 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheck.java
@@ -27,12 +27,12 @@ import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
import software.amazon.awssdk.services.secretsmanager.model.ListSecretsRequest;
-public class SecretsManagerClientHealthCheck extends AbstractHealthCheck {
+public class SecretsManagerProducerHealthCheck extends AbstractHealthCheck {
private final SecretsManagerEndpoint secretsManagerEndpoint;
- public SecretsManagerClientHealthCheck(SecretsManagerEndpoint secretsManagerEndpoint, String clientId) {
- super("camel", "aws-secrets-manager-client-" + clientId);
+ public SecretsManagerProducerHealthCheck(SecretsManagerEndpoint secretsManagerEndpoint, String clientId) {
+ super("camel", "aws-secrets-manager-producer-" + clientId);
this.secretsManagerEndpoint = secretsManagerEndpoint;
}
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java
similarity index 89%
rename from components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java
rename to components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java
index e44f3887204..8c8989ca620 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java
@@ -26,17 +26,14 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
-public class SecretsManagerClientHealthCheckProfileCredsTest extends CamelTestSupport {
-
- private static final Logger LOG = LoggerFactory.getLogger(SecretsManagerClientHealthCheckProfileCredsTest.class);
+public class SecretsManagerProducerHealthCheckProfileCredsTest extends CamelTestSupport {
CamelContext context;
@@ -55,6 +52,8 @@ public class SecretsManagerClientHealthCheckProfileCredsTest extends CamelTestSu
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws-secrets-manager", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
@@ -83,9 +82,7 @@ public class SecretsManagerClientHealthCheckProfileCredsTest extends CamelTestSu
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAwsSecretsManagerHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("aws-secrets-manager-client"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("aws-secrets-manager-producer"));
boolean hasRegionMessage = res2.stream()
.anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
Assertions.assertTrue(down, "liveness check");
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java
similarity index 89%
rename from components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java
rename to components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java
index 95bf7117392..134a3a58a14 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java
@@ -26,17 +26,14 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
-public class SecretsManagerClientHealthCheckStaticCredsTest extends CamelTestSupport {
-
- private static final Logger LOG = LoggerFactory.getLogger(SecretsManagerClientHealthCheckStaticCredsTest.class);
+public class SecretsManagerProducerHealthCheckStaticCredsTest extends CamelTestSupport {
CamelContext context;
@@ -55,6 +52,8 @@ public class SecretsManagerClientHealthCheckStaticCredsTest extends CamelTestSup
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws-secrets-manager", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
@@ -73,7 +72,6 @@ public class SecretsManagerClientHealthCheckStaticCredsTest extends CamelTestSup
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
@@ -83,9 +81,7 @@ public class SecretsManagerClientHealthCheckStaticCredsTest extends CamelTestSup
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAwsSecManagerHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("aws-secrets-manager-client"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("aws-secrets-manager-producer"));
boolean hasRegionMessage = res2.stream()
.anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
Assertions.assertTrue(down, "liveness check");
diff --git a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Configuration.java b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Configuration.java
index 77f3154a36f..20b24df193e 100644
--- a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Configuration.java
+++ b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Configuration.java
@@ -46,7 +46,8 @@ public class Athena2Configuration implements Cloneable {
private String nextToken;
@UriParam(description = "Max number of results to return for the given operation (if supported by the Athena API endpoint). If not set, will use the Athena API default for the given operation.")
private Integer maxResults;
- @UriParam(label = "advanced", description = "Include useful trace information at the beginning of queries as an SQL comment (prefixed with --).")
+ @UriParam(label = "advanced",
+ description = "Include useful trace information at the beginning of queries as an SQL comment (prefixed with --).")
private boolean includeTrace;
@UriParam(description = "The location in Amazon S3 where query results are stored, such as s3://path/to/query/bucket/. Ensure this value ends with a forward slash.")
private String outputLocation;
@@ -62,7 +63,8 @@ public class Athena2Configuration implements Cloneable {
@UriParam(description = "The SQL query to run. Except for simple queries, prefer setting this as the body of the "
+ "Exchange or as a header using Athena2Constants.QUERY_STRING to avoid having to deal with URL encoding issues.")
private String queryString;
- @UriParam(label = "security", description = "The encryption type to use when storing query results in S3. One of SSE_S3, SSE_KMS, or CSE_KMS.")
+ @UriParam(label = "security",
+ description = "The encryption type to use when storing query results in S3. One of SSE_S3, SSE_KMS, or CSE_KMS.")
private EncryptionOption encryptionOption;
@UriParam(label = "security",
description = "For SSE-KMS and CSE-KMS, this is the KMS key ARN or ID.")
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java
index 6a5ee6916ea..2ede3be6aef 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java
@@ -26,18 +26,15 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
public class Athena2ProducerHealthCheckCustomProducerTest extends CamelTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(Athena2ProducerHealthCheckCustomProducerTest.class);
-
CamelContext context;
@Override
@@ -56,6 +53,8 @@ public class Athena2ProducerHealthCheckCustomProducerTest extends CamelTestSuppo
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-athena", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
@@ -74,7 +73,6 @@ public class Athena2ProducerHealthCheckCustomProducerTest extends CamelTestSuppo
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java
index 6fe1c1fe0f3..1b7304a8bfe 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java
@@ -26,18 +26,15 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
public class Athena2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(Athena2ProducerHealthCheckProfileCredsTest.class);
-
CamelContext context;
@Override
@@ -55,6 +52,8 @@ public class Athena2ProducerHealthCheckProfileCredsTest extends CamelTestSupport
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-athena", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
@@ -73,7 +72,6 @@ public class Athena2ProducerHealthCheckProfileCredsTest extends CamelTestSupport
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java
index 9aa90fe8740..aacaea69a8c 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java
@@ -26,18 +26,15 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
public class Athena2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(Athena2ProducerHealthCheckStaticCredsTest.class);
-
CamelContext context;
@Override
@@ -55,6 +52,8 @@ public class Athena2ProducerHealthCheckStaticCredsTest extends CamelTestSupport
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-athena", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
@@ -73,7 +72,6 @@ public class Athena2ProducerHealthCheckStaticCredsTest extends CamelTestSupport
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java
index 2ea3840dc38..33a639a47bf 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Ddb2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ddb", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java
index a60ea8356d6..fb7efac8678 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Ddb2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ddb", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java
index c6025211a45..4c31139cc80 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class AWS2EC2ProducerHealthCheckProfileCredsTest extends CamelTestSupport
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ec2", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java
index 3e99f442649..c7b2b07f31b 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class AWS2EC2ProducerHealthCheckStaticCredsTest extends CamelTestSupport
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ec2", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java
index e7c0df293e2..505b86c209b 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -55,6 +56,8 @@ public class ECS2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ecs", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java
index d8dcd13d56b..2632ceaf157 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -55,6 +56,8 @@ public class ECS2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ecs", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java
index b137373673c..2707ab203c4 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class EKS2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-eks", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java
index a1592744be9..55bfaa6d39d 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class EKS2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-eks", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java
index 6ef04ea30a4..3e8e5367e62 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class EventbridgeProducerHealthCheckProfileCredsTest extends CamelTestSup
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-eventbridge", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java
index 7e719e02f90..336cd46fd8e 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class EventbridgeProducerHealthCheckStaticCredsTest extends CamelTestSupp
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-eventbridge", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java
index 00aa814ff98..feb8e1568fd 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class IAM2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-iam", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java
index dba530007f5..1b22d0267fb 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class IAM2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-iam", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java
index d3dc6b41ae5..cb06b84035c 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class Kinesis2ConsumerHealthCheckProfileCredsIT extends CamelTestSupport
@RegisterExtension
public static AWSService service = AWSServiceFactory.createS3Service();
- private static final Logger LOG = LoggerFactory.getLogger(Kinesis2ConsumerHealthCheckProfileCredsIT.class);
-
CamelContext context;
@Override
@@ -82,7 +78,6 @@ public class Kinesis2ConsumerHealthCheckProfileCredsIT extends CamelTestSupport
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
@@ -92,9 +87,7 @@ public class Kinesis2ConsumerHealthCheckProfileCredsIT extends CamelTestSupport
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsKinesis2HealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsKinesis2HealthCheck, "aws2-kinesis check");
});
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java
index 0e253601e93..bf3ece9c172 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class Kinesis2ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createS3Service();
- private static final Logger LOG = LoggerFactory.getLogger(Kinesis2ConsumerHealthCheckStaticCredsIT.class);
-
CamelContext context;
@Override
@@ -83,7 +79,6 @@ public class Kinesis2ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
@@ -93,9 +88,7 @@ public class Kinesis2ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsKinesis2HealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsKinesis2HealthCheck, "aws2-kinesis check");
});
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
index fc915c18298..83ca0593fef 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
@@ -37,8 +37,6 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -50,8 +48,6 @@ public class Kinesis2ConsumerHealthCustomClientIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createS3Service();
- private static final Logger LOG = LoggerFactory.getLogger(Kinesis2ConsumerHealthCustomClientIT.class);
-
CamelContext context;
@Override
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java
index 71d0469958e..5479da24587 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Lambda2ProducerHealthCheckProfileCredsTest extends CamelTestSupport
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-lambda", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java
index 643060fc7b0..918afd0a620 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Lambda2ProducerHealthCheckStaticCredsTest extends CamelTestSupport
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-lambda", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java
index 81fc4a24a31..3a09e9a1bae 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class MQ2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-mq", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java
index b34d66686f1..5ef798a7827 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class MQ2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-mq", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java
index 4c916f59206..0004085a6cb 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class MSK2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-msk", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java
index 6e5b9b83666..f9478b6a6eb 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class MSK2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-msk", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java
index 7139608efb7..cfcd34ea3c2 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class AWS2S3ConsumerHealthCheckProfileCredsIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createS3Service();
- private static final Logger LOG = LoggerFactory.getLogger(AWS2S3ConsumerHealthCheckProfileCredsIT.class);
-
CamelContext context;
@Override
@@ -82,7 +78,6 @@ public class AWS2S3ConsumerHealthCheckProfileCredsIT extends CamelTestSupport {
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
@@ -92,9 +87,7 @@ public class AWS2S3ConsumerHealthCheckProfileCredsIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2S3HealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2S3HealthCheck, "aws2-s3 check");
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java
index c026da9bcc3..40cfc18fbef 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class AWS2S3ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createS3Service();
- private static final Logger LOG = LoggerFactory.getLogger(AWS2S3ConsumerHealthCheckStaticCredsIT.class);
-
CamelContext context;
@Override
@@ -83,7 +79,6 @@ public class AWS2S3ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
@Test
public void testConnectivity() {
-
Collection<HealthCheck.Result> res = HealthCheckHelper.invokeLiveness(context);
boolean up = res.stream().allMatch(r -> r.getState().equals(HealthCheck.State.UP));
Assertions.assertTrue(up, "liveness check");
@@ -93,9 +88,7 @@ public class AWS2S3ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2S3HealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2S3HealthCheck, "aws2-s3 check");
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java
index c8dcd536052..e32f1be4c07 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Ses2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ses", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java
index 25dee40304b..ca111c23f47 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class Ses2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-ses", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java
index 766387d5fe8..6ab5465572e 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class Sns2ProducerHealthCheckProfileCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-sns", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java
index d55d6c2d944..c1ddd0943f7 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +51,8 @@ public class Sns2ProducerHealthCheckStaticCredsTest extends CamelTestSupport {
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-sns", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java
index f29ffbae314..318ed76b9ae 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class Sqs2ConsumerHealthCheckIAMProfileCredsIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createSQSService();
- private static final Logger LOG = LoggerFactory.getLogger(Sqs2ConsumerHealthCheckProfileCredsIT.class);
-
CamelContext context;
@Override
@@ -93,9 +89,7 @@ public class Sqs2ConsumerHealthCheckIAMProfileCredsIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2SqsHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2SqsHealthCheck, "aws2-sqs check");
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java
index 2ccf855a0fa..411a7b6acfc 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class Sqs2ConsumerHealthCheckProfileCredsIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createSQSService();
- private static final Logger LOG = LoggerFactory.getLogger(Sqs2ConsumerHealthCheckProfileCredsIT.class);
-
CamelContext context;
@Override
@@ -93,9 +89,7 @@ public class Sqs2ConsumerHealthCheckProfileCredsIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2SqsHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2SqsHealthCheck, "aws2-sqs check");
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java
index a287c240591..2b52b49baea 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java
@@ -32,8 +32,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@@ -42,8 +40,6 @@ public class Sqs2ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
@RegisterExtension
public static AWSService service = AWSServiceFactory.createSQSService();
- private static final Logger LOG = LoggerFactory.getLogger(Sqs2ConsumerHealthCheckStaticCredsIT.class);
-
CamelContext context;
@Override
@@ -93,9 +89,7 @@ public class Sqs2ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2SqsHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
- .findAny()
- .isPresent();
+ .anyMatch(result -> result.getCheck().getId().startsWith("consumer:test-health-it"));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2SqsHealthCheck, "aws2-sqs check");
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java
index 4a31d642f5d..f7362af32f8 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Translate2ProducerHealthCheckProfileCredsTest extends CamelTestSupp
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-translate", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java
index 6fda42cc593..04e16f3b6e4 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.support.HealthCheckComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -51,6 +52,8 @@ public class Translate2ProducerHealthCheckStaticCredsTest extends CamelTestSuppo
hc = registry.resolveById("consumers");
registry.register(hc);
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
+ // enable producer health check
+ context.getComponent("aws2-translate", HealthCheckComponent.class).setHealthCheckProducerEnabled(true);
return context;
}