This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 691ea75ca7400622a0cc47963fb091c41fe61ef1 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Nov 9 11:54:00 2022 +0100 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - DynamoDB Streams Signed-off-by: Andrea Cosentino <[email protected]> --- .../ddbstream/Ddb2StreamConsumerHealthCheck.java | 2 +- ...2StreamConsumerHealthCheckProfileCredsTest.java | 107 +++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java index 9357f015b55..8f5cec8e28c 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java @@ -34,7 +34,7 @@ public class Ddb2StreamConsumerHealthCheck extends AbstractHealthCheck { private final String routeId; public Ddb2StreamConsumerHealthCheck(Ddb2StreamConsumer ddb2StreamConsumer, String routeId) { - super("camel", "aws2-dd2-stream-consumer-" + routeId); + super("camel", "aws2-ddbstream-consumer-" + routeId); this.ddb2StreamConsumer = ddb2StreamConsumer; this.routeId = routeId; } diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java new file mode 100644 index 00000000000..36db874cff7 --- /dev/null +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java @@ -0,0 +1,107 @@ +/* + * 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.ddbstream; + +import org.apache.camel.CamelContext; +import org.apache.camel.builder.RouteBuilder; +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.test.infra.aws.common.services.AWSService; +import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; +import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; +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 software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient; + +import java.util.Collection; +import java.util.concurrent.TimeUnit; + +import static org.testcontainers.shaded.org.awaitility.Awaitility.await; + +public class Ddb2StreamConsumerHealthCheckProfileCredsTest extends CamelTestSupport { + + @RegisterExtension + public static AWSService service = AWSServiceFactory.createS3Service(); + + private static final Logger LOG = LoggerFactory.getLogger(Ddb2StreamConsumerHealthCheckProfileCredsTest.class); + + CamelContext context; + + @Override + protected CamelContext createCamelContext() throws Exception { + context = super.createCamelContext(); + context.getPropertiesComponent().setLocation("ref:prop"); + Ddb2StreamComponent component = new Ddb2StreamComponent(context); + component.getConfiguration().setAmazonDynamoDbStreamsClient(DynamoDbStreamsClient.builder().build()); + component.init(); + context.addComponent("aws2-ddbstream", component); + + HealthCheckRegistry registry = new DefaultHealthCheckRegistry(); + registry.setCamelContext(context); + Object hc = registry.resolveById("context"); + registry.register(hc); + hc = registry.resolveById("routes"); + registry.register(hc); + hc = registry.resolveById("consumers"); + registry.register(hc); + context.setExtension(HealthCheckRegistry.class, registry); + + return context; + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + + @Override + public void configure() { + from("aws2-ddbstream://stream?region=l&useDefaultCredentialsProvider=true") + .startupOrder(2).log("${body}").routeId("test-health-it"); + } + }; + } + + @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"); + + // health-check readiness should be down + await().atMost(20, TimeUnit.SECONDS).untilAsserted(() -> { + Collection<HealthCheck.Result> res2 = HealthCheckHelper.invokeReadiness(context); + boolean down = res2.stream().allMatch(r -> r.getState().equals(HealthCheck.State.DOWN)); + boolean containsDdb2StreamHealthCheck = res2.stream() + .filter(result -> result.getCheck().getId().startsWith("aws2-ddbstream-consumer")) + .findAny() + .isPresent(); + boolean hasRegionMessage = res2.stream() + .anyMatch(r -> r.getMessage().stream().anyMatch(msg -> msg.contains("region"))); + Assertions.assertTrue(down, "liveness check"); + Assertions.assertTrue(containsDdb2StreamHealthCheck, "aws2-ddbstream check"); + Assertions.assertTrue(hasRegionMessage, "aws2-ddbstream check error message"); + }); + + } +}
