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/27 12:54:46 UTC
[camel] branch main updated: CAMEL-19491: aws2-sqs - use `ScheduledPollConsumerHealthCheck` (#10847)
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
The following commit(s) were added to refs/heads/main by this push:
new 06cd2016a59 CAMEL-19491: aws2-sqs - use `ScheduledPollConsumerHealthCheck` (#10847)
06cd2016a59 is described below
commit 06cd2016a59f3d0c0c41d4700ec229c5a16aad1b
Author: Simon Oxenvad Rasmussen <sr...@viabill.com>
AuthorDate: Thu Jul 27 14:54:40 2023 +0200
CAMEL-19491: aws2-sqs - use `ScheduledPollConsumerHealthCheck` (#10847)
* CAMEL-19491: aws2-sqs - use `ScheduledPollConsumerHealthCheck`
The SQS consumer is a polling consumer, and thus we can use
`ScheduledPollConsumerHealthCheck` where we observe the last poll rather
than making a new operation against SQS. Previously `listQueues` was
called, which is a different API than what the consumer actually uses
(`receiveMessage`).
The `Sqs2ConsumerHealthCheck` used to check if configured region existed
in the metadata of the client. That logic was copied over from the old
`Sqs2ComponentVerifierExtension`. It is removed from this implementation
as the call to `poll` will yield in the same outcome in case an
incorrect Region is defined in the configuration. In this case, a failed
poll, causing the health check to be DOWN.
* CAMEL-19491: aws2-ddb - use ScheduledPollConsumerHealthCheck
* CAMEL-19491: aws2-cloudtrail - use ScheduledPollConsumerHealthCheck
* CAMEL-19491: aws2-s3 - use ScheduledPollConsumerHealthCheck
* CAMEL-19491: aws2-kinesis - use `ScheduledPollConsumerHealthCheck`
---
.../aws/cloudtrail/CloudtrailConsumer.java | 21 ------
.../cloudtrail/CloudtrailConsumerHealthCheck.java | 74 ---------------------
.../component/aws2/ddb/Ddb2ClientHealthCheck.java | 70 --------------------
.../camel/component/aws2/ddb/Ddb2Endpoint.java | 14 ----
.../ddb/Ddb2ClientHealthCheckProfileCredsTest.java | 8 +--
.../ddb/Ddb2ClientHealthCheckStaticCredsTest.java | 8 +--
.../component/aws2/kinesis/Kinesis2Consumer.java | 17 -----
.../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 73 ---------------------
.../Kinesis2ConsumerHealthCheckProfileCredsIT.java | 5 +-
.../Kinesis2ConsumerHealthCheckStaticCredsIT.java | 9 +--
.../Kinesis2ConsumerHealthCustomClientIT.java | 6 +-
.../camel/component/aws2/s3/AWS2S3Consumer.java | 20 ------
.../aws2/s3/AWS2S3ConsumerHealthCheck.java | 75 ----------------------
.../AWS2S3ConsumerHealthCheckProfileCredsIT.java | 6 +-
.../s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java | 6 +-
.../camel/component/aws2/sqs/Sqs2Consumer.java | 15 -----
.../aws2/sqs/Sqs2ConsumerHealthCheck.java | 74 ---------------------
.../Sqs2ConsumerHealthCheckIAMProfileCredsIT.java | 6 +-
.../sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java | 6 +-
.../sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java | 6 +-
20 files changed, 21 insertions(+), 498 deletions(-)
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
index 0fdc6e18758..16e5933252a 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
+++ b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
@@ -26,8 +26,6 @@ import java.util.Queue;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.health.HealthCheckHelper;
-import org.apache.camel.health.WritableHealthCheckRepository;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
@@ -41,9 +39,6 @@ import software.amazon.awssdk.services.cloudtrail.model.LookupEventsResponse;
public class CloudtrailConsumer extends ScheduledBatchPollingConsumer {
private static Instant lastTime;
- private WritableHealthCheckRepository healthCheckRepository;
- private CloudtrailConsumerHealthCheck consumerHealthCheck;
-
public CloudtrailConsumer(CloudtrailEndpoint endpoint, Processor processor) {
super(endpoint, processor);
}
@@ -51,18 +46,6 @@ public class CloudtrailConsumer extends ScheduledBatchPollingConsumer {
@Override
protected void doStart() throws Exception {
super.doStart();
-
- healthCheckRepository = HealthCheckHelper.getHealthCheckRepository(
- getEndpoint().getCamelContext(),
- "components",
- WritableHealthCheckRepository.class);
-
- if (healthCheckRepository != null) {
- consumerHealthCheck = new CloudtrailConsumerHealthCheck(this, getRouteId());
- consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
- && getEndpoint().getComponent().isHealthCheckConsumerEnabled());
- healthCheckRepository.addHealthCheck(consumerHealthCheck);
- }
}
@Override
@@ -109,10 +92,6 @@ public class CloudtrailConsumer extends ScheduledBatchPollingConsumer {
@Override
protected void doStop() throws Exception {
- if (healthCheckRepository != null && consumerHealthCheck != null) {
- healthCheckRepository.removeHealthCheck(consumerHealthCheck);
- consumerHealthCheck = null;
- }
super.doStop();
}
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java
deleted file mode 100644
index f9983cb7966..00000000000
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.cloudtrail;
-
-import java.util.Map;
-
-import org.apache.camel.health.HealthCheckResultBuilder;
-import org.apache.camel.impl.health.AbstractHealthCheck;
-import org.apache.camel.util.ObjectHelper;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.cloudtrail.CloudTrailClient;
-import software.amazon.awssdk.services.cloudtrail.model.ListChannelsRequest;
-
-public class CloudtrailConsumerHealthCheck extends AbstractHealthCheck {
-
- private final CloudtrailConsumer cloudtrailConsumer;
-
- public CloudtrailConsumerHealthCheck(CloudtrailConsumer cloudtrailConsumer, String routeId) {
- super("camel", "aws-cloudtrail-consumer-" + routeId);
- this.cloudtrailConsumer = cloudtrailConsumer;
- }
-
- @Override
- protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
-
- CloudtrailConfiguration configuration = cloudtrailConsumer.getEndpoint().getConfiguration();
- try {
- if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
- if (!CloudTrailClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
- builder.message("The service is not supported in this region");
- builder.down();
- return;
- }
- }
- CloudTrailClient client = cloudtrailConsumer.getEndpoint().getClient();
- client.listChannels(ListChannelsRequest.builder().maxResults(1).build());
- } catch (AwsServiceException e) {
- builder.message(e.getMessage());
- builder.error(e);
- if (ObjectHelper.isNotEmpty(e.statusCode())) {
- builder.detail(SERVICE_STATUS_CODE, e.statusCode());
- }
- if (ObjectHelper.isNotEmpty(e.awsErrorDetails().errorCode())) {
- builder.detail(SERVICE_ERROR_CODE, e.awsErrorDetails().errorCode());
- }
- builder.down();
- return;
-
- } catch (Exception e) {
- builder.error(e);
- builder.down();
- return;
- }
-
- builder.up();
-
- }
-
-}
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java
deleted file mode 100644
index c66530c1dfd..00000000000
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.component.aws2.ddb;
-
-import java.util.Map;
-
-import org.apache.camel.health.HealthCheckResultBuilder;
-import org.apache.camel.impl.health.AbstractHealthCheck;
-import org.apache.camel.util.ObjectHelper;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
-
-public class Ddb2ClientHealthCheck extends AbstractHealthCheck {
-
- private final Ddb2Endpoint ddb2Endpoint;
-
- public Ddb2ClientHealthCheck(Ddb2Endpoint ddb2Endpoint, String clientId) {
- super("camel", "aws2-ddb-client-" + clientId);
- this.ddb2Endpoint = ddb2Endpoint;
- }
-
- @Override
- protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
- Ddb2Configuration configuration = ddb2Endpoint.getConfiguration();
- if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
- if (!DynamoDbClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
- builder.message("The service is not supported in this region");
- builder.down();
- return;
- }
- }
- try {
- DynamoDbClient ddbClient = ddb2Endpoint.getDdbClient();
- ddbClient.listTables(ListTablesRequest.builder().limit(1).build());
- } catch (AwsServiceException e) {
- builder.message(e.getMessage());
- builder.error(e);
- if (ObjectHelper.isNotEmpty(e.statusCode())) {
- builder.detail(SERVICE_STATUS_CODE, e.statusCode());
- }
- if (ObjectHelper.isNotEmpty(e.awsErrorDetails().errorCode())) {
- builder.detail(SERVICE_ERROR_CODE, e.awsErrorDetails().errorCode());
- }
- builder.down();
- return;
- } catch (Exception e) {
- builder.error(e);
- builder.down();
- return;
- }
- builder.up();
- }
-}
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
index e823d81a41d..9bac3d87e64 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
@@ -25,8 +25,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.aws2.ddb.client.Ddb2ClientFactory;
-import org.apache.camel.health.HealthCheckHelper;
-import org.apache.camel.impl.health.ComponentsHealthCheckRepository;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ScheduledPollEndpoint;
@@ -58,9 +56,6 @@ public class Ddb2Endpoint extends ScheduledPollEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(Ddb2Endpoint.class);
- private ComponentsHealthCheckRepository healthCheckRepository;
- private Ddb2ClientHealthCheck clientHealthCheck;
-
@UriParam
private Ddb2Configuration configuration;
@@ -85,15 +80,6 @@ public class Ddb2Endpoint extends ScheduledPollEndpoint {
public void doStart() throws Exception {
super.doStart();
- healthCheckRepository = HealthCheckHelper.getHealthCheckRepository(getCamelContext(),
- ComponentsHealthCheckRepository.REPOSITORY_ID, ComponentsHealthCheckRepository.class);
-
- if (healthCheckRepository != null) {
- // Do not register the health check until we resolve CAMEL-18992
- //clientHealthCheck = new Ddb2ClientHealthCheck(this, getId());
- //healthCheckRepository.addHealthCheck(clientHealthCheck);
- }
-
ddbClient = configuration.getAmazonDDBClient() != null
? configuration.getAmazonDDBClient() : Ddb2ClientFactory.getDynamoDBClient(configuration).getDynamoDBClient();
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
index cb82b752058..124f97ccce8 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
@@ -66,7 +66,7 @@ public class Ddb2ClientHealthCheckProfileCredsTest extends CamelTestSupport {
@Override
public void configure() {
- from("direct:listTables")
+ from("direct:listTables").routeId("ddb-route")
.to("aws2-ddb://test?region=l&useDefaultCredentialsProvider=true&enabledInitialDescribeTable=false");
}
};
@@ -85,14 +85,12 @@ public class Ddb2ClientHealthCheckProfileCredsTest extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2DdbHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("aws2-ddb-client"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:ddb-route"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2DdbHealthCheck, "aws2-ddb check");
- Assertions.assertTrue(hasRegionMessage, "aws2-ddb check error message");
});
}
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
index 672c07f1ea0..2751854e6b5 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
@@ -66,7 +66,7 @@ public class Ddb2ClientHealthCheckStaticCredsTest extends CamelTestSupport {
@Override
public void configure() {
- from("direct:listClusters")
+ from("direct:listClusters").routeId("ddb-route")
.to("aws2-ddb://test?region=l&secretKey=l&accessKey=k&enabledInitialDescribeTable=false");
}
};
@@ -85,14 +85,12 @@ public class Ddb2ClientHealthCheckStaticCredsTest extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
boolean containsAws2DdbHealthCheck = res2.stream()
- .filter(result -> result.getCheck().getId().startsWith("aws2-ddb-client"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:ddb-route"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2DdbHealthCheck, "aws2-ddb check");
- Assertions.assertTrue(hasRegionMessage, "aws2-ddb check error message");
});
}
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
index 6a80c3dceb0..6aef226e5ed 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
@@ -26,8 +26,6 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.aws2.kinesis.consumer.KinesisResumeAdapter;
-import org.apache.camel.health.HealthCheckHelper;
-import org.apache.camel.health.WritableHealthCheckRepository;
import org.apache.camel.resume.ResumeAware;
import org.apache.camel.resume.ResumeStrategy;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
@@ -53,9 +51,6 @@ public class Kinesis2Consumer extends ScheduledBatchPollingConsumer implements R
private boolean isShardClosed;
private ResumeStrategy resumeStrategy;
- private WritableHealthCheckRepository healthCheckRepository;
- private Kinesis2ConsumerHealthCheck consumerHealthCheck;
-
public Kinesis2Consumer(Kinesis2Endpoint endpoint, Processor processor) {
super(endpoint, processor);
}
@@ -294,18 +289,6 @@ public class Kinesis2Consumer extends ScheduledBatchPollingConsumer implements R
protected void doStart() throws Exception {
super.doStart();
- healthCheckRepository = HealthCheckHelper.getHealthCheckRepository(
- getEndpoint().getCamelContext(),
- "components",
- WritableHealthCheckRepository.class);
-
- if (healthCheckRepository != null) {
- consumerHealthCheck = new Kinesis2ConsumerHealthCheck(this, getRouteId());
- consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
- && getEndpoint().getComponent().isHealthCheckConsumerEnabled());
- healthCheckRepository.addHealthCheck(consumerHealthCheck);
- }
-
if (resumeStrategy != null) {
resumeStrategy.loadCache();
}
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
deleted file mode 100644
index c2f53ebcfd4..00000000000
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws2.kinesis;
-
-import java.util.Map;
-
-import org.apache.camel.health.HealthCheckResultBuilder;
-import org.apache.camel.impl.health.AbstractHealthCheck;
-import org.apache.camel.util.ObjectHelper;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.kinesis.KinesisClient;
-
-public class Kinesis2ConsumerHealthCheck extends AbstractHealthCheck {
-
- private final Kinesis2Consumer kinesis2Consumer;
-
- public Kinesis2ConsumerHealthCheck(Kinesis2Consumer kinesis2Consumer, String routeId) {
- super("camel", "aws2-kinesis-consumer-" + routeId);
- this.kinesis2Consumer = kinesis2Consumer;
- }
-
- @Override
- protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
-
- try {
- Kinesis2Configuration configuration = kinesis2Consumer.getConfiguration();
- if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
- if (!KinesisClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
- builder.message("The service is not supported in this region");
- builder.down();
- return;
- }
- }
- KinesisClient client = kinesis2Consumer.getEndpoint().getClient();
- client.listStreams();
- } catch (AwsServiceException e) {
- builder.message(e.getMessage());
- builder.error(e);
- if (ObjectHelper.isNotEmpty(e.statusCode())) {
- builder.detail(SERVICE_STATUS_CODE, e.statusCode());
- }
- if (ObjectHelper.isNotEmpty(e.awsErrorDetails().errorCode())) {
- builder.detail(SERVICE_ERROR_CODE, e.awsErrorDetails().errorCode());
- }
- builder.down();
- return;
-
- } catch (Exception e) {
- builder.error(e);
- builder.down();
- return;
- }
-
- builder.up();
-
- }
-
-}
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 dc12b571cde..d3dc6b41ae5 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
@@ -92,14 +92,11 @@ 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("aws2-kinesis-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsKinesis2HealthCheck, "aws2-kinesis check");
- Assertions.assertTrue(hasRegionMessage, "aws2-kinesis check error message");
});
}
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 2dfbbccfcb9..0e253601e93 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
@@ -75,8 +75,8 @@ public class Kinesis2ConsumerHealthCheckStaticCredsIT extends CamelTestSupport {
@Override
public void configure() {
- from("aws2-kinesis://stream?region=l&secretKey=l&accessKey=k")
- .startupOrder(2).log("${body}").routeId("test-health-it");
+ from("aws2-kinesis://stream?region=l&secretKey=l&accessKey=k").startupOrder(2).log("${body}")
+ .routeId("test-health-it");
}
};
}
@@ -93,14 +93,11 @@ 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("aws2-kinesis-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsKinesis2HealthCheck, "aws2-kinesis check");
- Assertions.assertTrue(hasRegionMessage, "aws2-kinesis check error message");
});
}
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 14416766d91..fc915c18298 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
@@ -82,8 +82,7 @@ public class Kinesis2ConsumerHealthCustomClientIT extends CamelTestSupport {
@Override
public void configure() {
- from("aws2-kinesis://stream")
- .startupOrder(2).log("${body}").routeId("test-health-it");
+ from("aws2-kinesis://stream").startupOrder(2).log("${body}").routeId("test-health-it");
}
};
}
@@ -104,10 +103,7 @@ public class Kinesis2ConsumerHealthCustomClientIT extends CamelTestSupport {
Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context);
boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN));
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
Assertions.assertTrue(down, "liveness check");
- Assertions.assertFalse(hasRegionMessage, "aws2-kinesis check error message");
});
}
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
index 7b4a991bf62..f456f6545b8 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
@@ -31,8 +31,6 @@ import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.health.HealthCheckHelper;
-import org.apache.camel.health.WritableHealthCheckRepository;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.support.SynchronizationAdapter;
@@ -70,8 +68,6 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
private String marker;
private transient String s3ConsumerToString;
- private WritableHealthCheckRepository healthCheckRepository;
- private AWS2S3ConsumerHealthCheck consumerHealthCheck;
public AWS2S3Consumer(AWS2S3Endpoint endpoint, Processor processor) {
super(endpoint, processor);
@@ -81,18 +77,6 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
protected void doStart() throws Exception {
super.doStart();
- healthCheckRepository = HealthCheckHelper.getHealthCheckRepository(
- getEndpoint().getCamelContext(),
- "components",
- WritableHealthCheckRepository.class);
-
- if (healthCheckRepository != null) {
- consumerHealthCheck = new AWS2S3ConsumerHealthCheck(this, getRouteId());
- consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
- && getEndpoint().getComponent().isHealthCheckConsumerEnabled());
- healthCheckRepository.addHealthCheck(consumerHealthCheck);
- }
-
if (getConfiguration().isMoveAfterRead()) {
try {
getAmazonS3Client()
@@ -460,10 +444,6 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
@Override
protected void doStop() throws Exception {
- if (healthCheckRepository != null && consumerHealthCheck != null) {
- healthCheckRepository.removeHealthCheck(consumerHealthCheck);
- consumerHealthCheck = null;
- }
super.doStop();
}
}
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java
deleted file mode 100644
index 2cb8b875b68..00000000000
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws2.s3;
-
-import java.util.Map;
-
-import org.apache.camel.health.HealthCheckResultBuilder;
-import org.apache.camel.impl.health.AbstractHealthCheck;
-import org.apache.camel.util.ObjectHelper;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
-
-public class AWS2S3ConsumerHealthCheck extends AbstractHealthCheck {
-
- private final AWS2S3Consumer aws2S3Consumer;
-
- public AWS2S3ConsumerHealthCheck(AWS2S3Consumer aws2S3Consumer, String routeId) {
- super("camel", "aws2-s3-consumer-" + routeId);
- this.aws2S3Consumer = aws2S3Consumer;
- }
-
- @Override
- protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
-
- AWS2S3Configuration configuration = aws2S3Consumer.getConfiguration();
- try {
-
- if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
- if (!S3Client.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
- builder.message("The service is not supported in this region");
- builder.down();
- return;
- }
- }
- S3Client client = aws2S3Consumer.getAmazonS3Client();
- client.headBucket(HeadBucketRequest.builder().bucket(configuration.getBucketName()).build());
- } catch (AwsServiceException e) {
- builder.message(e.getMessage());
- builder.error(e);
- if (ObjectHelper.isNotEmpty(e.statusCode())) {
- builder.detail(SERVICE_STATUS_CODE, e.statusCode());
- }
- if (ObjectHelper.isNotEmpty(e.awsErrorDetails().errorCode())) {
- builder.detail(SERVICE_ERROR_CODE, e.awsErrorDetails().errorCode());
- }
- builder.down();
- return;
-
- } catch (Exception e) {
- builder.error(e);
- builder.down();
- return;
- }
-
- builder.up();
-
- }
-
-}
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 9d28d1886f2..7139608efb7 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
@@ -92,14 +92,12 @@ 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("aws2-s3-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2S3HealthCheck, "aws2-s3 check");
- Assertions.assertTrue(hasRegionMessage, "aws2-s3 check error message");
});
}
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 31be36c75ea..c026da9bcc3 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
@@ -93,14 +93,12 @@ 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("aws2-s3-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2S3HealthCheck, "aws2-s3 check");
- Assertions.assertTrue(hasRegionMessage, "aws2-s3 check error message");
});
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
index 375fccd65e1..4515323cca3 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
@@ -34,8 +34,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.health.HealthCheckHelper;
-import org.apache.camel.health.WritableHealthCheckRepository;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.spi.Synchronization;
@@ -72,8 +70,6 @@ public class Sqs2Consumer extends ScheduledBatchPollingConsumer {
private transient String sqsConsumerToString;
private Collection<String> attributeNames;
private Collection<String> messageAttributeNames;
- private WritableHealthCheckRepository healthCheckRepository;
- private Sqs2ConsumerHealthCheck consumerHealthCheck;
public Sqs2Consumer(Sqs2Endpoint endpoint, Processor processor) {
super(endpoint, processor);
@@ -377,17 +373,6 @@ public class Sqs2Consumer extends ScheduledBatchPollingConsumer {
}
super.doStart();
-
- // health-check is optional so discover and resolve
- healthCheckRepository = HealthCheckHelper.getHealthCheckRepository(getEndpoint().getCamelContext(), "components",
- WritableHealthCheckRepository.class);
-
- if (healthCheckRepository != null) {
- consumerHealthCheck = new Sqs2ConsumerHealthCheck(this, getRouteId());
- consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
- && getEndpoint().getComponent().isHealthCheckConsumerEnabled());
- healthCheckRepository.addHealthCheck(consumerHealthCheck);
- }
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
deleted file mode 100644
index 24721beebb6..00000000000
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws2.sqs;
-
-import java.util.Map;
-
-import org.apache.camel.health.HealthCheckResultBuilder;
-import org.apache.camel.impl.health.AbstractHealthCheck;
-import org.apache.camel.util.ObjectHelper;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sqs.SqsClient;
-import software.amazon.awssdk.services.sqs.model.ListQueuesRequest;
-
-public class Sqs2ConsumerHealthCheck extends AbstractHealthCheck {
-
- private final Sqs2Consumer sqs2Consumer;
-
- public Sqs2ConsumerHealthCheck(Sqs2Consumer sqs2Consumer, String routeId) {
- super("camel", "aws2-sqs-consumer-" + routeId);
- this.sqs2Consumer = sqs2Consumer;
- }
-
- @Override
- protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
-
- Sqs2Configuration configuration = sqs2Consumer.getConfiguration();
- try {
- if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
- if (!SqsClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
- builder.message("The service is not supported in this region");
- builder.down();
- return;
- }
- }
- SqsClient client = sqs2Consumer.getClient();
- client.listQueues(ListQueuesRequest.builder().maxResults(1).build());
- } catch (AwsServiceException e) {
- builder.message(e.getMessage());
- builder.error(e);
- if (ObjectHelper.isNotEmpty(e.statusCode())) {
- builder.detail(SERVICE_STATUS_CODE, e.statusCode());
- }
- if (ObjectHelper.isNotEmpty(e.awsErrorDetails().errorCode())) {
- builder.detail(SERVICE_ERROR_CODE, e.awsErrorDetails().errorCode());
- }
- builder.down();
- return;
-
- } catch (Exception e) {
- builder.error(e);
- builder.down();
- return;
- }
-
- builder.up();
-
- }
-
-}
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 17ca42b4414..f29ffbae314 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
@@ -93,14 +93,12 @@ 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("aws2-sqs-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2SqsHealthCheck, "aws2-sqs check");
- Assertions.assertTrue(hasRegionMessage, "aws2-sqs check error message");
});
}
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 84f55a71dfe..2ccf855a0fa 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
@@ -93,14 +93,12 @@ 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("aws2-sqs-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2SqsHealthCheck, "aws2-sqs check");
- Assertions.assertTrue(hasRegionMessage, "aws2-sqs check error message");
});
}
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 b8347f64200..a287c240591 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
@@ -93,14 +93,12 @@ 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("aws2-sqs-consumer"))
+ .filter(result -> result.getCheck().getId().startsWith("consumer:test-health-it"))
.findAny()
.isPresent();
- boolean hasRegionMessage = res2.stream()
- .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region")));
+
Assertions.assertTrue(down, "liveness check");
Assertions.assertTrue(containsAws2SqsHealthCheck, "aws2-sqs check");
- Assertions.assertTrue(hasRegionMessage, "aws2-sqs check error message");
});
}