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 3e2c677d363 CAMEL-20798: EndpointServiceLocation on components to make
it possible to know which remote system Camel connects to to assist for
monitoring and observability - AWS Eventbridge and EKS (#14535)
3e2c677d363 is described below
commit 3e2c677d36318eb97d6e294aaaa64efdbbd22106
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Sat Jun 15 08:19:21 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 - AWS Eventbridge and EKS (#14535)
* CAMEL-20798: EndpointServiceLocation on components to make it possible to
know which remote system Camel connects to to assist for monitoring and
observability - AWS EKS
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 Eventbridge
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
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../camel/component/aws2/eks/EKS2Endpoint.java | 20 ++++++++++++-
.../aws2/eventbridge/EventbridgeEndpoint.java | 34 ++++++++++++++++++----
2 files changed, 48 insertions(+), 6 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java
index 714a9104704..ea54c814f8b 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.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.aws2.eks.client.EKS2ClientFactory;
+import org.apache.camel.spi.EndpointServiceLocation;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ScheduledPollEndpoint;
@@ -34,7 +35,7 @@ import software.amazon.awssdk.services.eks.EksClient;
@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-eks", title = "AWS Elastic
Kubernetes Service (EKS)",
syntax = "aws2-eks:label", producerOnly = true, category = {
Category.CLOUD, Category.MANAGEMENT },
headersClass = EKS2Constants.class)
-public class EKS2Endpoint extends ScheduledPollEndpoint {
+public class EKS2Endpoint extends ScheduledPollEndpoint implements
EndpointServiceLocation {
private EksClient eksClient;
@@ -86,4 +87,21 @@ public class EKS2Endpoint extends ScheduledPollEndpoint {
public EksClient getEksClient() {
return eksClient;
}
+
+ @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 "eks";
+ }
}
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpoint.java
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpoint.java
index 3b7a7b76e3e..83361947b7c 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpoint.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpoint.java
@@ -16,16 +16,15 @@
*/
package org.apache.camel.component.aws2.eventbridge;
+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.eventbridge.client.EventbridgeClientFactory;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
+import org.apache.camel.spi.*;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
import software.amazon.awssdk.services.eventbridge.EventBridgeClient;
@@ -38,7 +37,7 @@ import
software.amazon.awssdk.services.eventbridge.EventBridgeClient;
Category.CLOUD,
Category.MANAGEMENT },
headersClass = EventbridgeConstants.class)
-public class EventbridgeEndpoint extends DefaultEndpoint {
+public class EventbridgeEndpoint extends DefaultEndpoint implements
EndpointServiceLocation {
private EventBridgeClient eventbridgeClient;
@@ -94,4 +93,29 @@ public class EventbridgeEndpoint extends DefaultEndpoint {
public EventBridgeClient getEventbridgeClient() {
return eventbridgeClient;
}
+
+ @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 "eventbridge";
+ }
+
+ @Override
+ public Map<String, String> getServiceMetadata() {
+ if (configuration.getEventbusName() != null) {
+ return Map.of("eventbus", configuration.getEventbusName());
+ }
+ return null;
+ }
}
