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 2016/04/01 13:56:19 UTC
[1/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
Repository: camel
Updated Branches:
refs/heads/master 072933264 -> f0056d6cc
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service2/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-zipkin/service2/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service2/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-zipkin/service2/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service2/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/resources/application.properties b/examples/camel-example-zipkin/service2/src/main/resources/application.properties
new file mode 100644
index 0000000..a8673a9
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/src/main/resources/application.properties
@@ -0,0 +1,37 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# the name of Camel
+camel.springboot.name=Service2
+camel.springboot.main-run-controller=true
+
+# configure zipkin
+camel.zipkin.host-name=192.168.99.100
+camel.zipkin.port=9410
+
+# the zipkin service name
+camel.zipkin.service-name=service2
+
+# include the message body in the zipkin traces
+camel.zipkin.include-message-body=true
+
+# logging to see the zipkin traces
+logging.level.org.apache.camel.zipkin=debug
+
+# the port number the service will use for accepting incoming HTTP requests
+jetty.port=9090
+
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service3/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/pom.xml b/examples/camel-example-zipkin/service3/pom.xml
new file mode 100644
index 0000000..e168eb1
--- /dev/null
+++ b/examples/camel-example-zipkin/service3/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-example-zipkin</artifactId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-zipkin-service3</artifactId>
+ <name>Camel :: Example :: Zipkin :: Service 3</name>
+ <description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
+
+ <properties>
+ <spring.boot-version>${spring-boot-version}</spring.boot-version>
+ </properties>
+
+ <!-- import Camel BOM -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- camel-core -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-zipkin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-undertow</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <plugins>
+ <!-- allows the routes to be run via 'mvn camel:run' -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <mainClass>sample.camel.Service3Application</mainClass>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java b/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java
new file mode 100644
index 0000000..b3ae208
--- /dev/null
+++ b/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.main.Main;
+
+public class Service3Application {
+
+ public static void main(String[] args) throws Exception {
+ Main main = new Main();
+ main.addRouteBuilder(new Service3Route());
+ main.run();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java b/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java
new file mode 100644
index 0000000..566d74b
--- /dev/null
+++ b/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.zipkin.ZipkinEventNotifier;
+
+public class Service3Route extends RouteBuilder {
+
+ @Override
+ public void configure() throws Exception {
+ ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
+ zipkin.setHostName("192.168.99.100");
+ zipkin.setPort(9410);
+ zipkin.setServiceName("service3");
+
+ // add zipkin to CamelContext
+ getContext().getManagementStrategy().addEventNotifier(zipkin);
+
+ from("undertow:http://0.0.0.0:7070/service3").routeId("service3")
+ .convertBodyTo(String.class)
+ .delay(simple("${random(1000,2000)}"))
+ .transform(simple("Bye: ${body}"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties b/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties
new file mode 100644
index 0000000..d04caeb
--- /dev/null
+++ b/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties
@@ -0,0 +1,28 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, stdout
+
+log4j.logger.org.apache.camel.zipkin=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/src/main/java/sample/camel/HelloBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/src/main/java/sample/camel/HelloBean.java b/examples/camel-example-zipkin/src/main/java/sample/camel/HelloBean.java
deleted file mode 100644
index 88a8fcc..0000000
--- a/examples/camel-example-zipkin/src/main/java/sample/camel/HelloBean.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * A bean that returns a message when you call the {@link #saySomething()} method.
- * <p/>
- * Uses <tt>@Component("myBean")</tt> to register this bean with the name <tt>myBean</tt>
- * that we use in the Camel route to lookup this bean.
- */
-@Component("myBean")
-public class HelloBean {
-
- @Value("${greeting}")
- private String say;
-
- public String saySomething() {
- return say;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/src/main/java/sample/camel/HelloCamelRouter.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/src/main/java/sample/camel/HelloCamelRouter.java b/examples/camel-example-zipkin/src/main/java/sample/camel/HelloCamelRouter.java
deleted file mode 100644
index 17f9bf6..0000000
--- a/examples/camel-example-zipkin/src/main/java/sample/camel/HelloCamelRouter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.stereotype.Component;
-
-/**
- * A simple Camel route that triggers from a timer and calls a bean and prints to system out.
- * <p/>
- * Use <tt>@Component</tt> to make Camel auto detect this route when starting.
- */
-@Component
-public class HelloCamelRouter extends RouteBuilder {
-
- @Override
- public void configure() throws Exception {
- from("timer:hello?period={{timer.period}}").routeId("client")
- .setExchangePattern(ExchangePattern.InOut)
- .transform(method("myBean", "saySomething"))
- .log("Saying ${body}")
- .to("seda:hello");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/src/main/java/sample/camel/ReplyCamelRouter.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/src/main/java/sample/camel/ReplyCamelRouter.java b/examples/camel-example-zipkin/src/main/java/sample/camel/ReplyCamelRouter.java
deleted file mode 100644
index 1cab297..0000000
--- a/examples/camel-example-zipkin/src/main/java/sample/camel/ReplyCamelRouter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.stereotype.Component;
-
-/**
- * A simple Camel route that triggers from a timer and calls a bean and prints to system out.
- * <p/>
- * Use <tt>@Component</tt> to make Camel auto detect this route when starting.
- */
-@Component
-public class ReplyCamelRouter extends RouteBuilder {
-
- @Override
- public void configure() throws Exception {
- from("seda:hello").routeId("server")
- .delay(simple("${random(1000,2000)}"))
- .transform(simple("You said ${body}"))
- .log("Replying with ${body}");
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/src/main/java/sample/camel/ZipkinCamelApplication.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/src/main/java/sample/camel/ZipkinCamelApplication.java b/examples/camel-example-zipkin/src/main/java/sample/camel/ZipkinCamelApplication.java
deleted file mode 100644
index 0b7bbb2..0000000
--- a/examples/camel-example-zipkin/src/main/java/sample/camel/ZipkinCamelApplication.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import org.apache.camel.zipkin.starter.CamelZipkin;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-//CHECKSTYLE:OFF
-/**
- * A Spring Boot application that starts the Camel Zipkin application.
- * <p/>
- * Notice we use the `@CamelZipkin` annotation to enable Camel with Zipkin.
- * The configuration of Zipkin is in the <tt>application.properties</tt> file.
- */
-@SpringBootApplication
-@CamelZipkin
-public class ZipkinCamelApplication {
-
- /**
- * A main method to start this application.
- */
- public static void main(String[] args) {
- SpringApplication.run(ZipkinCamelApplication.class, args);
- }
-
-}
-//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/src/main/resources/application.properties b/examples/camel-example-zipkin/src/main/resources/application.properties
deleted file mode 100644
index 515564d..0000000
--- a/examples/camel-example-zipkin/src/main/resources/application.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# the name of Camel
-camel.springboot.name=ZipkinCamel
-camel.springboot.main-run-controller=true
-
-# configure zipkin
-camel.zipkin.host-name=192.168.99.100
-camel.zipkin.port=9410
-
-# the name of the service
-camel.zipkin.service-name=hello
-
-# exclude the timer as it just triggers a new client request
-camel.zipkin.exclude-patterns=timer:hello*
-
-# include the message body in the zipkin traces
-camel.zipkin.include-message-body=true
-
-# logging to see the zipkin client/server events and span-ids
-logging.level.org.apache.camel.zipkin: DEBUG
-
-# properties used in the Camel route and beans
-# --------------------------------------------
-
-# what to say
-greeting = Hello World
-
-# how often to trigger the timer
-timer.period = 2000
-
-
[5/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
Posted by da...@apache.org.
CAMEL-9759: camel-zipkin - Instrument Camel. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3d95768
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3d95768
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3d95768
Branch: refs/heads/master
Commit: c3d95768ec473492489cdcc51487fbb6ecafde33
Parents: a8b941e
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 11:09:26 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:55:28 2016 +0200
----------------------------------------------------------------------
.../camel/zipkin/ZipkinEventNotifier.java | 2 +-
examples/camel-example-zipkin/README.md | 20 +-
examples/camel-example-zipkin/client/pom.xml | 113 +++++++++++
.../java/sample/camel/ClientApplication.java | 39 ++++
.../src/main/java/sample/camel/ClientRoute.java | 45 ++++
.../src/main/java/sample/camel/CounterBean.java | 32 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/META-INF/beans.xml | 18 ++
.../client/src/main/resources/log4j.properties | 28 +++
examples/camel-example-zipkin/pom.xml | 2 +-
examples/camel-example-zipkin/service1/pom.xml | 91 ++++-----
.../src/main/java/sample/camel/CounterBean.java | 32 ---
.../java/sample/camel/Service1Application.java | 41 ++--
.../main/java/sample/camel/Service1Route.java | 35 ++--
.../src/main/resources/META-INF/beans.xml | 18 --
.../src/main/resources/application.properties | 39 ++++
.../src/main/resources/log4j.properties | 28 ---
examples/camel-example-zipkin/service2/pom.xml | 79 ++++----
.../java/sample/camel/Service2Application.java | 23 +--
.../main/java/sample/camel/Service2Route.java | 20 +-
.../src/main/resources/application.properties | 39 ----
.../src/main/resources/log4j.properties | 28 +++
examples/camel-example-zipkin/service3/pom.xml | 95 ---------
.../java/sample/camel/Service3Application.java | 29 ---
.../main/java/sample/camel/Service3Route.java | 40 ----
.../src/main/resources/META-INF/LICENSE.txt | 203 -------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../src/main/resources/log4j.properties | 28 ---
29 files changed, 698 insertions(+), 694 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
index 85f5afc..b566495 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
@@ -635,7 +635,7 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
if (span.getSpan() != null) {
parentId = "" + span.getSpan().getParent_id();
}
- log.debug("serverResponse[service={}, traceId={}, spanId={}, parentId={}] [status=exchangeFailed]", serviceName, traceId, spanId, parentId);
+ log.debug("serverResponse[service={}, traceId={}, spanId={}, parentId={}] [status=exchangeCompleted]", serviceName, traceId, spanId, parentId);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/README.md b/examples/camel-example-zipkin/README.md
index a1e9ee3..000d1b9 100644
--- a/examples/camel-example-zipkin/README.md
+++ b/examples/camel-example-zipkin/README.md
@@ -6,12 +6,13 @@ This example shows how to use Camel with Zipkin to trace/timing all incoming and
The example requires a running Zipkin Server.
-The example includes two sub maven modules that implement
+The example includes three sub maven modules that implement
+- client
- service1
- service2
-Where service1 calls service2 using HTTP.
+Where client -> service1 -> service2 using HTTP.
### Configuration
@@ -30,17 +31,24 @@ $ mvn compile
### Run the example
-Then using two different shells and run service2 before service1.
+Then using three different shells and run service1 and service2 before the client.
```sh
-$ cd service2
+$ cd service1
$ mvn compile spring-boot:run
```
-When service2 is ready then start service1
+When service1 is ready then start service2
```sh
-$ cd service1
+$ cd service2
+$ mvn compile camel:run
+```
+
+And then start the client that calls service1 every 30th seconds.
+
+```sh
+$ cd client
$ mvn compile camel:run
```
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/pom.xml b/examples/camel-example-zipkin/client/pom.xml
new file mode 100644
index 0000000..204b0cc
--- /dev/null
+++ b/examples/camel-example-zipkin/client/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-example-zipkin</artifactId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-zipkin-client</artifactId>
+ <name>Camel :: Example :: Zipkin :: Client</name>
+ <description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
+
+ <properties>
+ <spring.boot-version>${spring-boot-version}</spring.boot-version>
+ </properties>
+
+ <!-- import Camel BOM -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- CDI API -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${cdi-api-1.2-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- camel-cdi -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-zipkin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+
+ <!-- logging -->
+
+
+ </dependencies>
+
+ <build>
+
+ <plugins>
+ <!-- allows the routes to be run via 'mvn camel:run' -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-weld</artifactId>
+ <version>${deltaspike-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se</artifactId>
+ <version>${weld2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
new file mode 100644
index 0000000..69db773
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.camel.cdi.ContextName;
+import org.apache.camel.management.event.CamelContextStartingEvent;
+import org.apache.camel.zipkin.ZipkinEventNotifier;
+
+@ContextName("Server1")
+public class ClientApplication {
+
+ public void setupCamel(@Observes CamelContextStartingEvent event) {
+ // create zipkin
+ ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
+ zipkin.setHostName("192.168.99.100");
+ zipkin.setPort(9410);
+ zipkin.addClientServiceMapping("http://localhost:9090/service1", "service1");
+
+ // add zipkin to CamelContext
+ event.getContext().getManagementStrategy().addEventNotifier(zipkin);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java
new file mode 100644
index 0000000..c11bc6e
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.zipkin.ZipkinEventNotifier;
+
+public class ClientRoute extends RouteBuilder {
+
+ @Override
+ public void configure() {
+ // you can configure the route rule with Java DSL here
+
+ // TODO: use CDI to setup Camel instead of here in the route
+
+ // create zipkin
+ ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
+ zipkin.setHostName("192.168.99.100");
+ zipkin.setPort(9410);
+ zipkin.addClientServiceMapping("http://localhost:9090/service1", "service1");
+
+ // add zipkin to CamelContext
+ getContext().getManagementStrategy().addEventNotifier(zipkin);
+
+ from("timer:trigger?exchangePattern=InOut&period=30s")
+ .bean("counterBean")
+ .to("http://localhost:9090/service1")
+ .log("Result: ${body}");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/java/sample/camel/CounterBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/java/sample/camel/CounterBean.java b/examples/camel-example-zipkin/client/src/main/java/sample/camel/CounterBean.java
new file mode 100644
index 0000000..0c27215
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/java/sample/camel/CounterBean.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+@Named("counterBean")
+public class CounterBean {
+
+ private int counter;
+
+ public String someMethod(String body) {
+ return "" + ++counter;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-zipkin/client/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-zipkin/client/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/resources/META-INF/beans.xml b/examples/camel-example-zipkin/client/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..112d56d
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/client/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/src/main/resources/log4j.properties b/examples/camel-example-zipkin/client/src/main/resources/log4j.properties
new file mode 100644
index 0000000..d04caeb
--- /dev/null
+++ b/examples/camel-example-zipkin/client/src/main/resources/log4j.properties
@@ -0,0 +1,28 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, stdout
+
+log4j.logger.org.apache.camel.zipkin=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/pom.xml b/examples/camel-example-zipkin/pom.xml
index 0017648..c9e8ebc 100644
--- a/examples/camel-example-zipkin/pom.xml
+++ b/examples/camel-example-zipkin/pom.xml
@@ -31,9 +31,9 @@
<description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
<modules>
+ <module>client</module>
<module>service1</module>
<module>service2</module>
- <module>service3</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/pom.xml b/examples/camel-example-zipkin/service1/pom.xml
index 092fee9..0b18648 100644
--- a/examples/camel-example-zipkin/service1/pom.xml
+++ b/examples/camel-example-zipkin/service1/pom.xml
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-example-zipkin</artifactId>
<version>2.18-SNAPSHOT</version>
</parent>
-
+
<artifactId>camel-example-zipkin-service1</artifactId>
<name>Camel :: Example :: Zipkin :: Service 1</name>
<description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
@@ -33,10 +33,17 @@
<spring.boot-version>${spring-boot-version}</spring.boot-version>
</properties>
- <!-- import Camel BOM -->
+ <!-- import Spring-Boot and Camel BOM -->
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>${project.version}</version>
@@ -48,66 +55,40 @@
<dependencies>
- <!-- CDI API -->
+ <!-- spring-boot -->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
- <scope>provided</scope>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
</dependency>
- <!-- camel-cdi -->
+ <!-- camel -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-cdi</artifactId>
+ <artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zipkin</artifactId>
+ <artifactId>camel-zipkin-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
</dependency>
- <!-- logging -->
-
-
</dependencies>
<build>
-
<plugins>
- <!-- allows the routes to be run via 'mvn camel:run' -->
<plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <version>${deltaspike-version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
- </dependency>
- </dependencies>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot-version}</version>
</plugin>
</plugins>
-
</build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java
deleted file mode 100644
index 0c27215..0000000
--- a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-@Singleton
-@Named("counterBean")
-public class CounterBean {
-
- private int counter;
-
- public String someMethod(String body) {
- return "" + ++counter;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
index 4bbd8a3..380f8c9 100644
--- a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
+++ b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,26 +16,27 @@
*/
package sample.camel;
-import javax.enterprise.event.Observes;
+import org.apache.camel.zipkin.starter.CamelZipkin;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.apache.camel.cdi.ContextName;
-import org.apache.camel.management.event.CamelContextStartingEvent;
-import org.apache.camel.zipkin.ZipkinEventNotifier;
-
-@ContextName("Server1")
+//CHECKSTYLE:OFF
+/**
+ * A Spring Boot application that starts the Camel Zipkin application.
+ * <p/>
+ * Notice we use the `@CamelZipkin` annotation to enable Camel with Zipkin.
+ * The configuration of Zipkin is in the <tt>application.properties</tt> file.
+ */
+@SpringBootApplication
+@CamelZipkin
public class Service1Application {
- public void setupCamel(@Observes CamelContextStartingEvent event) {
- // create zipkin
- ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
- zipkin.setHostName("192.168.99.100");
- zipkin.setPort(9410);
- zipkin.setServiceName("service1");
- // do not track timer as its an internal event to just get an event
- zipkin.addExcludePattern("timer:*");
-
- // add zipkin to CamelContext
- event.getContext().getManagementStrategy().addEventNotifier(zipkin);
+ /**
+ * A main method to start this application.
+ */
+ public static void main(String[] args) {
+ SpringApplication.run(Service1Application.class, args);
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
index f91ca5a..8fc4bd8 100644
--- a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
+++ b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,31 +17,20 @@
package sample.camel;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.zipkin.ZipkinEventNotifier;
+import org.springframework.stereotype.Component;
+@Component
public class Service1Route extends RouteBuilder {
@Override
- public void configure() {
- // you can configure the route rule with Java DSL here
+ public void configure() throws Exception {
+ from("jetty:http://0.0.0.0:{{service1.port}}/service1").routeId("service1")
+ .removeHeaders("CamelHttp*")
+ .convertBodyTo(String.class)
+ .delay(simple("${random(1000,2000)}"))
+ .transform(simple("Hello: ${body}"))
+ .to("http://0.0.0.0:{{service2.port}}/service2");
- // TODO: use CDI to setup Camel instead of here in the route
-
- // create zipkin
- ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
- zipkin.setHostName("192.168.99.100");
- zipkin.setPort(9410);
- zipkin.addClientServiceMapping("http://localhost:9090/service2", "service2");
-// zipkin.addClientServiceMapping("http://localhost:7070/service3", "service3");
-
- // add zipkin to CamelContext
- getContext().getManagementStrategy().addEventNotifier(zipkin);
-
- from("timer:trigger?exchangePattern=InOut&period=30s")
- .bean("counterBean")
- .to("http://localhost:9090/service2")
-// .to("http://localhost:7070/service3")
- .log("Result: ${body}");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 112d56d..0000000
--- a/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/application.properties b/examples/camel-example-zipkin/service1/src/main/resources/application.properties
new file mode 100644
index 0000000..9a5d71c
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/resources/application.properties
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# the name of Camel
+camel.springboot.name=Service1
+camel.springboot.main-run-controller=true
+
+# configure zipkin
+camel.zipkin.host-name=192.168.99.100
+camel.zipkin.port=9410
+
+# the zipkin service name
+camel.zipkin.server-service-mappings.*=service1
+camel.zipkin.client-service-mappings.*=service2
+
+# include the message body in the zipkin traces
+camel.zipkin.include-message-body=true
+
+# logging to see the zipkin traces
+logging.level.org.apache.camel.zipkin=debug
+
+# the port number the service will use for accepting incoming HTTP requests
+service1.port=9090
+service2.port=7070
+
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties b/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties
deleted file mode 100644
index d04caeb..0000000
--- a/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, stdout
-
-log4j.logger.org.apache.camel.zipkin=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/pom.xml b/examples/camel-example-zipkin/service2/pom.xml
index a28b997..ab4da3d 100644
--- a/examples/camel-example-zipkin/service2/pom.xml
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-example-zipkin</artifactId>
<version>2.18-SNAPSHOT</version>
</parent>
-
+
<artifactId>camel-example-zipkin-service2</artifactId>
<name>Camel :: Example :: Zipkin :: Service 2</name>
<description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
@@ -33,17 +33,10 @@
<spring.boot-version>${spring-boot-version}</spring.boot-version>
</properties>
- <!-- import Spring-Boot and Camel BOM -->
+ <!-- import Camel BOM -->
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>${project.version}</version>
@@ -55,40 +48,48 @@
<dependencies>
- <!-- spring-boot -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
-
- <!-- camel -->
+ <!-- camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
+ <artifactId>camel-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zipkin-starter</artifactId>
+ <artifactId>camel-zipkin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
+ <artifactId>camel-undertow</artifactId>
</dependency>
</dependencies>
<build>
+
<plugins>
+ <!-- allows the routes to be run via 'mvn camel:run' -->
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot-version}</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <mainClass>sample.camel.Service2Application</mainClass>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
+
</build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
index 6fe12a8..851f73d 100644
--- a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
+++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
@@ -16,27 +16,14 @@
*/
package sample.camel;
-import org.apache.camel.zipkin.starter.CamelZipkin;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.apache.camel.main.Main;
-//CHECKSTYLE:OFF
-/**
- * A Spring Boot application that starts the Camel Zipkin application.
- * <p/>
- * Notice we use the `@CamelZipkin` annotation to enable Camel with Zipkin.
- * The configuration of Zipkin is in the <tt>application.properties</tt> file.
- */
-@SpringBootApplication
-@CamelZipkin
public class Service2Application {
- /**
- * A main method to start this application.
- */
- public static void main(String[] args) {
- SpringApplication.run(Service2Application.class, args);
+ public static void main(String[] args) throws Exception {
+ Main main = new Main();
+ main.addRouteBuilder(new Service2Route());
+ main.run();
}
}
-//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
index e81f152..09d569d 100644
--- a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
+++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
@@ -17,20 +17,24 @@
package sample.camel;
import org.apache.camel.builder.RouteBuilder;
-import org.springframework.stereotype.Component;
+import org.apache.camel.zipkin.ZipkinEventNotifier;
-@Component
public class Service2Route extends RouteBuilder {
@Override
public void configure() throws Exception {
- from("jetty:http://0.0.0.0:{{service2.port}}/service2").routeId("service2")
- .removeHeaders("CamelHttp*")
- .convertBodyTo(String.class)
- .delay(simple("${random(1000,2000)}"))
- .transform(simple("Hello: ${body}"))
- .to("http://0.0.0.0:{{service3.port}}/service3");
+ ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
+ zipkin.setHostName("192.168.99.100");
+ zipkin.setPort(9410);
+ zipkin.setServiceName("service2");
+ // add zipkin to CamelContext
+ getContext().getManagementStrategy().addEventNotifier(zipkin);
+
+ from("undertow:http://0.0.0.0:7070/service2").routeId("service2")
+ .convertBodyTo(String.class)
+ .delay(simple("${random(1000,2000)}"))
+ .transform(simple("Bye: ${body}"));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service2/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/resources/application.properties b/examples/camel-example-zipkin/service2/src/main/resources/application.properties
deleted file mode 100644
index 5212f4e..0000000
--- a/examples/camel-example-zipkin/service2/src/main/resources/application.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# the name of Camel
-camel.springboot.name=Service2
-camel.springboot.main-run-controller=true
-
-# configure zipkin
-camel.zipkin.host-name=192.168.99.100
-camel.zipkin.port=9410
-
-# the zipkin service name
-camel.zipkin.server-service-mappings.*=service2
-camel.zipkin.client-service-mappings.*=service3
-
-# include the message body in the zipkin traces
-camel.zipkin.include-message-body=true
-
-# logging to see the zipkin traces
-logging.level.org.apache.camel.zipkin=debug
-
-# the port number the service will use for accepting incoming HTTP requests
-service2.port=9090
-service3.port=7070
-
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/resources/log4j.properties b/examples/camel-example-zipkin/service2/src/main/resources/log4j.properties
new file mode 100644
index 0000000..d04caeb
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/src/main/resources/log4j.properties
@@ -0,0 +1,28 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, stdout
+
+log4j.logger.org.apache.camel.zipkin=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service3/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/pom.xml b/examples/camel-example-zipkin/service3/pom.xml
deleted file mode 100644
index e168eb1..0000000
--- a/examples/camel-example-zipkin/service3/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-example-zipkin</artifactId>
- <version>2.18-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-zipkin-service3</artifactId>
- <name>Camel :: Example :: Zipkin :: Service 3</name>
- <description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
-
- <properties>
- <spring.boot-version>${spring-boot-version}</spring.boot-version>
- </properties>
-
- <!-- import Camel BOM -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <!-- camel-core -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-zipkin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
-
- <plugins>
- <!-- allows the routes to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <mainClass>sample.camel.Service3Application</mainClass>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
-
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java b/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java
deleted file mode 100644
index b3ae208..0000000
--- a/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Application.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import org.apache.camel.main.Main;
-
-public class Service3Application {
-
- public static void main(String[] args) throws Exception {
- Main main = new Main();
- main.addRouteBuilder(new Service3Route());
- main.run();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java b/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java
deleted file mode 100644
index 566d74b..0000000
--- a/examples/camel-example-zipkin/service3/src/main/java/sample/camel/Service3Route.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.camel;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.zipkin.ZipkinEventNotifier;
-
-public class Service3Route extends RouteBuilder {
-
- @Override
- public void configure() throws Exception {
- ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
- zipkin.setHostName("192.168.99.100");
- zipkin.setPort(9410);
- zipkin.setServiceName("service3");
-
- // add zipkin to CamelContext
- getContext().getManagementStrategy().addEventNotifier(zipkin);
-
- from("undertow:http://0.0.0.0:7070/service3").routeId("service3")
- .convertBodyTo(String.class)
- .delay(simple("${random(1000,2000)}"))
- .transform(simple("Bye: ${body}"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-zipkin/service3/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-zipkin/service3/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d95768/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties b/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties
deleted file mode 100644
index d04caeb..0000000
--- a/examples/camel-example-zipkin/service3/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, stdout
-
-log4j.logger.org.apache.camel.zipkin=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
[6/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
Posted by da...@apache.org.
CAMEL-9759: camel-zipkin - Instrument Camel. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0056d6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0056d6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0056d6c
Branch: refs/heads/master
Commit: f0056d6cc7f7f1a9cd7762e66baf35a4fdd3030a
Parents: c3d9576
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 12:56:05 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:55:36 2016 +0200
----------------------------------------------------------------------
components/camel-zipkin/pom.xml | 4 ++--
.../apache/camel/zipkin/ZipkinEventNotifier.java | 17 ++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f0056d6c/components/camel-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index a93f01e..72ea58f 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -76,8 +76,8 @@
<configuration>
<!-- needed for testing auto configure -->
<environmentVariables>
- <ZIPKIN_SERVICE_HOST>192.168.99.100</ZIPKIN_SERVICE_HOST>
- <ZIPKIN_SERVICE_PORT>9410</ZIPKIN_SERVICE_PORT>
+ <ZIPKIN_COLLECTOR_SERVICE_HOST>192.168.99.100</ZIPKIN_COLLECTOR_SERVICE_HOST>
+ <ZIPKIN_COLLECTOR_SERVICE_PORT>9410</ZIPKIN_COLLECTOR_SERVICE_PORT>
</environmentVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/f0056d6c/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
index b566495..5135557 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
@@ -73,15 +73,18 @@ import static org.apache.camel.builder.ExpressionBuilder.routeIdExpression;
* endpoint uris in the names.
* <p/>
* Camel will auto-configure a {@link ScribeSpanCollector} if no SpanCollector explicit has been configured, and
- * if the hostname and port has been configured as environment variables
+ * if the hostname and port to the span collector has been configured as environment variables
* <ul>
- * <li>ZIPKIN_SERVICE_HOST - The hostname</li>
- * <li>ZIPKIN_SERVICE_PORT - The port number</li>
+ * <li>ZIPKIN_COLLECTOR_SERVICE_HOST - The hostname</li>
+ * <li>ZIPKIN_COLLECTOR_SERVICE_PORT - The port number</li>
* </ul>
*/
@ManagedResource(description = "Managing ZipkinEventNotifier")
public class ZipkinEventNotifier extends EventNotifierSupport implements StatefulService, CamelContextAware {
+ private final Map<String, Brave> braves = new HashMap<>();
+ private transient boolean useFallbackServiceNames;
+
private CamelContext camelContext;
private String hostName;
private int port;
@@ -90,9 +93,7 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
private Map<String, String> clientServiceMappings = new HashMap<>();
private Map<String, String> serverServiceMappings = new HashMap<>();
private Set<String> excludePatterns = new HashSet<>();
- private Map<String, Brave> braves = new HashMap<>();
private boolean includeMessageBody;
- private boolean useFallbackServiceNames;
public ZipkinEventNotifier() {
}
@@ -247,8 +248,8 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
spanCollector = new ScribeSpanCollector(hostName, port);
} else {
// is there a zipkin service setup as ENV variable to auto register a scribe span collector
- String host = new ServiceHostPropertiesFunction().apply("zipkin");
- String port = new ServicePortPropertiesFunction().apply("zipkin");
+ String host = new ServiceHostPropertiesFunction().apply("zipkin-collector");
+ String port = new ServicePortPropertiesFunction().apply("zipkin-collector");
if (ObjectHelper.isNotEmpty(host) && ObjectHelper.isNotEmpty(port)) {
log.info("Auto-configuring Zipkin ScribeSpanCollector using host: {} and port: {}", host, port);
int num = camelContext.getTypeConverter().mandatoryConvertTo(Integer.class, port);
@@ -288,6 +289,8 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
if (spanCollector instanceof Closeable) {
IOHelper.close((Closeable) spanCollector);
}
+
+ braves.clear();
}
@Override
[3/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
Posted by da...@apache.org.
CAMEL-9759: camel-zipkin - Instrument Camel. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9da3a6b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9da3a6b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9da3a6b
Branch: refs/heads/master
Commit: a9da3a6b36a8a772efc9749966a6bc5c1d89bef1
Parents: 4dc5b5e
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 10:03:22 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:55:12 2016 +0200
----------------------------------------------------------------------
components/camel-zipkin/pom.xml | 2 +-
.../camel/zipkin/ZipkinEventNotifier.java | 31 ++++++++++++--------
2 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a9da3a6b/components/camel-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 7ae9d26..a93f01e 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-zipkin</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Zookeeper</name>
+ <name>Camel :: Zipkin</name>
<description>Camel Zipkin Support</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/a9da3a6b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
index f8e11ff..8f3c6e2 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
@@ -268,16 +268,12 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
for (Map.Entry<String, String> entry : clientServiceMappings.entrySet()) {
String pattern = entry.getKey();
String serviceName = entry.getValue();
- Brave brave = braves.get(pattern);
- if (brave == null) {
- Brave.Builder builder = new Brave.Builder(serviceName);
- builder = builder.traceSampler(Sampler.create(rate));
- if (spanCollector != null) {
- builder = builder.spanCollector(spanCollector);
- }
- brave = builder.build();
- braves.put(serviceName, brave);
- }
+ createBraveForService(pattern, serviceName);
+ }
+ for (Map.Entry<String, String> entry : serverServiceMappings.entrySet()) {
+ String pattern = entry.getKey();
+ String serviceName = entry.getValue();
+ createBraveForService(pattern, serviceName);
}
ServiceHelper.startService(spanCollector);
@@ -422,6 +418,19 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
}
}
+ private void createBraveForService(String pattern, String serviceName) {
+ Brave brave = braves.get(pattern);
+ if (brave == null && !braves.containsKey(serviceName)) {
+ Brave.Builder builder = new Brave.Builder(serviceName);
+ builder = builder.traceSampler(Sampler.create(rate));
+ if (spanCollector != null) {
+ builder = builder.spanCollector(spanCollector);
+ }
+ brave = builder.build();
+ braves.put(serviceName, brave);
+ }
+ }
+
private Brave getBrave(String serviceName) {
Brave brave = null;
if (serviceName != null) {
@@ -508,8 +517,6 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
binder.setCurrentSpan(span);
}
- brave.
-
brave.clientRequestInterceptor().handle(new ZipkinClientRequestAdapter(this, serviceName, event.getExchange(), event.getEndpoint()));
// store span after request
[4/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
Posted by da...@apache.org.
CAMEL-9759: camel-zipkin - Instrument Camel. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8b941e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8b941e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8b941e5
Branch: refs/heads/master
Commit: a8b941e59c89db995431b367a76618ac359d5d33
Parents: a9da3a6
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 10:21:10 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:55:21 2016 +0200
----------------------------------------------------------------------
.../camel/zipkin/ZipkinEventNotifier.java | 46 ++++++++++----------
.../org/apache/camel/zipkin/ZipkinHelper.java | 2 +-
.../zipkin/ZipkinServerRequestAdapter.java | 4 +-
.../org/apache/camel/zipkin/ZipkinState.java | 10 ++++-
.../main/java/sample/camel/Service1Route.java | 4 +-
examples/camel-example-zipkin/service2/pom.xml | 4 ++
.../main/java/sample/camel/Service2Route.java | 7 ++-
.../src/main/resources/application.properties | 6 ++-
8 files changed, 51 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
index 8f3c6e2..85f5afc 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
@@ -501,7 +501,8 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
}
private void clientRequest(Brave brave, String serviceName, ExchangeSendingEvent event) {
- ClientSpanThreadBinder binder = brave.clientSpanThreadBinder();
+ ClientSpanThreadBinder clientBinder = brave.clientSpanThreadBinder();
+ ServerSpanThreadBinder serverBinder = brave.serverSpanThreadBinder();
// reuse existing span if we do multiple requests from the same
ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
@@ -509,21 +510,22 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
state = new ZipkinState();
event.getExchange().setProperty(ZipkinState.KEY, state);
}
+ // need to store the last span in use whether it was a server or client based span
Object last = state.getLast();
if (last != null && last instanceof Span) {
- binder.setCurrentSpan((Span) last);
+ clientBinder.setCurrentSpan((Span) last);
} else if (last != null && last instanceof ServerSpan) {
- Span span = ((ServerSpan) last).getSpan();
- binder.setCurrentSpan(span);
+ serverBinder.setCurrentSpan((ServerSpan) last);
}
brave.clientRequestInterceptor().handle(new ZipkinClientRequestAdapter(this, serviceName, event.getExchange(), event.getEndpoint()));
// store span after request
- Span span = binder.getCurrentClientSpan();
+ Span span = clientBinder.getCurrentClientSpan();
state.pushClientSpan(span);
// and reset binder
- binder.setCurrentSpan(null);
+ clientBinder.setCurrentSpan(null);
+ serverBinder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
String traceId = "<null>";
@@ -546,16 +548,16 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
Span span = null;
ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
if (state != null) {
+ // only process if it was a zipkin client event
span = state.popClientSpan();
}
if (span != null) {
- // only process if it was a zipkin client event
- ClientSpanThreadBinder binder = brave.clientSpanThreadBinder();
- binder.setCurrentSpan(span);
+ ClientSpanThreadBinder clientBinder = brave.clientSpanThreadBinder();
+ clientBinder.setCurrentSpan(span);
brave.clientResponseInterceptor().handle(new ZipkinClientResponseAdaptor(this, event.getExchange(), event.getEndpoint()));
// and reset binder
- binder.setCurrentSpan(null);
+ clientBinder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
String traceId = "" + span.getTrace_id();
@@ -567,7 +569,7 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
}
private void serverRequest(Brave brave, String serviceName, ExchangeCreatedEvent event) {
- ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
+ ServerSpanThreadBinder serverBinder = brave.serverSpanThreadBinder();
// reuse existing span if we do multiple requests from the same
ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
@@ -577,16 +579,16 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
}
Object last = state.getLast();
if (last != null && last instanceof ServerSpan) {
- binder.setCurrentSpan((ServerSpan) last);
+ serverBinder.setCurrentSpan((ServerSpan) last);
}
brave.serverRequestInterceptor().handle(new ZipkinServerRequestAdapter(this, event.getExchange()));
// store span after request
- ServerSpan span = binder.getCurrentServerSpan();
+ ServerSpan span = serverBinder.getCurrentServerSpan();
state.pushServerSpan(span);
// and reset binder
- binder.setCurrentSpan(null);
+ serverBinder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
String traceId = "<null>";
@@ -609,16 +611,16 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
ServerSpan span = null;
ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
if (state != null) {
+ // only process if it was a zipkin server event
span = state.popServerSpan();
}
if (span != null) {
- // only process if it was a zipkin server event
- ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
- binder.setCurrentSpan(span);
+ ServerSpanThreadBinder serverBinder = brave.serverSpanThreadBinder();
+ serverBinder.setCurrentSpan(span);
brave.serverResponseInterceptor().handle(new ZipkinServerResponseAdapter(this, event.getExchange()));
// and reset binder
- binder.setCurrentSpan(null);
+ serverBinder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
String traceId = "<null>";
@@ -642,16 +644,16 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
ServerSpan span = null;
ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
if (state != null) {
+ // only process if it was a zipkin server event
span = state.popServerSpan();
}
if (span != null) {
- // only process if it was a zipkin server event
- ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
- binder.setCurrentSpan(span);
+ ServerSpanThreadBinder serverBinder = brave.serverSpanThreadBinder();
+ serverBinder.setCurrentSpan(span);
brave.serverResponseInterceptor().handle(new ZipkinServerResponseAdapter(this, event.getExchange()));
// and reset binder
- binder.setCurrentSpan(null);
+ serverBinder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
String traceId = "<null>";
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
index 630f828..96d86b7 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
@@ -27,7 +27,7 @@ public final class ZipkinHelper {
private ZipkinHelper() {
}
- public static SpanId getSpanId(String traceId, String spanId, String parentSpanId) {
+ public static SpanId createSpanId(String traceId, String spanId, String parentSpanId) {
if (parentSpanId != null) {
return SpanId.create(IdConversion.convertToLong(traceId), IdConversion.convertToLong(spanId), IdConversion.convertToLong(parentSpanId));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
index 0d7605d..76eadad 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
@@ -30,7 +30,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.util.MessageHelper;
import org.apache.camel.util.URISupport;
-import static org.apache.camel.zipkin.ZipkinHelper.getSpanId;
+import static org.apache.camel.zipkin.ZipkinHelper.createSpanId;
public class ZipkinServerRequestAdapter implements ServerRequestAdapter {
@@ -58,7 +58,7 @@ public class ZipkinServerRequestAdapter implements ServerRequestAdapter {
String spanId = exchange.getIn().getHeader(ZipkinConstants.SPAN_ID, String.class);
String parentSpanId = exchange.getIn().getHeader(ZipkinConstants.PARENT_SPAN_ID, String.class);
if (traceId != null && spanId != null) {
- SpanId span = getSpanId(traceId, spanId, parentSpanId);
+ SpanId span = createSpanId(traceId, spanId, parentSpanId);
return TraceData.builder().sample(true).spanId(span).build();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
index d09af34..0c9ed83 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
@@ -20,8 +20,16 @@ import java.util.Stack;
import com.github.kristofa.brave.ServerSpan;
import com.twitter.zipkin.gen.Span;
+import org.apache.camel.Exchange;
-public class ZipkinState {
+/**
+ * The state of the zipkin trace which we store on the {@link Exchange}
+ * <p/>
+ * This is needed to keep track of of correlating when an existing span
+ * is calling downstream service(s) and therefore must be able to correlate
+ * those service calls with the parent span.
+ */
+public final class ZipkinState {
public static final String KEY = "CamelZipkinState";
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
index 7e1be20..f91ca5a 100644
--- a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
+++ b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
@@ -32,7 +32,7 @@ public class Service1Route extends RouteBuilder {
zipkin.setHostName("192.168.99.100");
zipkin.setPort(9410);
zipkin.addClientServiceMapping("http://localhost:9090/service2", "service2");
- zipkin.addClientServiceMapping("http://localhost:7070/service3", "service3");
+// zipkin.addClientServiceMapping("http://localhost:7070/service3", "service3");
// add zipkin to CamelContext
getContext().getManagementStrategy().addEventNotifier(zipkin);
@@ -40,7 +40,7 @@ public class Service1Route extends RouteBuilder {
from("timer:trigger?exchangePattern=InOut&period=30s")
.bean("counterBean")
.to("http://localhost:9090/service2")
- .to("http://localhost:7070/service3")
+// .to("http://localhost:7070/service3")
.log("Result: ${body}");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/examples/camel-example-zipkin/service2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/pom.xml b/examples/camel-example-zipkin/service2/pom.xml
index d037c9a..a28b997 100644
--- a/examples/camel-example-zipkin/service2/pom.xml
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -74,6 +74,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
index e95582b..e81f152 100644
--- a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
+++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
@@ -24,10 +24,13 @@ public class Service2Route extends RouteBuilder {
@Override
public void configure() throws Exception {
- from("jetty:http://0.0.0.0:{{jetty.port}}/service2").routeId("service2")
+ from("jetty:http://0.0.0.0:{{service2.port}}/service2").routeId("service2")
+ .removeHeaders("CamelHttp*")
.convertBodyTo(String.class)
.delay(simple("${random(1000,2000)}"))
- .transform(simple("Hello: ${body}"));
+ .transform(simple("Hello: ${body}"))
+ .to("http://0.0.0.0:{{service3.port}}/service3");
+
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8b941e5/examples/camel-example-zipkin/service2/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/resources/application.properties b/examples/camel-example-zipkin/service2/src/main/resources/application.properties
index a8673a9..5212f4e 100644
--- a/examples/camel-example-zipkin/service2/src/main/resources/application.properties
+++ b/examples/camel-example-zipkin/service2/src/main/resources/application.properties
@@ -24,7 +24,8 @@ camel.zipkin.host-name=192.168.99.100
camel.zipkin.port=9410
# the zipkin service name
-camel.zipkin.service-name=service2
+camel.zipkin.server-service-mappings.*=service2
+camel.zipkin.client-service-mappings.*=service3
# include the message body in the zipkin traces
camel.zipkin.include-message-body=true
@@ -33,5 +34,6 @@ camel.zipkin.include-message-body=true
logging.level.org.apache.camel.zipkin=debug
# the port number the service will use for accepting incoming HTTP requests
-jetty.port=9090
+service2.port=9090
+service3.port=7070
[2/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
Posted by da...@apache.org.
CAMEL-9759: camel-zipkin - Instrument Camel. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4dc5b5e4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dc5b5e4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dc5b5e4
Branch: refs/heads/master
Commit: 4dc5b5e484381655e407c590239d4ed90a36b705
Parents: 0729332
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 06:42:15 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:55:01 2016 +0200
----------------------------------------------------------------------
.../zipkin/starter/ZipkinAutoConfiguration.java | 7 +-
.../starter/ZipkinConfigurationProperties.java | 26 +-
components/camel-zipkin/pom.xml | 4 +-
.../camel/zipkin/ZipkinEventNotifier.java | 305 ++++++++++++++-----
.../org/apache/camel/zipkin/ZipkinState.java | 65 ++++
.../camel/zipkin/ZipkinRouteConcurrentTest.java | 4 +-
.../camel/zipkin/ZipkinSimpleRouteTest.java | 2 +-
.../apache/camel/zipkin/ZipkinTwoRouteTest.java | 6 +-
.../scribe/ZipkinAutoConfigureScribe.java | 3 +-
.../zipkin/scribe/ZipkinOneRouteScribe.java | 3 +-
.../scribe/ZipkinRouteConcurrentScribe.java | 86 ------
.../zipkin/scribe/ZipkinSimpleRouteScribe.java | 3 +-
.../zipkin/scribe/ZipkinTimerRouteScribe.java | 3 +-
.../zipkin/scribe/ZipkinTwoRouteScribe.java | 6 +-
examples/camel-example-zipkin/README.md | 39 ++-
examples/camel-example-zipkin/pom.xml | 105 ++-----
examples/camel-example-zipkin/service1/pom.xml | 113 +++++++
.../src/main/java/sample/camel/CounterBean.java | 32 ++
.../java/sample/camel/Service1Application.java | 41 +++
.../main/java/sample/camel/Service1Route.java | 47 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/META-INF/beans.xml | 18 ++
.../src/main/resources/log4j.properties | 28 ++
examples/camel-example-zipkin/service2/pom.xml | 90 ++++++
.../java/sample/camel/Service2Application.java | 42 +++
.../main/java/sample/camel/Service2Route.java | 33 ++
.../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/application.properties | 37 +++
examples/camel-example-zipkin/service3/pom.xml | 95 ++++++
.../java/sample/camel/Service3Application.java | 29 ++
.../main/java/sample/camel/Service3Route.java | 40 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/log4j.properties | 28 ++
.../src/main/java/sample/camel/HelloBean.java | 38 ---
.../java/sample/camel/HelloCamelRouter.java | 40 ---
.../java/sample/camel/ReplyCamelRouter.java | 39 ---
.../sample/camel/ZipkinCamelApplication.java | 42 ---
.../src/main/resources/application.properties | 47 ---
41 files changed, 1693 insertions(+), 495 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java
index 0466d34..5f750a8 100644
--- a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java
+++ b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java
@@ -46,8 +46,11 @@ public class ZipkinAutoConfiguration {
if (config.getExcludePatterns() != null) {
notifier.setExcludePatterns(config.getExcludePatterns());
}
- if (config.getServiceMappings() != null) {
- notifier.setServiceMappings(config.getServiceMappings());
+ if (config.getClientServiceMappings() != null) {
+ notifier.setClientServiceMappings(config.getClientServiceMappings());
+ }
+ if (config.getServerServiceMappings() != null) {
+ notifier.setServerServiceMappings(config.getServerServiceMappings());
}
notifier.setIncludeMessageBody(config.isIncludeMessageBody());
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
index 18b95e8..a342a69 100644
--- a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
+++ b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
@@ -59,10 +59,16 @@ public class ZipkinConfigurationProperties {
private Set<String> excludePatterns;
/**
- * Sets service mapping(s) that matches Camel events to the given zipkin service name.
+ * 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.
*/
- private Map<String, String> serviceMappings;
+ private Map<String, String> clientServiceMappings;
+
+ /**
+ * 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.
+ */
+ private Map<String, String> serverServiceMappings;
// Getters & setters
@@ -114,11 +120,19 @@ public class ZipkinConfigurationProperties {
this.excludePatterns = excludePatterns;
}
- public Map<String, String> getServiceMappings() {
- return serviceMappings;
+ public Map<String, String> getClientServiceMappings() {
+ return clientServiceMappings;
+ }
+
+ public void setClientServiceMappings(Map<String, String> clientServiceMappings) {
+ this.clientServiceMappings = clientServiceMappings;
+ }
+
+ public Map<String, String> getServerServiceMappings() {
+ return serverServiceMappings;
}
- public void setServiceMappings(Map<String, String> serviceMappings) {
- this.serviceMappings = serviceMappings;
+ public void setServerServiceMappings(Map<String, String> serverServiceMappings) {
+ this.serverServiceMappings = serverServiceMappings;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 9473ef2..7ae9d26 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -77,7 +77,7 @@
<!-- needed for testing auto configure -->
<environmentVariables>
<ZIPKIN_SERVICE_HOST>192.168.99.100</ZIPKIN_SERVICE_HOST>
- <ZIPKIN_SERVICE_PORT>9401</ZIPKIN_SERVICE_PORT>
+ <ZIPKIN_SERVICE_PORT>9410</ZIPKIN_SERVICE_PORT>
</environmentVariables>
</configuration>
</plugin>
@@ -98,7 +98,7 @@
<reuseForks>true</reuseForks>
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
<includes>
- <include>**/*ScribeTest.java</include>
+ <include>**/*Scribe.java</include>
</includes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
index 3d91c6f..f8e11ff 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinEventNotifier.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -87,7 +87,8 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
private int port;
private float rate = 1.0f;
private SpanCollector spanCollector;
- private Map<String, String> serviceMappings = new HashMap<>();
+ private Map<String, String> clientServiceMappings = new HashMap<>();
+ private Map<String, String> serverServiceMappings = new HashMap<>();
private Set<String> excludePatterns = new HashSet<>();
private Map<String, Brave> braves = new HashMap<>();
private boolean includeMessageBody;
@@ -152,33 +153,53 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
}
public String getServiceName() {
- return serviceMappings.get("*");
+ return clientServiceMappings.get("*");
}
/**
* To use a global service name that matches all Camel events
*/
public void setServiceName(String serviceName) {
- serviceMappings.put("*", serviceName);
+ clientServiceMappings.put("*", serviceName);
+ serverServiceMappings.put("*", serviceName);
}
- public Map<String, String> getServiceMappings() {
- return serviceMappings;
+ public Map<String, String> getClientServiceMappings() {
+ return clientServiceMappings;
}
- public void setServiceMappings(Map<String, String> serviceMappings) {
- this.serviceMappings = serviceMappings;
+ public void setClientServiceMappings(Map<String, String> clientServiceMappings) {
+ this.clientServiceMappings = clientServiceMappings;
}
/**
- * Adds a service mapping that matches Camel events to the given zipkin service name.
+ * Adds a client service mapping that matches Camel events to the given zipkin service name.
* See more details at the class javadoc.
*
* @param pattern the pattern such as route id, endpoint url
* @param serviceName the zipkin service name
*/
- public void addServiceMapping(String pattern, String serviceName) {
- serviceMappings.put(pattern, serviceName);
+ public void addClientServiceMapping(String pattern, String serviceName) {
+ clientServiceMappings.put(pattern, serviceName);
+ }
+
+ public Map<String, String> getServerServiceMappings() {
+ return serverServiceMappings;
+ }
+
+ public void setServerServiceMappings(Map<String, String> serverServiceMappings) {
+ this.serverServiceMappings = serverServiceMappings;
+ }
+
+ /**
+ * Adds a server service mapping that matches Camel events to the given zipkin service name.
+ * See more details at the class javadoc.
+ *
+ * @param pattern the pattern such as route id, endpoint url
+ * @param serviceName the zipkin service name
+ */
+ public void addServerServiceMapping(String pattern, String serviceName) {
+ serverServiceMappings.put(pattern, serviceName);
}
public Set<String> getExcludePatterns() {
@@ -238,13 +259,13 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
ObjectHelper.notNull(spanCollector, "SpanCollector", this);
- if (serviceMappings.isEmpty()) {
+ if (clientServiceMappings.isEmpty()) {
log.warn("No service name(s) has been configured. Camel will fallback and use endpoint uris as service names.");
useFallbackServiceNames = true;
}
// create braves mapped per service name
- for (Map.Entry<String, String> entry : serviceMappings.entrySet()) {
+ for (Map.Entry<String, String> entry : clientServiceMappings.entrySet()) {
String pattern = entry.getKey();
String serviceName = entry.getValue();
Brave brave = braves.get(pattern);
@@ -282,7 +303,17 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
|| event instanceof ExchangeFailedEvent;
}
- private String getServiceName(Exchange exchange, Endpoint endpoint) {
+ private String getServiceName(EventObject event, Exchange exchange, Endpoint endpoint, boolean server, boolean client) {
+ if (client) {
+ return getServiceName(event, exchange, endpoint, clientServiceMappings, server, client);
+ } else if (server) {
+ return getServiceName(event, exchange, endpoint, serverServiceMappings, server, client);
+ } else {
+ return null;
+ }
+ }
+
+ private String getServiceName(EventObject event, Exchange exchange, Endpoint endpoint, Map<String, String> serviceMappings, boolean server, boolean client) {
String answer = null;
// endpoint takes precedence over route
@@ -305,20 +336,23 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
}
}
- if (answer == null && exchange.getFromEndpoint() != null) {
- String url = exchange.getFromEndpoint().getEndpointUri();
- if (url != null) {
- // exclude patterns take precedence
- for (String pattern : excludePatterns) {
- if (EndpointHelper.matchEndpoint(exchange.getContext(), url, pattern)) {
- return null;
+ // special for created event as its a server side to know where it was from
+ if (server && (event instanceof ExchangeCreatedEvent || event instanceof ExchangeCompletedEvent || event instanceof ExchangeFailedEvent)) {
+ if (answer == null && exchange.getFromEndpoint() != null) {
+ String url = exchange.getFromEndpoint().getEndpointUri();
+ if (url != null) {
+ // exclude patterns take precedence
+ for (String pattern : excludePatterns) {
+ if (EndpointHelper.matchEndpoint(exchange.getContext(), url, pattern)) {
+ return null;
+ }
}
- }
- for (Map.Entry<String, String> entry : serviceMappings.entrySet()) {
- String pattern = entry.getKey();
- if (EndpointHelper.matchEndpoint(exchange.getContext(), url, pattern)) {
- answer = entry.getValue();
- break;
+ for (Map.Entry<String, String> entry : serviceMappings.entrySet()) {
+ String pattern = entry.getKey();
+ if (EndpointHelper.matchEndpoint(exchange.getContext(), url, pattern)) {
+ answer = entry.getValue();
+ break;
+ }
}
}
}
@@ -410,37 +444,46 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
@Override
public void notify(EventObject event) throws Exception {
+ // client events
if (event instanceof ExchangeSendingEvent) {
ExchangeSendingEvent ese = (ExchangeSendingEvent) event;
- String serviceName = getServiceName(ese.getExchange(), ese.getEndpoint());
+ String serviceName = getServiceName(ese, ese.getExchange(), ese.getEndpoint(), false, true);
Brave brave = getBrave(serviceName);
if (brave != null) {
clientRequest(brave, serviceName, ese);
}
} else if (event instanceof ExchangeSentEvent) {
ExchangeSentEvent ese = (ExchangeSentEvent) event;
- String serviceName = getServiceName(ese.getExchange(), ese.getEndpoint());
+ String serviceName = getServiceName(ese, ese.getExchange(), ese.getEndpoint(), false, true);
Brave brave = getBrave(serviceName);
if (brave != null) {
clientResponse(brave, serviceName, ese);
}
- } else if (event instanceof ExchangeCreatedEvent) {
+ }
+
+ // server received client request
+ if (event instanceof ExchangeCreatedEvent) {
ExchangeCreatedEvent ece = (ExchangeCreatedEvent) event;
- String serviceName = getServiceName(ece.getExchange(), null);
- Brave brave = getBrave(serviceName);
- if (brave != null) {
- serverRequest(brave, serviceName, ece);
+ // we should only emit a server request if we have an existing trace id (eg a client has called us)
+ if (hasZipkinTraceId(ece.getExchange())) {
+ String serviceName = getServiceName(ece, ece.getExchange(), null, true, false);
+ Brave brave = getBrave(serviceName);
+ if (brave != null) {
+ serverRequest(brave, serviceName, ece);
+ }
}
- } else if (event instanceof ExchangeCompletedEvent) {
+ }
+ // server completed events
+ if (event instanceof ExchangeCompletedEvent) {
ExchangeCompletedEvent ece = (ExchangeCompletedEvent) event;
- String serviceName = getServiceName(ece.getExchange(), null);
+ String serviceName = getServiceName(ece, ece.getExchange(), null, true, false);
Brave brave = getBrave(serviceName);
if (brave != null) {
serverResponse(brave, serviceName, ece);
}
} else if (event instanceof ExchangeFailedEvent) {
ExchangeFailedEvent efe = (ExchangeFailedEvent) event;
- String serviceName = getServiceName(efe.getExchange(), null);
+ String serviceName = getServiceName(efe, efe.getExchange(), null, true, false);
Brave brave = getBrave(serviceName);
if (brave != null) {
serverResponse(brave, serviceName, efe);
@@ -450,86 +493,180 @@ public class ZipkinEventNotifier extends EventNotifierSupport implements Statefu
private void clientRequest(Brave brave, String serviceName, ExchangeSendingEvent event) {
ClientSpanThreadBinder binder = brave.clientSpanThreadBinder();
+
+ // reuse existing span if we do multiple requests from the same
+ ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
+ if (state == null) {
+ state = new ZipkinState();
+ event.getExchange().setProperty(ZipkinState.KEY, state);
+ }
+ Object last = state.getLast();
+ if (last != null && last instanceof Span) {
+ binder.setCurrentSpan((Span) last);
+ } else if (last != null && last instanceof ServerSpan) {
+ Span span = ((ServerSpan) last).getSpan();
+ binder.setCurrentSpan(span);
+ }
+
+ brave.
+
brave.clientRequestInterceptor().handle(new ZipkinClientRequestAdapter(this, serviceName, event.getExchange(), event.getEndpoint()));
- Span span = binder.getCurrentClientSpan();
- String key = "CamelZipkinClientSpan-" + serviceName;
- event.getExchange().setProperty(key, span);
+ // store span after request
+ Span span = binder.getCurrentClientSpan();
+ state.pushClientSpan(span);
+ // and reset binder
+ binder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
- String id = "<null>";
+ String traceId = "<null>";
if (span != null) {
- id = "" + span.getId();
+ traceId = "" + span.getTrace_id();
}
- log.debug("clientRequest\t[service={}, spanId={}]", serviceName, id);
+ String spanId = "<null>";
+ if (span != null) {
+ spanId = "" + span.getId();
+ }
+ String parentId = "<null>";
+ if (span != null) {
+ parentId = "" + span.getParent_id();
+ }
+ log.debug("clientRequest [service={}, traceId={}, spanId={}, parentId={}]", serviceName, traceId, spanId, parentId);
}
}
private void clientResponse(Brave brave, String serviceName, ExchangeSentEvent event) {
- ClientSpanThreadBinder binder = brave.clientSpanThreadBinder();
- String key = "CamelZipkinClientSpan-" + serviceName;
- Span span = event.getExchange().getProperty(key, Span.class);
- binder.setCurrentSpan(span);
- brave.clientResponseInterceptor().handle(new ZipkinClientResponseAdaptor(this, event.getExchange(), event.getEndpoint()));
- binder.setCurrentSpan(null);
+ Span span = null;
+ ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
+ if (state != null) {
+ span = state.popClientSpan();
+ }
- if (log.isDebugEnabled()) {
- String id = "<null>";
- if (span != null) {
- id = "" + span.getId();
+ if (span != null) {
+ // only process if it was a zipkin client event
+ ClientSpanThreadBinder binder = brave.clientSpanThreadBinder();
+ binder.setCurrentSpan(span);
+ brave.clientResponseInterceptor().handle(new ZipkinClientResponseAdaptor(this, event.getExchange(), event.getEndpoint()));
+ // and reset binder
+ binder.setCurrentSpan(null);
+
+ if (log.isDebugEnabled()) {
+ String traceId = "" + span.getTrace_id();
+ String spanId = "" + span.getId();
+ String parentId = "" + span.getParent_id();
+ log.debug("clientResponse[service={}, traceId={}, spanId={}, parentId={}]", serviceName, traceId, spanId, parentId);
}
- log.debug("clientResponse\t[service={}, spanId={}]", serviceName, id);
}
}
private void serverRequest(Brave brave, String serviceName, ExchangeCreatedEvent event) {
ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
+
+ // reuse existing span if we do multiple requests from the same
+ ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
+ if (state == null) {
+ state = new ZipkinState();
+ event.getExchange().setProperty(ZipkinState.KEY, state);
+ }
+ Object last = state.getLast();
+ if (last != null && last instanceof ServerSpan) {
+ binder.setCurrentSpan((ServerSpan) last);
+ }
+
brave.serverRequestInterceptor().handle(new ZipkinServerRequestAdapter(this, event.getExchange()));
+
+ // store span after request
ServerSpan span = binder.getCurrentServerSpan();
- String key = "CamelZipkinServerSpan-" + serviceName;
- event.getExchange().setProperty(key, span);
+ state.pushServerSpan(span);
+ // and reset binder
+ binder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
- String id = "<null>";
- if (span != null && span.getSpan() != null) {
- id = "" + span.getSpan().getId();
+ String traceId = "<null>";
+ if (span.getSpan() != null) {
+ traceId = "" + span.getSpan().getTrace_id();
+ }
+ String spanId = "<null>";
+ if (span.getSpan() != null) {
+ spanId = "" + span.getSpan().getId();
+ }
+ String parentId = "<null>";
+ if (span.getSpan() != null) {
+ parentId = "" + span.getSpan().getParent_id();
}
- log.debug("serverRequest\t[service={}, spanId={}]", serviceName, id);
+ log.debug("serverRequest [service={}, traceId={}, spanId={}, parentId={}]", serviceName, traceId, spanId, parentId);
}
}
private void serverResponse(Brave brave, String serviceName, ExchangeCompletedEvent event) {
- ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
- String key = "CamelZipkinServerSpan-" + serviceName;
- ServerSpan span = event.getExchange().getProperty(key, ServerSpan.class);
- binder.setCurrentSpan(span);
- brave.serverResponseInterceptor().handle(new ZipkinServerResponseAdapter(this, event.getExchange()));
- binder.setCurrentSpan(null);
+ ServerSpan span = null;
+ ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
+ if (state != null) {
+ span = state.popServerSpan();
+ }
- if (log.isDebugEnabled()) {
- String id = "<null>";
- if (span != null && span.getSpan() != null) {
- id = "" + span.getSpan().getId();
+ if (span != null) {
+ // only process if it was a zipkin server event
+ ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
+ binder.setCurrentSpan(span);
+ brave.serverResponseInterceptor().handle(new ZipkinServerResponseAdapter(this, event.getExchange()));
+ // and reset binder
+ binder.setCurrentSpan(null);
+
+ if (log.isDebugEnabled()) {
+ String traceId = "<null>";
+ if (span.getSpan() != null) {
+ traceId = "" + span.getSpan().getTrace_id();
+ }
+ String spanId = "<null>";
+ if (span.getSpan() != null) {
+ spanId = "" + span.getSpan().getId();
+ }
+ String parentId = "<null>";
+ if (span.getSpan() != null) {
+ parentId = "" + span.getSpan().getParent_id();
+ }
+ log.debug("serverResponse[service={}, traceId={}, spanId={}, parentId={}] [status=exchangeFailed]", serviceName, traceId, spanId, parentId);
}
- log.debug("serverResponse\t[service={}, spanId={}]\t[status=exchangeCompleted]", serviceName, id);
}
}
private void serverResponse(Brave brave, String serviceName, ExchangeFailedEvent event) {
- ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
- String key = "CamelZipkinServerSpan-" + serviceName;
- ServerSpan span = event.getExchange().getProperty(key, ServerSpan.class);
- binder.setCurrentSpan(span);
- brave.serverResponseInterceptor().handle(new ZipkinServerResponseAdapter(this, event.getExchange()));
- binder.setCurrentSpan(null);
+ ServerSpan span = null;
+ ZipkinState state = event.getExchange().getProperty(ZipkinState.KEY, ZipkinState.class);
+ if (state != null) {
+ span = state.popServerSpan();
+ }
- if (log.isDebugEnabled()) {
- String id = "<null>";
- if (span != null && span.getSpan() != null) {
- id = "" + span.getSpan().getId();
+ if (span != null) {
+ // only process if it was a zipkin server event
+ ServerSpanThreadBinder binder = brave.serverSpanThreadBinder();
+ binder.setCurrentSpan(span);
+ brave.serverResponseInterceptor().handle(new ZipkinServerResponseAdapter(this, event.getExchange()));
+ // and reset binder
+ binder.setCurrentSpan(null);
+
+ if (log.isDebugEnabled()) {
+ String traceId = "<null>";
+ if (span.getSpan() != null) {
+ traceId = "" + span.getSpan().getTrace_id();
+ }
+ String spanId = "<null>";
+ if (span.getSpan() != null) {
+ spanId = "" + span.getSpan().getId();
+ }
+ String parentId = "<null>";
+ if (span.getSpan() != null) {
+ parentId = "" + span.getSpan().getParent_id();
+ }
+ log.debug("serverResponse[service={}, traceId={}, spanId={}, parentId={}] [status=exchangeFailed]", serviceName, traceId, spanId, parentId);
}
- log.debug("serverResponse[service={}, spanId={}]\t[status=exchangeFailed]", serviceName, id);
}
}
+ private boolean hasZipkinTraceId(Exchange exchange) {
+ // must have zipkin headers to start a server event
+ return exchange.getIn().getHeader(ZipkinConstants.TRACE_ID) != null;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
new file mode 100644
index 0000000..d09af34
--- /dev/null
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinState.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.zipkin;
+
+import java.util.Stack;
+
+import com.github.kristofa.brave.ServerSpan;
+import com.twitter.zipkin.gen.Span;
+
+public class ZipkinState {
+
+ public static final String KEY = "CamelZipkinState";
+
+ private final Stack<Span> clientSpans = new Stack<>();
+ private final Stack<ServerSpan> serverSpans = new Stack<>();
+ private Object last;
+
+ public void pushClientSpan(Span span) {
+ clientSpans.push(span);
+ last = span;
+ }
+
+ public Span popClientSpan() {
+ if (!clientSpans.empty()) {
+ Span answer = clientSpans.pop();
+ last = answer;
+ return answer;
+ } else {
+ return null;
+ }
+ }
+
+ public void pushServerSpan(ServerSpan span) {
+ serverSpans.push(span);
+ last = span;
+ }
+
+ public ServerSpan popServerSpan() {
+ if (!serverSpans.empty()) {
+ ServerSpan answer = serverSpans.pop();
+ last = answer;
+ return answer;
+ } else {
+ return null;
+ }
+ }
+
+ public Object getLast() {
+ return last;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
index ac607de..987e188 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
@@ -34,8 +34,8 @@ public class ZipkinRouteConcurrentTest extends CamelTestSupport {
CamelContext context = super.createCamelContext();
zipkin = new ZipkinEventNotifier();
- zipkin.addServiceMapping("seda:foo", "foo");
- zipkin.addServiceMapping("seda:bar", "bar");
+ zipkin.addClientServiceMapping("seda:foo", "foo");
+ zipkin.addServerServiceMapping("seda:bar", "bar");
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
context.getManagementStrategy().addEventNotifier(zipkin);
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
index 2114ea0..8edabe6 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
@@ -34,7 +34,7 @@ public class ZipkinSimpleRouteTest extends CamelTestSupport {
CamelContext context = super.createCamelContext();
zipkin = new ZipkinEventNotifier();
- zipkin.addServiceMapping("seda:dude", "dude");
+ zipkin.setServiceName("dude");
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
context.getManagementStrategy().addEventNotifier(zipkin);
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
index c7bdb9c..5819562 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
@@ -32,8 +32,10 @@ public class ZipkinTwoRouteTest extends CamelTestSupport {
zipkin = new ZipkinEventNotifier();
// we have 2 routes as services
- zipkin.addServiceMapping("seda:cat", "cat");
- zipkin.addServiceMapping("seda:dog", "dog");
+ zipkin.addClientServiceMapping("seda:cat", "cat");
+ zipkin.addServerServiceMapping("seda:cat", "cat");
+ zipkin.addClientServiceMapping("seda:dog", "dog");
+ zipkin.addServerServiceMapping("seda:dog", "dog");
// capture message body as well
zipkin.setIncludeMessageBody(true);
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
index db70c62..a569af7 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
@@ -41,7 +41,8 @@ public class ZipkinAutoConfigureScribe extends CamelTestSupport {
zipkin = new ZipkinEventNotifier();
// we have one route as service
- zipkin.addServiceMapping("seda:cat", "cat");
+ zipkin.addClientServiceMapping("seda:cat", "cat");
+ zipkin.addServerServiceMapping("seda:cat", "cat");
// should auto configure as we have not setup a spanCollector
context.getManagementStrategy().addEventNotifier(zipkin);
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
index 93da37b..2f9fe37 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
@@ -43,7 +43,8 @@ public class ZipkinOneRouteScribe extends CamelTestSupport {
zipkin = new ZipkinEventNotifier();
// we have one route as service
- zipkin.addServiceMapping("seda:cat", "cat");
+ zipkin.addClientServiceMapping("seda:cat", "cat");
+ zipkin.addServerServiceMapping("seda:cat", "cat");
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
context.getManagementStrategy().addEventNotifier(zipkin);
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinRouteConcurrentScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinRouteConcurrentScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinRouteConcurrentScribe.java
deleted file mode 100644
index 527d7a2..0000000
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinRouteConcurrentScribe.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.zipkin.scribe;
-
-import java.util.concurrent.TimeUnit;
-
-import com.github.kristofa.brave.scribe.ScribeSpanCollector;
-import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.zipkin.ZipkinEventNotifier;
-import org.junit.Test;
-
-/**
- * Integration test requires running Zipkin/Scribe running
- *
- * The easiest way is to run using zipkin-docker: https://github.com/openzipkin/docker-zipkin
- *
- * Adjust the IP address to what IP docker-machines have assigned, you can use
- * <tt>docker-machines ls</tt>
- */
-public class ZipkinRouteConcurrentScribe extends CamelTestSupport {
-
- private String ip = "192.168.99.100";
- private ZipkinEventNotifier zipkin;
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
-
- zipkin = new ZipkinEventNotifier();
- // we have 2 routes as services
- zipkin.addServiceMapping("seda:foo", "foo");
- zipkin.addServiceMapping("seda:bar", "bar");
- zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
- context.getManagementStrategy().addEventNotifier(zipkin);
-
- return context;
- }
-
- @Test
- public void testZipkinRoute() throws Exception {
- NotifyBuilder notify = new NotifyBuilder(context).from("seda:foo").whenDone(5).create();
-
- for (int i = 0; i < 5; i++) {
- template.requestBody("direct:foo", "Hello World");
- }
-
- assertTrue(notify.matches(60, TimeUnit.SECONDS));
- }
-
- @Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").to("sed:foo");
-
- from("seda:foo?concurrentConsumers=2").routeId("foo")
- .log("routing at ${routeId}")
- .delay(simple("${random(1000,2000)}"))
- .to("seda:bar");
-
- from("seda:bar?concurrentConsumers=2").routeId("bar")
- .log("routing at ${routeId}")
- .delay(simple("${random(0,500)}"));
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
index 7848967..e3d176d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
@@ -43,7 +43,8 @@ public class ZipkinSimpleRouteScribe extends CamelTestSupport {
zipkin = new ZipkinEventNotifier();
// we have one route as service
- zipkin.addServiceMapping("seda:dude", "dude");
+ zipkin.addClientServiceMapping("seda:dude", "dude");
+ zipkin.addServerServiceMapping("seda:dude", "dude");
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
context.getManagementStrategy().addEventNotifier(zipkin);
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
index 237df63..7e0ba4b 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
@@ -47,7 +47,8 @@ public class ZipkinTimerRouteScribe extends CamelTestSupport {
zipkin = new ZipkinEventNotifier();
// we have one route as service
- zipkin.addServiceMapping("seda:timer", "timer");
+ zipkin.addClientServiceMapping("seda:timer", "timer");
+ zipkin.addServerServiceMapping("seda:timer", "timer");
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
context.getManagementStrategy().addEventNotifier(zipkin);
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
index fc55e40..b5e4c6d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
@@ -43,8 +43,10 @@ public class ZipkinTwoRouteScribe extends CamelTestSupport {
zipkin = new ZipkinEventNotifier();
// we have 2 routes as services
- zipkin.addServiceMapping("seda:cat", "cat");
- zipkin.addServiceMapping("seda:dog", "dog");
+ zipkin.addClientServiceMapping("seda:cat", "cat");
+ zipkin.addServerServiceMapping("seda:cat", "cat");
+ zipkin.addClientServiceMapping("seda:dog", "dog");
+ zipkin.addServerServiceMapping("seda:dog", "dog");
// capture message body as well
zipkin.setIncludeMessageBody(true);
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/README.md b/examples/camel-example-zipkin/README.md
index 11320b2..a1e9ee3 100644
--- a/examples/camel-example-zipkin/README.md
+++ b/examples/camel-example-zipkin/README.md
@@ -6,12 +6,17 @@ This example shows how to use Camel with Zipkin to trace/timing all incoming and
The example requires a running Zipkin Server.
-The example includes two routes. The client route uses a timer to send a message to the server route.
-The server route then replies back to the client.
+The example includes two sub maven modules that implement
+
+- service1
+- service2
+
+Where service1 calls service2 using HTTP.
### Configuration
-The example is configured in the `src/main/resources/application.properties` file.
+Service1 is configured in the `src/main/java/sample/camel/Service1Application.java` source code.
+Service2 is configured in the `src/main/resources/application.properties` properties file.
Here you need to configure the hostname and port number for the Zipkin Server.
@@ -23,10 +28,26 @@ You will need to compile this example first:
$ mvn compile
```
+### Run the example
+
+Then using two different shells and run service2 before service1.
+
+```sh
+$ cd service2
+$ mvn compile spring-boot:run
+```
+
+When service2 is ready then start service1
+
+```sh
+$ cd service1
+$ mvn compile camel:run
+```
+
### Zipkin web console
You should be able to visualize the traces and timings from this example using the Zipkin Web Console.
-The service name is named `hello`.
+The services are named `service1` and `service2`.
### Installing Zipkin Server using Docker
@@ -38,16 +59,6 @@ Remember to configure the IP address and port number in the `application.propert
You can find the IP using `docker-machine ls`
-### Run
-
-To run the example, type:
-
-```sh
-$ mvn spring-boot:run
-```
-
-To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>.
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/pom.xml b/examples/camel-example-zipkin/pom.xml
index 6159295..0017648 100644
--- a/examples/camel-example-zipkin/pom.xml
+++ b/examples/camel-example-zipkin/pom.xml
@@ -1,102 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.apache.camel</groupId>
<artifactId>examples</artifactId>
<version>2.18-SNAPSHOT</version>
</parent>
-
+
<artifactId>camel-example-zipkin</artifactId>
+ <packaging>pom</packaging>
<name>Camel :: Example :: Zipkin</name>
<description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
- <properties>
- <spring.boot-version>${spring-boot-version}</spring.boot-version>
- </properties>
-
- <!-- import Spring-Boot and Camel BOM -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <!-- spring-boot -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
-
- <!-- camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-zipkin-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-stream</artifactId>
- </dependency>
-
- <!-- test -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot-version}</version>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>service1</module>
+ <module>service2</module>
+ <module>service3</module>
+ </modules>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/pom.xml b/examples/camel-example-zipkin/service1/pom.xml
new file mode 100644
index 0000000..092fee9
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-example-zipkin</artifactId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-zipkin-service1</artifactId>
+ <name>Camel :: Example :: Zipkin :: Service 1</name>
+ <description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
+
+ <properties>
+ <spring.boot-version>${spring-boot-version}</spring.boot-version>
+ </properties>
+
+ <!-- import Camel BOM -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- CDI API -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${cdi-api-1.2-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- camel-cdi -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-zipkin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+
+ <!-- logging -->
+
+
+ </dependencies>
+
+ <build>
+
+ <plugins>
+ <!-- allows the routes to be run via 'mvn camel:run' -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-weld</artifactId>
+ <version>${deltaspike-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se</artifactId>
+ <version>${weld2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java
new file mode 100644
index 0000000..0c27215
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/CounterBean.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+@Named("counterBean")
+public class CounterBean {
+
+ private int counter;
+
+ public String someMethod(String body) {
+ return "" + ++counter;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
new file mode 100644
index 0000000..4bbd8a3
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Application.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.camel.cdi.ContextName;
+import org.apache.camel.management.event.CamelContextStartingEvent;
+import org.apache.camel.zipkin.ZipkinEventNotifier;
+
+@ContextName("Server1")
+public class Service1Application {
+
+ public void setupCamel(@Observes CamelContextStartingEvent event) {
+ // create zipkin
+ ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
+ zipkin.setHostName("192.168.99.100");
+ zipkin.setPort(9410);
+ zipkin.setServiceName("service1");
+ // do not track timer as its an internal event to just get an event
+ zipkin.addExcludePattern("timer:*");
+
+ // add zipkin to CamelContext
+ event.getContext().getManagementStrategy().addEventNotifier(zipkin);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
new file mode 100644
index 0000000..7e1be20
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/java/sample/camel/Service1Route.java
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.zipkin.ZipkinEventNotifier;
+
+public class Service1Route extends RouteBuilder {
+
+ @Override
+ public void configure() {
+ // you can configure the route rule with Java DSL here
+
+ // TODO: use CDI to setup Camel instead of here in the route
+
+ // create zipkin
+ ZipkinEventNotifier zipkin = new ZipkinEventNotifier();
+ zipkin.setHostName("192.168.99.100");
+ zipkin.setPort(9410);
+ zipkin.addClientServiceMapping("http://localhost:9090/service2", "service2");
+ zipkin.addClientServiceMapping("http://localhost:7070/service3", "service3");
+
+ // add zipkin to CamelContext
+ getContext().getManagementStrategy().addEventNotifier(zipkin);
+
+ from("timer:trigger?exchangePattern=InOut&period=30s")
+ .bean("counterBean")
+ .to("http://localhost:9090/service2")
+ .to("http://localhost:7070/service3")
+ .log("Result: ${body}");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..112d56d
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties b/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties
new file mode 100644
index 0000000..d04caeb
--- /dev/null
+++ b/examples/camel-example-zipkin/service1/src/main/resources/log4j.properties
@@ -0,0 +1,28 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, stdout
+
+log4j.logger.org.apache.camel.zipkin=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/pom.xml b/examples/camel-example-zipkin/service2/pom.xml
new file mode 100644
index 0000000..d037c9a
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-example-zipkin</artifactId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-zipkin-service2</artifactId>
+ <name>Camel :: Example :: Zipkin :: Service 2</name>
+ <description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description>
+
+ <properties>
+ <spring.boot-version>${spring-boot-version}</spring.boot-version>
+ </properties>
+
+ <!-- import Spring-Boot and Camel BOM -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- spring-boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
+ <!-- camel -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-zipkin-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
new file mode 100644
index 0000000..6fe12a8
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.zipkin.starter.CamelZipkin;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+//CHECKSTYLE:OFF
+/**
+ * A Spring Boot application that starts the Camel Zipkin application.
+ * <p/>
+ * Notice we use the `@CamelZipkin` annotation to enable Camel with Zipkin.
+ * The configuration of Zipkin is in the <tt>application.properties</tt> file.
+ */
+@SpringBootApplication
+@CamelZipkin
+public class Service2Application {
+
+ /**
+ * A main method to start this application.
+ */
+ public static void main(String[] args) {
+ SpringApplication.run(Service2Application.class, args);
+ }
+
+}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc5b5e4/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
new file mode 100644
index 0000000..e95582b
--- /dev/null
+++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Route.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Service2Route extends RouteBuilder {
+
+ @Override
+ public void configure() throws Exception {
+ from("jetty:http://0.0.0.0:{{jetty.port}}/service2").routeId("service2")
+ .convertBodyTo(String.class)
+ .delay(simple("${random(1000,2000)}"))
+ .transform(simple("Hello: ${body}"));
+ }
+
+}