This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch ra
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 97788f376656e57ea6add798e274688c2ac73cb6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon May 27 08:59:46 2024 +0200
CAMEL-20798: Add RemoteAddress to endpoints so they can tell the
url/hostname etc for the system it connects. This is needed for better
monitoring, tracing and management. Add this information into camel-tracer as
tags.
---
.../java/org/apache/camel/spi/EndpointLocationAddress.java | 11 +++++------
.../src/main/java/org/apache/camel/spi/HostedService.java | 4 ++--
.../camel/api/management/mbean/ManagedEndpointMBean.java | 4 ++--
.../org/apache/camel/management/mbean/ManagedEndpoint.java | 2 +-
.../main/java/org/apache/camel/support/DefaultConsumer.java | 3 ++-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointLocationAddress.java
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointLocationAddress.java
index 828ca615b51..e2eafe39113 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointLocationAddress.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointLocationAddress.java
@@ -22,8 +22,8 @@ import java.util.Map;
* Used for getting information about (hosted or external) service addresses
used for connecting to a remote system such
* as message brokers, databases, or cloud services.
*
- * Hosted services are running inside this Camel application such as with
embedded HTTP server for Rest DSL, or
- * TCP networking with netty etc.
+ * Hosted services are running inside this Camel application such as with
embedded HTTP server for Rest DSL, or TCP
+ * networking with netty etc.
*/
public interface EndpointLocationAddress {
@@ -35,10 +35,9 @@ public interface EndpointLocationAddress {
String getAddress();
/**
- * Optional additional metadata that is relevant to the address as key
value pairs.
- * Notice that the metadata is not supposed to contain sensitive security
details
- * such as access token, api keys, or passwords. Only share information
that can
- * be safely accessed and written to logs.
+ * Optional additional metadata that is relevant to the address as key
value pairs. Notice that the metadata is not
+ * supposed to contain sensitive security details such as access token,
api keys, or passwords. Only share
+ * information that can be safely accessed and written to logs.
*
* @return optional metadata or null if no data
*/
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/HostedService.java
b/core/camel-api/src/main/java/org/apache/camel/spi/HostedService.java
index 53e5226707c..5a503d3ea9c 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/HostedService.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/HostedService.java
@@ -17,8 +17,8 @@
package org.apache.camel.spi;
/**
- * To use for identifying {@link org.apache.camel.Consumer} which can host a
service,
- * such as a TCP network server, or an embedded HTTP server.
+ * To use for identifying {@link org.apache.camel.Consumer} which can host a
service, such as a TCP network server, or
+ * an embedded HTTP server.
*/
public interface HostedService {
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
index dbf19c1944e..e3cd0504ad8 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.api.management.mbean;
-import org.apache.camel.api.management.ManagedAttribute;
-
import java.util.Map;
+import org.apache.camel.api.management.ManagedAttribute;
+
public interface ManagedEndpointMBean {
@ManagedAttribute(description = "Camel ID")
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
index c90ba2f6813..200d9a5066c 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
@@ -24,8 +24,8 @@ import org.apache.camel.StatefulService;
import org.apache.camel.api.management.ManagedInstance;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedEndpointMBean;
-import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.EndpointLocationAddress;
+import org.apache.camel.spi.ManagementStrategy;
@ManagedResource(description = "Managed Endpoint")
public class ManagedEndpoint implements ManagedInstance, ManagedEndpointMBean {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
index f6d0298f685..7371e5be57d 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
@@ -41,7 +41,8 @@ import org.slf4j.LoggerFactory;
/**
* A default consumer useful for implementation inheritance.
*/
-public class DefaultConsumer extends ServiceSupport implements Consumer,
RouteAware, RouteIdAware, HealthCheckAware, HostedService {
+public class DefaultConsumer extends ServiceSupport
+ implements Consumer, RouteAware, RouteIdAware, HealthCheckAware,
HostedService {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultConsumer.class);
