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 35ff7d3e0b8 CAMEL-19314 - Fixing the connection pool shutdown when aws
health checks are used (#10009)
35ff7d3e0b8 is described below
commit 35ff7d3e0b818322fce64b65ead533ebed78310c
Author: Rhuan Rocha <rhuan...@gmail.com>
AuthorDate: Tue May 16 01:37:28 2023 -0300
CAMEL-19314 - Fixing the connection pool shutdown when aws health checks
are used (#10009)
* CAMEL-19314 - Fixing the connection pool shutdown when aws health checks
are used
Signed-off-by: Rhuan Rocha <rhuan...@gmail.com>
* CAMEL-19314 - Reusing the client to health check
Signed-off-by: Rhuan Rocha <rhuan...@gmail.com>
* CAMEL-19314 - Reusing the client to health check
Signed-off-by: Rhuan Rocha <rhuan...@gmail.com>
* CAMEL-19314 - Reverting the CAMEL-19281 to some connectors and solving
the connection leak issue to KinesisClient
Signed-off-by: Rhuan Rocha <rhuan...@gmail.com>
* CAMEL-19314 - Reverting the CAMEL-19281 to some connectors and solving
the connection leak issue to KinesisClient
Signed-off-by: Rhuan Rocha <rhuan...@gmail.com>
---------
Signed-off-by: Rhuan Rocha <rhuan...@gmail.com>
---
.../cloudtrail/CloudtrailConsumerHealthCheck.java | 7 ++++---
.../SecretsManagerClientHealthCheck.java | 4 +++-
.../aws2/athena/Athena2ClientHealthCheck.java | 5 +++--
.../component/aws2/cw/Cw2ClientHealthCheck.java | 4 +++-
.../component/aws2/ddb/Ddb2ClientHealthCheck.java | 3 ++-
.../component/aws2/ec2/AWS2EC2HealthCheck.java | 4 +++-
.../component/aws2/ecs/ECS2ClientHealthCheck.java | 4 +++-
.../component/aws2/eks/EKS2ClientHealthCheck.java | 4 +++-
.../eventbridge/EventbridgeClientHealthCheck.java | 4 +++-
.../camel/component/aws2/iam/IAM2HealthCheck.java | 5 +++--
.../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 24 ++--------------------
.../aws2/lambda/Lambda2ClientHealthCheck.java | 4 +++-
.../component/aws2/mq/MQ2ClientHealthCheck.java | 6 ++++--
.../camel/component/aws2/msk/MSK2HealthCheck.java | 6 ++++--
.../aws2/s3/AWS2S3ConsumerHealthCheck.java | 8 +++++---
.../camel/component/aws2/ses/Ses2HealthCheck.java | 6 ++++--
.../camel/component/aws2/sns/Sns2HealthCheck.java | 6 ++++--
.../aws2/sqs/Sqs2ConsumerHealthCheck.java | 7 ++++---
.../translate/Translate2ClientHealthCheck.java | 4 +++-
19 files changed, 63 insertions(+), 52 deletions(-)
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
index fd4a7ecf781..f9983cb7966 100644
---
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
@@ -38,8 +38,8 @@ public class CloudtrailConsumerHealthCheck extends
AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (CloudTrailClient client =
cloudtrailConsumer.getEndpoint().getClient()) {
- CloudtrailConfiguration configuration =
cloudtrailConsumer.getEndpoint().getConfiguration();
+ 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");
@@ -47,7 +47,7 @@ public class CloudtrailConsumerHealthCheck extends
AbstractHealthCheck {
return;
}
}
-
+ CloudTrailClient client =
cloudtrailConsumer.getEndpoint().getClient();
client.listChannels(ListChannelsRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -70,4 +70,5 @@ public class CloudtrailConsumerHealthCheck extends
AbstractHealthCheck {
builder.up();
}
+
}
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/SecretsManagerClientHealthCheck.java
index 9048a2ea051..6af46c01262 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/SecretsManagerClientHealthCheck.java
@@ -46,7 +46,8 @@ public class SecretsManagerClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (SecretsManagerClient secretsManagerClient =
secretsManagerEndpoint.getSecretsManagerClient()) {
+ try {
+ SecretsManagerClient secretsManagerClient =
secretsManagerEndpoint.getSecretsManagerClient();
secretsManagerClient.listSecrets(ListSecretsRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class SecretsManagerClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
index 64f33e3345e..8405f8000b2 100644
---
a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
@@ -39,7 +39,7 @@ public class Athena2ClientHealthCheck extends
AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (AthenaClient client = athena2Endpoint.getAthenaClient()) {
+ try {
if
(ObjectHelper.isNotEmpty(athena2Endpoint.getConfiguration().getRegion())) {
if (!AthenaClient.serviceMetadata().regions()
.contains(Region.of(athena2Endpoint.getConfiguration().getRegion()))) {
@@ -48,7 +48,7 @@ public class Athena2ClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
-
+ AthenaClient client = athena2Endpoint.getAthenaClient();
client.listQueryExecutions(ListQueryExecutionsRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -69,4 +69,5 @@ public class Athena2ClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
index c4740931d20..a8dc3b8deb7 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
@@ -46,7 +46,8 @@ public class Cw2ClientHealthCheck extends AbstractHealthCheck
{
return;
}
}
- try (CloudWatchClient cw2Client = cw2Endpoint.getCloudWatchClient()) {
+ try {
+ CloudWatchClient cw2Client = cw2Endpoint.getCloudWatchClient();
cw2Client.listDashboards(ListDashboardsRequest.builder().build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class Cw2ClientHealthCheck extends AbstractHealthCheck
{
}
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
index d3990706cd7..c66530c1dfd 100644
---
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
@@ -46,7 +46,8 @@ public class Ddb2ClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (DynamoDbClient ddbClient = ddb2Endpoint.getDdbClient()) {
+ try {
+ DynamoDbClient ddbClient = ddb2Endpoint.getDdbClient();
ddbClient.listTables(ListTablesRequest.builder().limit(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
diff --git
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
index 75081511a49..e4e1d463c6a 100644
---
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
+++
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
@@ -38,7 +38,7 @@ public class AWS2EC2HealthCheck extends AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (Ec2Client client = aws2EC2Endpoint.getEc2Client()) {
+ try {
AWS2EC2Configuration configuration =
aws2EC2Endpoint.getConfiguration();
if
(!Ec2Client.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
builder.message("The service is not supported in this region");
@@ -46,6 +46,7 @@ public class AWS2EC2HealthCheck extends AbstractHealthCheck {
return;
}
+ Ec2Client client = aws2EC2Endpoint.getEc2Client();
client.describeInstances();
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -65,4 +66,5 @@ public class AWS2EC2HealthCheck extends AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
index 2186c8e4484..75c4ea25fc2 100644
---
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
@@ -46,7 +46,8 @@ public class ECS2ClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (EcsClient ecs2Client = ecs2Endpoint.getEcsClient()) {
+ try {
+ EcsClient ecs2Client = ecs2Endpoint.getEcsClient();
ecs2Client.listClusters(ListClustersRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class ECS2ClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
index 10768cb8a65..3f094582d18 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
@@ -46,7 +46,8 @@ public class EKS2ClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (EksClient eks2Client = eks2Endpoint.getEksClient()) {
+ try {
+ EksClient eks2Client = eks2Endpoint.getEksClient();
eks2Client.listClusters(ListClustersRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class EKS2ClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
index b7b6e1a42e4..d60d04d7901 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
@@ -46,7 +46,8 @@ public class EventbridgeClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (EventBridgeClient eventbridgeClient =
eventbridgeEndpoint.getEventbridgeClient()) {
+ try {
+ EventBridgeClient eventbridgeClient =
eventbridgeEndpoint.getEventbridgeClient();
eventbridgeClient.listEventBuses(ListEventBusesRequest.builder().limit(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class EventbridgeClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
index 272f962ad57..5ce31b27755 100644
---
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
+++
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
@@ -35,14 +35,14 @@ public class IAM2HealthCheck extends AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (IamClient client = endpoint.getIamClient()) {
+ try {
IAM2Configuration configuration = endpoint.getConfiguration();
if
(!IamClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
builder.message("The service is not supported in this region");
builder.down();
return;
}
-
+ IamClient client = endpoint.getIamClient();
client.listAccessKeys(ListAccessKeysRequest.builder().maxItems(1).build());
} catch (SdkClientException e) {
builder.message(e.getMessage());
@@ -55,4 +55,5 @@ public class IAM2HealthCheck extends AbstractHealthCheck {
}
builder.up();
}
+
}
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
index 60f6d9cb9b5..c2f53ebcfd4 100644
---
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
@@ -21,12 +21,9 @@ 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.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.kinesis.KinesisClient;
-import software.amazon.awssdk.services.kinesis.KinesisClientBuilder;
public class Kinesis2ConsumerHealthCheck extends AbstractHealthCheck {
@@ -40,7 +37,7 @@ public class Kinesis2ConsumerHealthCheck extends
AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (KinesisClient client =
buildClient(kinesis2Consumer.getConfiguration())) {
+ try {
Kinesis2Configuration configuration =
kinesis2Consumer.getConfiguration();
if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
if
(!KinesisClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
@@ -49,7 +46,7 @@ public class Kinesis2ConsumerHealthCheck extends
AbstractHealthCheck {
return;
}
}
-
+ KinesisClient client = kinesis2Consumer.getEndpoint().getClient();
client.listStreams();
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -73,21 +70,4 @@ public class Kinesis2ConsumerHealthCheck extends
AbstractHealthCheck {
}
- private KinesisClient buildClient(Kinesis2Configuration configuration) {
-
- if (!configuration.isUseDefaultCredentialsProvider()) {
- AwsBasicCredentials cred
- = AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
- KinesisClientBuilder clientBuilder = KinesisClient.builder();
- return
clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred))
- .region(Region.of(configuration.getRegion())).build();
- }
- if (ObjectHelper.isNotEmpty(configuration.getAmazonKinesisClient())) {
- return configuration.getAmazonKinesisClient();
- }
- KinesisClientBuilder clientBuilder = KinesisClient.builder();
- return
clientBuilder.region(Region.of(configuration.getRegion())).build();
-
- }
-
}
diff --git
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
index deaf4a23c36..902f856042a 100644
---
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
@@ -46,7 +46,8 @@ public class Lambda2ClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (LambdaClient lambda2Client =
lambda2Endpoint.getAwsLambdaClient()) {
+ try {
+ LambdaClient lambda2Client = lambda2Endpoint.getAwsLambdaClient();
lambda2Client.listFunctions(ListFunctionsRequest.builder().maxItems(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class Lambda2ClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
index 15a63a2db2f..ec9e0bd54a2 100644
---
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
@@ -46,8 +46,9 @@ public class MQ2ClientHealthCheck extends AbstractHealthCheck
{
return;
}
}
- try (MqClient mqClient = mq2Endpoint.getAmazonMqClient()) {
-
mqClient.listBrokers(ListBrokersRequest.builder().maxResults(1).build());
+ try {
+ MqClient client = mq2Endpoint.getAmazonMqClient();
+
client.listBrokers(ListBrokersRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
builder.error(e);
@@ -66,4 +67,5 @@ public class MQ2ClientHealthCheck extends AbstractHealthCheck
{
}
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
index 12cbea20d35..247db802063 100644
---
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
+++
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
@@ -37,13 +37,14 @@ public class MSK2HealthCheck extends AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (KafkaClient client = msk2Endpoint.getMskClient()) {
- MSK2Configuration configuration = msk2Endpoint.getConfiguration();
+ MSK2Configuration configuration = msk2Endpoint.getConfiguration();
+ try {
if
(!KafkaClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
builder.message("The service is not supported in this region");
builder.down();
return;
}
+ KafkaClient client = msk2Endpoint.getMskClient();
client.listClusters(ListClustersRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -57,4 +58,5 @@ public class MSK2HealthCheck extends AbstractHealthCheck {
builder.up();
}
+
}
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
index 220e63c7de8..2cb8b875b68 100644
---
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
@@ -38,8 +38,9 @@ public class AWS2S3ConsumerHealthCheck extends
AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (S3Client client = aws2S3Consumer.getAmazonS3Client()) {
- AWS2S3Configuration configuration =
aws2S3Consumer.getConfiguration();
+ 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");
@@ -47,7 +48,7 @@ public class AWS2S3ConsumerHealthCheck extends
AbstractHealthCheck {
return;
}
}
-
+ S3Client client = aws2S3Consumer.getAmazonS3Client();
client.headBucket(HeadBucketRequest.builder().bucket(configuration.getBucketName()).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -70,4 +71,5 @@ public class AWS2S3ConsumerHealthCheck extends
AbstractHealthCheck {
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
index 34e7154778a..b04ccd928ac 100644
---
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
+++
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
@@ -36,13 +36,14 @@ public class Ses2HealthCheck extends AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (SesClient client = ses2Endpoint.getSESClient()) {
- Ses2Configuration configuration = ses2Endpoint.getConfiguration();
+ Ses2Configuration configuration = ses2Endpoint.getConfiguration();
+ try {
if
(!SesClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
builder.message("The service is not supported in this region");
builder.down();
return;
}
+ SesClient client = ses2Endpoint.getSESClient();
client.getSendStatistics();
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -56,4 +57,5 @@ public class Ses2HealthCheck extends AbstractHealthCheck {
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
index 1c75dd41e46..9401f1c3a30 100644
---
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
+++
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
@@ -36,13 +36,14 @@ public class Sns2HealthCheck extends AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (SnsClient client = sns2Endpoint.getSNSClient()) {
- Sns2Configuration configuration = sns2Endpoint.getConfiguration();
+ Sns2Configuration configuration = sns2Endpoint.getConfiguration();
+ try {
if
(!SnsClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
builder.message("The service is not supported in this region");
builder.down();
return;
}
+ SnsClient client = sns2Endpoint.getSNSClient();
client.listSubscriptions();
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -56,4 +57,5 @@ public class Sns2HealthCheck extends AbstractHealthCheck {
builder.up();
}
+
}
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
index 5b6f433c303..24721beebb6 100644
---
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
@@ -38,8 +38,8 @@ public class Sqs2ConsumerHealthCheck extends
AbstractHealthCheck {
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String,
Object> options) {
- try (SqsClient client = sqs2Consumer.getClient()) {
- Sqs2Configuration configuration = sqs2Consumer.getConfiguration();
+ 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");
@@ -47,7 +47,7 @@ public class Sqs2ConsumerHealthCheck extends
AbstractHealthCheck {
return;
}
}
-
+ SqsClient client = sqs2Consumer.getClient();
client.listQueues(ListQueuesRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -70,4 +70,5 @@ public class Sqs2ConsumerHealthCheck extends
AbstractHealthCheck {
builder.up();
}
+
}
diff --git
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
index bb3f4764546..e14df57ccac 100644
---
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
+++
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
@@ -46,7 +46,8 @@ public class Translate2ClientHealthCheck extends
AbstractHealthCheck {
return;
}
}
- try (TranslateClient translateClient =
translate2Endpoint.getTranslateClient()) {
+ try {
+ TranslateClient translateClient =
translate2Endpoint.getTranslateClient();
translateClient.listLanguages(ListLanguagesRequest.builder().maxResults(1).build());
} catch (AwsServiceException e) {
builder.message(e.getMessage());
@@ -66,4 +67,5 @@ public class Translate2ClientHealthCheck extends
AbstractHealthCheck {
}
builder.up();
}
+
}
