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 dedeb656fb2 CAMEL-20798: EndpointServiceLocation on components to make
it possible to know which remote system Camel connects to to assist for
monitoring and observability - Athena and Secrets Manager (#14474)
dedeb656fb2 is described below
commit dedeb656fb26c5baef631053cc8883502f1bd258
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jun 11 13:20:47 2024 +0200
CAMEL-20798: EndpointServiceLocation on components to make it possible to
know which remote system Camel connects to to assist for monitoring and
observability - Athena and Secrets Manager (#14474)
* CAMEL-20798: EndpointServiceLocation on components to make it possible to
know which remote system Camel connects to to assist for monitoring and
observability - AWS Secrets Manager
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
* CAMEL-20798: EndpointServiceLocation on components to make it possible to
know which remote system Camel connects to to assist for monitoring and
observability - AWS Athena
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
* CAMEL-20798: EndpointServiceLocation on components to make it possible to
know which remote system Camel connects to to assist for monitoring and
observability - AWS Athena
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../aws/secretsmanager/SecretsManagerEndpoint.java | 20 ++++++++++++++++-
.../component/aws2/athena/Athena2Endpoint.java | 26 +++++++++++++++++++++-
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
index 126712b1456..36305267539 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
@@ -22,6 +22,7 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import
org.apache.camel.component.aws.secretsmanager.client.SecretsManagerClientFactory;
+import org.apache.camel.spi.EndpointServiceLocation;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -38,7 +39,7 @@ import
software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
@Metadata(annotations = {
"vault=aws-secrets-manager",
})
-public class SecretsManagerEndpoint extends ScheduledPollEndpoint {
+public class SecretsManagerEndpoint extends ScheduledPollEndpoint implements
EndpointServiceLocation {
private SecretsManagerClient secretsManagerClient;
@@ -91,4 +92,21 @@ public class SecretsManagerEndpoint extends
ScheduledPollEndpoint {
public SecretsManagerClient getSecretsManagerClient() {
return secretsManagerClient;
}
+
+ @Override
+ public String getServiceUrl() {
+ if (!configuration.isOverrideEndpoint()) {
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ return configuration.getRegion();
+ }
+ } else if
(ObjectHelper.isNotEmpty(configuration.getUriEndpointOverride())) {
+ return configuration.getUriEndpointOverride();
+ }
+ return null;
+ }
+
+ @Override
+ public String getServiceProtocol() {
+ return "secrets-manager";
+ }
}
diff --git
a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
index 2e5a3dedc4a..7eaa695946f 100644
---
a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
+++
b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.component.aws2.athena;
+import java.util.Map;
+
import org.apache.camel.Category;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.aws2.athena.client.Athena2ClientFactory;
+import org.apache.camel.spi.EndpointServiceLocation;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
@@ -33,7 +36,7 @@ import software.amazon.awssdk.services.athena.AthenaClient;
*/
@UriEndpoint(firstVersion = "3.4.0", scheme = "aws2-athena", title = "AWS
Athena", syntax = "aws2-athena:label",
producerOnly = true, category = { Category.CLOUD,
Category.DATABASE }, headersClass = Athena2Constants.class)
-public class Athena2Endpoint extends DefaultEndpoint {
+public class Athena2Endpoint extends DefaultEndpoint implements
EndpointServiceLocation {
private AthenaClient athenaClient;
@@ -95,4 +98,25 @@ public class Athena2Endpoint extends DefaultEndpoint {
public void setAthenaClient(AthenaClient athenaClient) {
this.athenaClient = athenaClient;
}
+
+ @Override
+ public String getServiceUrl() {
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ return configuration.getRegion();
+ }
+ return null;
+ }
+
+ @Override
+ public String getServiceProtocol() {
+ return "athena";
+ }
+
+ @Override
+ public Map<String, String> getServiceMetadata() {
+ if (configuration.getDatabase() != null) {
+ return Map.of("database", configuration.getDatabase());
+ }
+ return null;
+ }
}
