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 eef12c884eb762a4bd3a858e3cd3c20ab874b9b7 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon May 27 20:30:34 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. --- .../resources/org/apache/camel/catalog/components/thrift.json | 2 +- .../org/apache/camel/component/thrift/ThriftEndpointUriFactory.java | 2 +- .../resources/META-INF/org/apache/camel/component/thrift/thrift.json | 2 +- .../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++-- .../camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json index 3293c16d55d..8a583a8661d 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json @@ -32,7 +32,7 @@ "CamelThriftMethodName": { "index": 0, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Method name handled by the consumer service", "constantName": "org.apache.camel.component.thrift.ThriftConstants#THRIFT_METHOD_NAME_HEADER" } }, "properties": { - "host": { "index": 0, "kind": "path", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "The Thrift server host name. This is localhost or 0.0.0.0 (if not defined) when being a consumer or remote server host name when using [...] + "host": { "index": 0, "kind": "path", "displayName": "Host", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "The Thrift server host name. This is localhost or 0.0.0.0 (if not defined) when being a consumer or remote serve [...] "port": { "index": 1, "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": true, "type": "integer", "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "The Thrift server port" }, "service": { "index": 2, "kind": "path", "displayName": "Service", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "Fully qualified service name from the thrift descriptor file (package dot service definition name)" }, "compressionType": { "index": 3, "kind": "parameter", "displayName": "Compression Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.thrift.ThriftCompressionType", "enum": [ "NONE", "ZLIB" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "NONE", "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "Protocol compre [...] diff --git a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java index ffac4627928..34ca32638a6 100644 --- a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java +++ b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java @@ -57,7 +57,7 @@ public class ThriftEndpointUriFactory extends org.apache.camel.support.component Map<String, Object> copy = new HashMap<>(properties); - uri = buildPathParameter(syntax, uri, "host", null, false, copy); + uri = buildPathParameter(syntax, uri, "host", null, true, copy); uri = buildPathParameter(syntax, uri, "port", null, true, copy); uri = buildPathParameter(syntax, uri, "service", null, true, copy); uri = buildQueryParameters(uri, copy, encode); diff --git a/components/camel-thrift/src/generated/resources/META-INF/org/apache/camel/component/thrift/thrift.json b/components/camel-thrift/src/generated/resources/META-INF/org/apache/camel/component/thrift/thrift.json index 3293c16d55d..8a583a8661d 100644 --- a/components/camel-thrift/src/generated/resources/META-INF/org/apache/camel/component/thrift/thrift.json +++ b/components/camel-thrift/src/generated/resources/META-INF/org/apache/camel/component/thrift/thrift.json @@ -32,7 +32,7 @@ "CamelThriftMethodName": { "index": 0, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Method name handled by the consumer service", "constantName": "org.apache.camel.component.thrift.ThriftConstants#THRIFT_METHOD_NAME_HEADER" } }, "properties": { - "host": { "index": 0, "kind": "path", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "The Thrift server host name. This is localhost or 0.0.0.0 (if not defined) when being a consumer or remote server host name when using [...] + "host": { "index": 0, "kind": "path", "displayName": "Host", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "The Thrift server host name. This is localhost or 0.0.0.0 (if not defined) when being a consumer or remote serve [...] "port": { "index": 1, "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": true, "type": "integer", "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "The Thrift server port" }, "service": { "index": 2, "kind": "path", "displayName": "Service", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "Fully qualified service name from the thrift descriptor file (package dot service definition name)" }, "compressionType": { "index": 3, "kind": "parameter", "displayName": "Compression Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.thrift.ThriftCompressionType", "enum": [ "NONE", "ZLIB" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "NONE", "configurationClass": "org.apache.camel.component.thrift.ThriftConfiguration", "configurationField": "configuration", "description": "Protocol compre [...] diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index dcc52dda298..59f2e70906f 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -14085,7 +14085,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>thrift:host:port/service</code> * - * Path parameter: host + * Path parameter: host (required) * The Thrift server host name. This is localhost or 0.0.0.0 (if not * defined) when being a consumer or remote server host name when using * producer. @@ -14114,7 +14114,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>thrift:host:port/service</code> * - * Path parameter: host + * Path parameter: host (required) * The Thrift server host name. This is localhost or 0.0.0.0 (if not * defined) when being a consumer or remote server host name when using * producer. diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java index fa95d947b7b..9c48dd286f0 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java @@ -882,7 +882,7 @@ public interface ThriftEndpointBuilderFactory { * * Syntax: <code>thrift:host:port/service</code> * - * Path parameter: host + * Path parameter: host (required) * The Thrift server host name. This is localhost or 0.0.0.0 (if not * defined) when being a consumer or remote server host name when using * producer. @@ -911,7 +911,7 @@ public interface ThriftEndpointBuilderFactory { * * Syntax: <code>thrift:host:port/service</code> * - * Path parameter: host + * Path parameter: host (required) * The Thrift server host name. This is localhost or 0.0.0.0 (if not * defined) when being a consumer or remote server host name when using * producer.