You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/10/24 08:10:13 UTC
[camel] branch main updated (9c932dcb450 -> 72faa4301b9)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 9c932dcb450 (chores) camel-aws2-s3: use log guards
new 9bb04a98893 Camel AWS2 Kinesis - For HealthCheck use AwsServiceException and set service.error.code and service.status.code
new 5f356fd8018 Upgrade AWS SDK v2 to version 2.18.1
new 72faa4301b9 Sync deps
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 10 ++++++++--
.../java/org/apache/camel/impl/health/AbstractHealthCheck.java | 4 ++++
parent/pom.xml | 2 +-
4 files changed, 14 insertions(+), 4 deletions(-)
[camel] 01/03: Camel AWS2 Kinesis - For HealthCheck use AwsServiceException and set service.error.code and service.status.code
Posted by ac...@apache.org.
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 9bb04a988937d0223a03e0f11b82d59633d80ac6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 21 18:43:04 2022 +0200
Camel AWS2 Kinesis - For HealthCheck use AwsServiceException and set service.error.code and service.status.code
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 10 ++++++++--
.../java/org/apache/camel/impl/health/AbstractHealthCheck.java | 4 ++++
2 files changed, 12 insertions(+), 2 deletions(-)
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 985704d7d20..f866ccabe1b 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
@@ -23,7 +23,7 @@ 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.core.exception.SdkClientException;
+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;
@@ -69,9 +69,15 @@ public class Kinesis2ConsumerHealthCheck extends AbstractHealthCheck {
client = clientBuilder.region(Region.of(configuration.getRegion())).build();
}
client.listStreams();
- } catch (SdkClientException e) {
+ } 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;
diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
index 654c47e2e83..305c0f4b45e 100644
--- a/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
+++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
@@ -47,6 +47,10 @@ public abstract class AbstractHealthCheck implements HealthCheck, CamelContextAw
private final String id;
private final ConcurrentMap<String, Object> meta;
+ public static final String SERVICE_STATUS_CODE = "service.status.code";
+
+ public static final String SERVICE_ERROR_CODE = "service.error.code";
+
protected AbstractHealthCheck(String id) {
this(null, id, null);
}
[camel] 03/03: Sync deps
Posted by ac...@apache.org.
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 72faa4301b92204558e2519d75e1b062c2183aad
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 24 10:09:51 2022 +0200
Sync deps
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 1de3a0b3b6a..ed44433d71f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -65,7 +65,7 @@
<avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
<avro-version>1.11.1</avro-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.17.295</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.18.1</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-sdk-bom-version>1.2.6</azure-sdk-bom-version>
[camel] 02/03: Upgrade AWS SDK v2 to version 2.18.1
Posted by ac...@apache.org.
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 5f356fd8018155a0a53186dff5a42a01fe2ea5b0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 24 09:12:28 2022 +0200
Upgrade AWS SDK v2 to version 2.18.1
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ed00cad58f..60d4cba76b1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,7 +81,7 @@
<avro-ipc-jetty-version>1.11.1</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.17.295</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.18.1</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-sdk-bom-version>1.2.6</azure-sdk-bom-version>