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 cc3c42a15b6c6cec37dced8714280c7b5c56e666
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun May 26 11:36:57 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/component/cxf/jaxrs/CxfRsConsumer.java | 5 +++++
.../main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java | 5 +++++
.../src/main/java/org/apache/camel/http/common/HttpConsumer.java | 5 +++++
.../src/main/java/org/apache/camel/component/mina/MinaConsumer.java | 6 ++++++
.../java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 5 +++++
.../main/java/org/apache/camel/component/netty/NettyConsumer.java | 6 ++++++
6 files changed, 32 insertions(+)
diff --git
a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java
b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java
index 2f209360be5..9f3e8122adb 100644
---
a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java
+++
b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java
@@ -39,6 +39,11 @@ public class CxfRsConsumer extends DefaultConsumer
implements Suspendable {
super(endpoint, processor);
}
+ @Override
+ public boolean isHostedService() {
+ return true;
+ }
+
protected Server createServer() {
CxfRsEndpoint endpoint = (CxfRsEndpoint) getEndpoint();
CxfRsInvoker cxfRsInvoker = new CxfRsInvoker(endpoint, this);
diff --git
a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
index b805d4a09e0..347f3d68e42 100644
---
a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
+++
b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
@@ -69,6 +69,11 @@ public class CxfConsumer extends DefaultConsumer implements
Suspendable {
cxfEndpoint = endpoint;
}
+ @Override
+ public boolean isHostedService() {
+ return true;
+ }
+
protected Server createServer() throws Exception {
ServerFactoryBean svrBean = cxfEndpoint.createServerFactoryBean();
svrBean.setInvoker(new CxfConsumerInvoker(cxfEndpoint));
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConsumer.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConsumer.java
index 8576a1ac006..5118630a22a 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConsumer.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConsumer.java
@@ -37,6 +37,11 @@ public class HttpConsumer extends DefaultConsumer implements
Suspendable {
}
}
+ @Override
+ public boolean isHostedService() {
+ return true;
+ }
+
@Override
public HttpCommonEndpoint getEndpoint() {
return (HttpCommonEndpoint) super.getEndpoint();
diff --git
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
index 14cd3c4ed53..1a2635afa23 100644
---
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
+++
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
@@ -94,6 +94,12 @@ public class MinaConsumer extends DefaultConsumer {
}
}
+ @Override
+ public boolean isHostedService() {
+ // we are hosted if not in client mode
+ return !configuration.isClientMode();
+ }
+
@Override
protected void doStart() throws Exception {
super.doStart();
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index f5138e6ebba..e97ffdda008 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -87,6 +87,11 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
new SynchronousQueue<>());
}
+ @Override
+ public boolean isHostedService() {
+ return true;
+ }
+
@ManagedAttribute(description = "Last activity time")
public Map<String, Date> getLastActivityTimes() {
Map<String, Date> answer = new HashMap<>();
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java
index 5450179a692..d8fbab75e67 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java
@@ -39,6 +39,12 @@ public class NettyConsumer extends DefaultConsumer {
setExceptionHandler(new NettyConsumerExceptionHandler(this));
}
+ @Override
+ public boolean isHostedService() {
+ // we are hosted if not in client mode
+ return !configuration.isClientMode();
+ }
+
@Override
public NettyEndpoint getEndpoint() {
return (NettyEndpoint) super.getEndpoint();
