You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/10/17 03:58:48 UTC
[camel] branch master updated: Regen and polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new da4b4ce Regen and polished
da4b4ce is described below
commit da4b4ce34590b4151e6a1f570920b86e7c7b5a21
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Oct 17 05:53:27 2019 +0200
Regen and polished
---
components/camel-aws-xray/pom.xml | 3 +-
components/camel-lra/pom.xml | 2 +-
components/camel-reactive-executor-vertx/pom.xml | 5 +-
components/camel-rxjava/pom.xml | 2 +-
components/camel-test-junit5/pom.xml | 2 +-
components/camel-test-spring-junit5/pom.xml | 2 +-
components/camel-testcontainers-junit5/pom.xml | 2 +-
components/camel-zipkin/src/main/docs/zipkin.adoc | 72 +------
components/readme.adoc | 6 +-
.../modules/ROOT/pages/hdfs-component.adoc | 18 ++
docs/components/modules/ROOT/pages/index.adoc | 6 +-
docs/components/modules/ROOT/pages/zipkin.adoc | 239 +++++++++++----------
.../camel-spring-boot-dependencies/pom.xml | 2 +-
13 files changed, 166 insertions(+), 195 deletions(-)
diff --git a/components/camel-aws-xray/pom.xml b/components/camel-aws-xray/pom.xml
index 1109051..8116451 100644
--- a/components/camel-aws-xray/pom.xml
+++ b/components/camel-aws-xray/pom.xml
@@ -37,8 +37,7 @@
<properties>
<firstVersion>2.21.0</firstVersion>
<label>monitoring,microservice</label>
- <title>XRay</title>
-
+ <title>AWS XRay</title>
</properties>
<dependencyManagement>
diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml
index 8c779f5..f0346c3 100644
--- a/components/camel-lra/pom.xml
+++ b/components/camel-lra/pom.xml
@@ -35,7 +35,7 @@
<properties>
<!-- used by camel-catalog -->
<firstVersion>2.21.0</firstVersion>
-
+ <title>LRA</title>
</properties>
<dependencies>
diff --git a/components/camel-reactive-executor-vertx/pom.xml b/components/camel-reactive-executor-vertx/pom.xml
index 232028d..198cc08 100644
--- a/components/camel-reactive-executor-vertx/pom.xml
+++ b/components/camel-reactive-executor-vertx/pom.xml
@@ -29,12 +29,13 @@
<artifactId>camel-reactive-executor-vertx</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Reactive Executor :: Vert X</name>
- <description>Reactive Executor for camel-core using Vert X</description>
+ <name>Camel :: Reactive Executor :: Vert.x</name>
+ <description>Reactive Executor for camel-core using Vert.x</description>
<properties>
<firstVersion>3.0.0</firstVersion>
<label>reactive</label>
+ <title>Reactive Executor Vert.x</title>
</properties>
<dependencies>
diff --git a/components/camel-rxjava/pom.xml b/components/camel-rxjava/pom.xml
index 06c79f9..7bc32a6 100644
--- a/components/camel-rxjava/pom.xml
+++ b/components/camel-rxjava/pom.xml
@@ -35,7 +35,7 @@
<properties>
<firstVersion>2.22.0</firstVersion>
<label>reactive,streams</label>
-
+ <title>RxJava</title>
</properties>
<dependencies>
diff --git a/components/camel-test-junit5/pom.xml b/components/camel-test-junit5/pom.xml
index 7479fa1..987e448 100644
--- a/components/camel-test-junit5/pom.xml
+++ b/components/camel-test-junit5/pom.xml
@@ -37,7 +37,7 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>testing,java</label>
-
+ <title>Test JUnit5</title>
</properties>
<dependencies>
diff --git a/components/camel-test-spring-junit5/pom.xml b/components/camel-test-spring-junit5/pom.xml
index 49deb7c..927c173 100644
--- a/components/camel-test-spring-junit5/pom.xml
+++ b/components/camel-test-spring-junit5/pom.xml
@@ -36,7 +36,7 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>testing,java,spring</label>
-
+ <title>Test Spring JUnit5</title>
<spring-version>${spring5-version}</spring-version>
</properties>
diff --git a/components/camel-testcontainers-junit5/pom.xml b/components/camel-testcontainers-junit5/pom.xml
index b80f32d..7380330 100644
--- a/components/camel-testcontainers-junit5/pom.xml
+++ b/components/camel-testcontainers-junit5/pom.xml
@@ -36,7 +36,7 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>testing,java,docker</label>
-
+ <title>Testcontainers JUnit5</title>
</properties>
<dependencies>
diff --git a/components/camel-zipkin/src/main/docs/zipkin.adoc b/components/camel-zipkin/src/main/docs/zipkin.adoc
index 42e7119..b06fb00 100644
--- a/components/camel-zipkin/src/main/docs/zipkin.adoc
+++ b/components/camel-zipkin/src/main/docs/zipkin.adoc
@@ -112,67 +112,17 @@ The component supports 10 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
-| Name
-| Description
-| Default
-| Type
-
-| *camel.zipkin.client-service-mappings*
-| Sets client service mapping(s) that matches Camel events to the given zipkin service name.
-The key is the pattern, the value is the service name.
-|
-| Map
-
-| *camel.zipkin.endpoint*
-| Sets the POST URL for zipkin's <a href="http://zipkin.io/zipkin-api/#/">v2 api</a>, usually "\http://zipkinhost:9411/api/v2/spans"
-|
-| String
-
-| *camel.zipkin.exclude-patterns*
-| Sets exclude pattern(s) that will disable tracing with zipkin for Camel messages that matches the pattern.
-|
-| Set
-
-| *camel.zipkin.host-name*
-| Sets the hostname if sending spans to a remote zipkin scribe (thrift RPC) collector.
-|
-| String
-
-| *camel.zipkin.include-message-body*
-| Whether to include the Camel message body in the zipkin traces.
-This is not recommended for production usage, or when having big payloads.
-You can limit the size by configuring camel.springboot.log-debug-max-chars option.
-| false
-| Boolean
-
-| *camel.zipkin.include-message-body-streams*
-| Whether to include message bodies that are stream based in the zipkin traces.
-This is not recommended for production usage, or when having big payloads.
-You can limit the size by configuring camel.springboot.log-debug-max-chars option.
-| false
-| Boolean
-
-| *camel.zipkin.port*
-| Sets the port if sending spans to a remote zipkin scribe (thrift RPC) collector.
-| 0
-| Integer
-
-| *camel.zipkin.rate*
-| Configures a rate that decides how many events should be traced by zipkin.
-The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f is 10%).
-| 1
-| Float
-
-| *camel.zipkin.server-service-mappings*
-| Sets server service mapping(s) that matches Camel events to the given zipkin service name.
-The key is the pattern, the value is the service name.
-|
-| Map
-
-| *camel.zipkin.service-name*
-| To use a global service name that matches all Camel events
-|
-| String
+| Name | Description | Default | Type
+| *camel.zipkin.client-service-mappings* | Sets client service mapping(s) that matches Camel events to the given zipkin service name. The key is the pattern, the value is the service name. | | Map
+| *camel.zipkin.endpoint* | Sets the POST URL for zipkin's <a href="http://zipkin.io/zipkin-api/#/">v2 api</a>, usually "\http://zipkinhost:9411/api/v2/spans" | | String
+| *camel.zipkin.exclude-patterns* | Sets exclude pattern(s) that will disable tracing with zipkin for Camel messages that matches the pattern. | | Set
+| *camel.zipkin.host-name* | Sets the hostname if sending spans to a remote zipkin scribe (thrift RPC) collector. | | String
+| *camel.zipkin.include-message-body* | Whether to include the Camel message body in the zipkin traces. This is not recommended for production usage, or when having big payloads. You can limit the size by configuring camel.springboot.log-debug-max-chars option. | false | Boolean
+| *camel.zipkin.include-message-body-streams* | Whether to include message bodies that are stream based in the zipkin traces. This is not recommended for production usage, or when having big payloads. You can limit the size by configuring camel.springboot.log-debug-max-chars option. | false | Boolean
+| *camel.zipkin.port* | Sets the port if sending spans to a remote zipkin scribe (thrift RPC) collector. | 0 | Integer
+| *camel.zipkin.rate* | Configures a rate that decides how many events should be traced by zipkin. The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f is 10%). | 1 | Float
+| *camel.zipkin.server-service-mappings* | Sets server service mapping(s) that matches Camel events to the given zipkin service name. The key is the pattern, the value is the service name. | | Map
+| *camel.zipkin.service-name* | To use a global service name that matches all Camel events | | String
|===
// spring-boot-auto-configure options: END
diff --git a/components/readme.adoc b/components/readme.adoc
index ac245ac..bc49130 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1121,17 +1121,17 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts (0 deprecated)
| link:camel-test-cdi/src/main/docs/test-cdi.adoc[Test CDI] (camel-test-cdi) | 2.17 | Camel unit testing with CDI
-| link:camel-test-junit5/src/main/docs/test-junit5.adoc[Test Junit5] (camel-test-junit5) | 3.0 | Camel unit testing with JUnit 5
+| link:camel-test-junit5/src/main/docs/test-junit5.adoc[Test JUnit5] (camel-test-junit5) | 3.0 | Camel unit testing with JUnit 5
| link:camel-test-karaf/src/main/docs/test-karaf.adoc[Test Karaf] (camel-test-karaf) | 2.18 | Camel integration testing with Apache Karaf
| link:camel-test-spring/src/main/docs/test-spring.adoc[Test Spring] (camel-test-spring) | 2.10 | Camel unit testing with Spring
-| link:camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc[Test Spring Junit5] (camel-test-spring-junit5) | 3.0 | Camel unit testing with Spring and JUnit 5
+| link:camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc[Test Spring JUnit5] (camel-test-spring-junit5) | 3.0 | Camel unit testing with Spring and JUnit 5
| link:camel-testcontainers/src/main/docs/testcontainers.adoc[Testcontainers] (camel-testcontainers) | 2.22 | Camel support for testcontainers
-| link:camel-testcontainers-junit5/src/main/docs/testcontainers-junit5.adoc[Testcontainers Junit5] (camel-testcontainers-junit5) | 3.0 | Camel support for testcontainers with JUnit 5
+| link:camel-testcontainers-junit5/src/main/docs/testcontainers-junit5.adoc[Testcontainers JUnit5] (camel-testcontainers-junit5) | 3.0 | Camel support for testcontainers with JUnit 5
| link:camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc[Testcontainers Spring] (camel-testcontainers-spring) | 2.22 | Camel unit testing with Spring and testcontainers
diff --git a/docs/components/modules/ROOT/pages/hdfs-component.adoc b/docs/components/modules/ROOT/pages/hdfs-component.adoc
index 26c7c78..a9f810f 100644
--- a/docs/components/modules/ROOT/pages/hdfs-component.adoc
+++ b/docs/components/modules/ROOT/pages/hdfs-component.adoc
@@ -328,6 +328,24 @@ resource with bundle that contains blueprint definition.
This way Hadoop 2.x will have correct mapping of URI schemes to
filesystem implementations.
+=== Using this component with a HighAvailability configuration
+
+In a HA setup, there will be multiple nodes (_configured through the *namedNodes* parameter_).
+The "hostname" and "port" portion of the endpoint uri will no longer have a _"host"_ meaning, but it will represent the name given to the cluster.
+
+You can choose whatever name you want for the cluster (_the name should follow the [a-zA-Z0-9] convention_).
+This name will be sanitized by replacing the _dirty_ characters with underscore. This is done so that a host name or ip could pottentialy be used, if it makes sense to you.
+
+The cluster name will be mapped to the HA filesystem with a coresponding proxy, with failover, and the _works_.
+
+[source,java]
+------------------------------------------------------------------------------------------------------
+
+from("hdfs://node1_and_2_cluster/dir1/dir2?namedNodes=node1.exemple.org:8020,node2.exemple.org:8020").routeId(...)
+...
+------------------------------------------------------------------------------------------------------
+
+
=== Using this component with Kerberos authentication
The kerberos config file is read when the camel component is created, not when the endpoint is created.
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index 69695da..02b76ee 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -824,17 +824,17 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts (0 deprecated)
| xref:test-cdi.adoc[Test CDI] (camel-test-cdi) | 2.17 | Camel unit testing with CDI
-| xref:test-junit5.adoc[Test Junit5] (camel-test-junit5) | 3.0 | Camel unit testing with JUnit 5
+| xref:test-junit5.adoc[Test JUnit5] (camel-test-junit5) | 3.0 | Camel unit testing with JUnit 5
| xref:test-karaf.adoc[Test Karaf] (camel-test-karaf) | 2.18 | Camel integration testing with Apache Karaf
| xref:test-spring.adoc[Test Spring] (camel-test-spring) | 2.10 | Camel unit testing with Spring
-| xref:test-spring-junit5.adoc[Test Spring Junit5] (camel-test-spring-junit5) | 3.0 | Camel unit testing with Spring and JUnit 5
+| xref:test-spring-junit5.adoc[Test Spring JUnit5] (camel-test-spring-junit5) | 3.0 | Camel unit testing with Spring and JUnit 5
| xref:testcontainers.adoc[Testcontainers] (camel-testcontainers) | 2.22 | Camel support for testcontainers
-| xref:testcontainers-junit5.adoc[Testcontainers Junit5] (camel-testcontainers-junit5) | 3.0 | Camel support for testcontainers with JUnit 5
+| xref:testcontainers-junit5.adoc[Testcontainers JUnit5] (camel-testcontainers-junit5) | 3.0 | Camel support for testcontainers with JUnit 5
| xref:testcontainers-spring.adoc[Testcontainers Spring] (camel-testcontainers-spring) | 2.22 | Camel unit testing with Spring and testcontainers
diff --git a/docs/components/modules/ROOT/pages/zipkin.adoc b/docs/components/modules/ROOT/pages/zipkin.adoc
index 5bdec84..d45b418 100644
--- a/docs/components/modules/ROOT/pages/zipkin.adoc
+++ b/docs/components/modules/ROOT/pages/zipkin.adoc
@@ -4,33 +4,25 @@
*Available as of Camel 2.18*
-The Camel Zipkin component is used for tracing and timing incoming and
-outgoing Camel messages using http://zipkin.io/[zipkin].
+The Camel Zipkin component is used for tracing and timing incoming and outgoing Camel messages using http://zipkin.io/[zipkin].
-Events (span) are captured for incoming and outgoing messages being sent
-to/from Camel.
+Events (span) are captured for incoming and outgoing messages being sent to/from Camel.
-This means you need to configure which Camel endpoints map
-to zipkin service names.
+This means you need to configure which Camel endpoints map to zipkin service names.
The mapping can be configured using:
* route id - A Camel route id
* endpoint url - A Camel endpoint url
-For both kinds you can match using wildcards and regular expressions,
-using the rules from Intercept.
+For both kinds you can match using wildcards and regular expressions, using the rules from Intercept.
-To match all Camel messages you can use * in the pattern and configure
-that to the same service name.
+To match all Camel messages you can use * in the pattern and configure that to the same service name.
-If no mapping has been configured, Camel will fallback and use
-endpoint uri's as service names. +
-However, it's recommended to configure service mappings so you can use
-human-readable names instead of Camel endpoint uris in the names.
+If no mapping has been configured, Camel will fallback and use endpoint uri's as service names.
+However, it's recommended to configure service mappings so you can use human-readable names instead of Camel endpoint uris in the names.
-Camel will auto-configure a span reporter one hasn't been explicitly configured,
-and if the hostname and port to a zipkin collector has been configured as environment variables
+Camel will auto-configure a span reporter one hasn't been explicitly configured, and if the hostname and port to a zipkin collector has been configured as environment variables
* ZIPKIN_COLLECTOR_HTTP_SERVICE_HOST - The http hostname
* ZIPKIN_COLLECTOR_HTTP_SERVICE_PORT - The port number
@@ -40,50 +32,63 @@ or
* ZIPKIN_COLLECTOR_THRIFT_SERVICE_HOST - The Scribe (Thrift RPC) hostname
* ZIPKIN_COLLECTOR_THRIFT_SERVICE_PORT - The port number
-This makes it easy to use camel-zipkin in container platforms where the
-platform can run your application in a linux container where service
-configurations are provided as environment variables.
+This makes it easy to use camel-zipkin in container platforms where the platform can run your application in a linux container where service configurations are provided as environment variables.
[[camel-zipkin-Options]]
== Options
[width="100%",cols="10%,10%,80%",options="header",]
|===
-|Option |Default |Description
-
-|rate |1.0f |Configures a rate that decides how many events should be traced by
-zipkin. The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f is
-10%).
-
-|spanReporter | |*Mandatory:* The reporter to use for sending zipkin span events to the
-zipkin server.
-
-|serviceName | | To use a global service name that matches all Camel events
-
-|clientServiceMappings | | Sets the *client* service mappings that matches Camel events to the
-given zipkin service name. The content is a Map<String, String> where the key is a pattern and the
-value is the service name. The pattern uses the rules from Intercept.
-
-|serverServiceMappings | | Sets the *server* service mappings that matches Camel events to the
-given zipkin service name. The content is a Map<String, String> where the key is a pattern and the
-value is the service name. The pattern uses the rules from Intercept.
-
-|excludePatterns | | Sets exclude pattern(s) that will disable tracing with zipkin for Camel
-messages that matches the pattern. The content is a Set<String> where the key is a pattern. The pattern
-uses the rules from Intercept.
-
-|includeMessageBody |false |Whether to include the Camel message body in the zipkin traces.
-This is not recommended for production usage, or when having big
-payloads. You can limit the size by configuring the
-xref:manual::faq/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.adoc[max
+|Option
+|Default
+|Description
+
+|rate
+|1.0f
+|Configures a rate that decides how many events should be traced by zipkin.
+The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f is 10%).
+
+|spanReporter
+|
+|*Mandatory:* The reporter to use for sending zipkin span events to the zipkin server.
+
+|serviceName
+|
+| To use a global service name that matches all Camel events
+
+|clientServiceMappings
+|
+| Sets the *client* service mappings that matches Camel events to the given zipkin service name.
+The content is a `Map<String, String>` where the key is a pattern and the value is the service name.
+The pattern uses the rules from Intercept.
+
+|serverServiceMappings
+|
+| Sets the *server* service mappings that matches Camel events to the given zipkin service name.
+The content is a `Map<String, String>` where the key is a pattern and the value is the service name.
+The pattern uses the rules from Intercept.
+
+|excludePatterns
+|
+| Sets exclude pattern(s) that will disable tracing with zipkin for Camel messages that matches the pattern.
+The content is a `Set<String>` where the key is a pattern.
+The pattern uses the rules from Intercept.
+
+|includeMessageBody
+|false
+|Whether to include the Camel message body in the zipkin traces.
+This is not recommended for production usage, or when having big payloads.
+You can limit the size by configuring the xref:manual::faq/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.adoc[max
debug log size].
-|includeMessageBodyStreams |false |Whether to include message bodies that are stream based in the zipkin
-traces. This requires enabling streamcaching on the
-routes or globally on the CamelContext. This is not recommended for production usage, or when having big
-payloads. You can limit the size by configuring the
-xref:manual::faq/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.adoc[max
+|includeMessageBodyStreams
+|false
+|Whether to include message bodies that are stream based in the zipkin traces.
+This requires enabling streamcaching on the routes or globally on the `CamelContext`.
+This is not recommended for production usage, or when having big payloads.
+You can limit the size by configuring the xref:manual::faq/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.adoc[max
debug log size].
+
|===
// spring-boot-auto-configure options: START
@@ -138,11 +143,10 @@ zipkin.setSpanReporter(AsyncReporter.create(sender));
zipkin.init(camelContext);
----
-The configuration above will trace all incoming and outgoing
-messages in Camel routes.
+The configuration above will trace all incoming and outgoing messages in Camel routes.
-To use ZipkinTracer in XML, all you need to do is to define scribe and
-zipkin tracer beans. Camel will automatically discover and use them.
+To use ZipkinTracer in XML, all you need to do is to define scribe and zipkin tracer beans.
+Camel will automatically discover and use them.
[source,xml]
----
@@ -168,22 +172,19 @@ zipkin tracer beans. Camel will automatically discover and use them.
[[camel-zipkin-ServiceName]]
== ServiceName
-However, if you want to map Camel endpoints to human friendly logical
-names, you can add mappings
+However, if you want to map Camel endpoints to human friendly logical names, you can add mappings
* ServiceName *
-You can configure a global service name that all events will fallback
-and use, such as:
+You can configure a global service name that all events will fallback and use, such as:
[source,java]
----
zipkin.setServiceName("invoices");
----
-This will use the same service name for all incoming and outgoing zipkin
-traces. If your application uses different services, you should map
-them to more finely grained client / server service mappings
+This will use the same service name for all incoming and outgoing zipkin traces.
+If your application uses different services, you should map them to more finely grained client / server service mappings
[[camel-zipkin-ClientandServerServiceMappings]]
== Client and Server Service Mappings
@@ -191,9 +192,8 @@ them to more finely grained client / server service mappings
* ClientServiceMappings
* ServerServiceMappings
-If your application hosts a service that others can call, you can map
-the Camel route endpoint to a server service mapping. For example,
-suppose your Camel application has the following route:
+If your application hosts a service that others can call, you can map the Camel route endpoint to a server service mapping.
+For example, suppose your Camel application has the following route:
[source,java]
----
@@ -201,30 +201,26 @@ from("activemq:queue:inbox")
.to("http:someserver/somepath");
----
-And you want to make that as a server service, you can add the following
-mapping:
+And you want to make that as a server service, you can add the following mapping:
[source,java]
----
zipkin.addServerServiceMapping("activemq:queue:inbox", "orders");
----
-Then when a message is consumed from that inbox queue, it becomes a
-zipkin server event with the service name 'orders'.
+Then when a message is consumed from that inbox queue, it becomes a zipkin server event with the service name 'orders'.
-Now suppose that the call to http:someserver/somepath is also a service,
-which you want to map to a client service name, which can be done as:
+Now suppose that the call to http:someserver/somepath is also a service, which you want to map to a client service name, which can be done as:
[source,java]
----
zipkin.addClientServiceMapping("http:someserver/somepath", "audit");
----
-Then in the same Camel application you have mapped incoming and outgoing
-endpoints to different zipkin service names.
+Then in the same Camel application you have mapped incoming and outgoing endpoints to different zipkin service names.
-You can use wildcards in the service mapping. To match all outgoing
-calls to the same HTTP server you can do:
+You can use wildcards in the service mapping.
+To match all outgoing calls to the same HTTP server you can do:
----
zipkin.addClientServiceMapping("http:someserver*", "audit");
@@ -235,40 +231,53 @@ zipkin.addClientServiceMapping("http:someserver*", "audit");
The service name mapping for server occurs using the following rules
-1. Is there an exclude pattern that matches the endpoint uri of the
-from endpoint? If yes then skip.
-2. Is there a match in the serviceServiceMapping that matches the
-endpoint uri of the from endpoint? If yes, then use the found service name
-3. Is there a match in the serviceServiceMapping that matches the route
-id of the current route? If yes, then use the found service name
-4. Is there a match in the serviceServiceMapping that matches the
-original route id where the exchange started? If yes, then use the found
-service name
-5. No service name was found, the exchange is not traced by zipkin
-
-The service name mapping for client occurs using the following rules
-
-1. Is there an exclude pattern that matches the endpoint uri of the
-from endpoint? If yes then skip.
-2. Is there a match in the clientServiceMapping that matches the
-endpoint uri of endpoint where the message is being sent to? If yes, then
-use the found service name
-3. Is there a match in the clientServiceMapping that matches the route
-id of the current route? If yes, then use the found service name
-4. Is there a match in the clientServiceMapping that matches the
-original route id where the exchange started? If yes, then use the found
-service name
-5. No service name was found, the exchange is not traced by zipkin
+. Is there an exclude pattern that matches the endpoint uri of the
+from endpoint?
++
+If yes then skip.
+
+. Is there a match in the serviceServiceMapping that matches the
+endpoint uri of the from endpoint?
++
+If yes, then use the found service name
+
+. Is there a match in the serviceServiceMapping that matches the route
+id of the current route?
++
+If yes, then use the found service name
+
+. Is there a match in the serviceServiceMapping that matches the original route id where the exchange started?
++
+If yes, then use the found service name
+
+. No service name was found, the exchange is not traced by zipkin
+
+The service name mapping for client occurs using the following rules:
+
+. Is there an exclude pattern that matches the endpoint uri of the from endpoint?
++
+If yes then skip.
+
+. Is there a match in the clientServiceMapping that matches the endpoint uri of endpoint where the message is being sent to?
++
+If yes, then use the found service name
+
+. Is there a match in the clientServiceMapping that matches the route id of the current route?
++
+If yes, then use the found service name
+
+. Is there a match in the clientServiceMapping that matches the original route id where the exchange started?
++
+If yes, then use the found service name
+
+. No service name was found, the exchange is not traced by zipkin
[[camel-zipkin-Noclientorservermappings]]
== No client or server mappings
-If there has been no configuration of client or server service mappings,
-CamelZipkin runs in a fallback mode, and uses endpoint
-uris as the service name.
+If there has been no configuration of client or server service mappings, CamelZipkin runs in a fallback mode, and uses endpoint uris as the service name.
-In the example above, this would mean the service names would be defined as
-if you add the following code yourself:
+In the example above, this would mean the service names would be defined as if you add the following code yourself:
[source,java]
----
@@ -276,15 +285,14 @@ zipkin.addServerServiceMapping("activemq:queue:inbox", "activemq:queue:inbox");
zipkin.addClientServiceMapping("http:someserver/somepath", "http:someserver/somepath");
----
-This is not a recommended approach, but gets you up and running quickly
-without doing any service name mappings. However, when you have multiple
-systems across your infrastructure, then you should consider using human-readable service names, that you map to instead of using the camel endpoint
-uris.
+This is not a recommended approach, but gets you up and running quickly without doing any service name mappings.
+However, when you have multiple systems across your infrastructure, then you should consider using human-readable service names, that you map to instead of using the camel endpoint uris.
[[camel-zipkin-CustomTags]]
== Custom Tags
-If you need to send custom tags to Zipkin server, add an exchange property with name "camel.client.customtags" and value as a Map of your custom tags. Refrain from adding too many custom tags in production environment.
+If you need to send custom tags to Zipkin server, add an exchange property with name "camel.client.customtags" and value as a Map of your custom tags.
+Refrain from adding too many custom tags in production environment.
Following is one example of how custom tags can be added:
@@ -298,14 +306,9 @@ exchange.setProperty("camel.client.customtags", customTags);
[[camel-zipkin-camel-zipin-starter]]
-== camel-zipin-starter
+== camel-zipkin-starter
-If you are using Spring Boot then you can add
-the `camel-zipkin-starter` dependency, and turn on zipkin by annotating
-the main class with `@CamelZipkin`. You can then configure camel-zipkin
-in the `application.properties` file where you can configure the
-hostname and port number for the Zipkin Server, and all the other
-options as listed in the options table above.
+If you are using Spring Boot then you can add the `camel-zipkin-starter` dependency, and turn on zipkin by annotating the main class with `@CamelZipkin`.
+You can then configure camel-zipkin in the `application.properties` file where you can configure the hostname and port number for the Zipkin Server, and all the other options as listed in the options table above.
-You can find an example of this in
-the https://github.com/apache/camel/tree/master/examples/camel-example-zipkin[camel-example-zipkin]
+You can find an example of this in the https://github.com/apache/camel/tree/master/examples/camel-example-zipkin[camel-example-zipkin]
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 72294e0..6bcac1e 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -194,7 +194,7 @@
<dependency>
<groupId>net.corda</groupId>
<artifactId>corda-rpc</artifactId>
- <version>4.0</version>
+ <version>4.1</version>
<exclusions>
<exclusion>
<groupId>co.paralleluniverse</groupId>