CAMEL-10222: Moved zipkin-starter to the components-starter module
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c967a4d2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c967a4d2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c967a4d2 Branch: refs/heads/master Commit: c967a4d28756679d40923d6783f7d3a701c4e494 Parents: ee1ba69 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Wed Aug 10 19:12:09 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 15 09:27:23 2016 +0200 ---------------------------------------------------------------------- components-starter/camel-zipkin-starter/pom.xml | 45 ++++ .../camel/zipkin/starter/CamelZipkin.java | 34 ++++ .../zipkin/starter/ZipkinAutoConfiguration.java | 64 ++++++ .../ZipkinConditionalAutoConfiguration.java | 31 +++ .../starter/ZipkinConfigurationProperties.java | 154 ++++++++++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../main/resources/META-INF/spring.factories | 19 ++ components-starter/pom.xml | 1 + components/pom.xml | 1 - .../maven/packaging/SpringBootStarterMojo.java | 4 +- 11 files changed, 564 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/camel-zipkin-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/pom.xml b/components-starter/camel-zipkin-starter/pom.xml new file mode 100644 index 0000000..16bda02 --- /dev/null +++ b/components-starter/camel-zipkin-starter/pom.xml @@ -0,0 +1,45 @@ +<?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>components-starter</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> + <artifactId>camel-zipkin-starter</artifactId> + <name>Spring-Boot Starter :: Camel :: Zipkin</name> + <description>Spring-Boot Starter for Camel Zipkin Support</description> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>${spring-boot-version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-zipkin</artifactId> + </dependency> + </dependencies> +</project> + http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java new file mode 100644 index 0000000..339f603 --- /dev/null +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java @@ -0,0 +1,34 @@ +/** + * 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.starter; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.springframework.context.annotation.Import; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +@Import(ZipkinAutoConfiguration.class) +public @interface CamelZipkin { +} http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java new file mode 100644 index 0000000..e0e8ed7 --- /dev/null +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java @@ -0,0 +1,64 @@ +/** + * 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.starter; + +import org.apache.camel.CamelContext; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.zipkin.ZipkinTracer; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties(ZipkinConfigurationProperties.class) +@ConditionalOnProperty(value = "camel.zipkin.enabled", matchIfMissing = true) +public class ZipkinAutoConfiguration { + + @Bean(initMethod = "", destroyMethod = "") + // Camel handles the lifecycle of this bean + @ConditionalOnMissingBean(ZipkinTracer.class) + ZipkinTracer zipkinEventNotifier(CamelContext camelContext, + ZipkinConfigurationProperties config) { + + ZipkinTracer zipkin = new ZipkinTracer(); + zipkin.setHostName(config.getHostName()); + zipkin.setPort(config.getPort()); + zipkin.setRate(config.getRate()); + if (ObjectHelper.isNotEmpty(config.getServiceName())) { + zipkin.setServiceName(config.getServiceName()); + } + if (config.getExcludePatterns() != null) { + zipkin.setExcludePatterns(config.getExcludePatterns()); + } + if (config.getClientServiceMappings() != null) { + zipkin.setClientServiceMappings(config.getClientServiceMappings()); + } + if (config.getServerServiceMappings() != null) { + zipkin.setServerServiceMappings(config.getServerServiceMappings()); + } + zipkin.setIncludeMessageBody(config.isIncludeMessageBody()); + zipkin.setIncludeMessageBodyStreams(config.isIncludeMessageBodyStreams()); + + // register the bean into CamelContext + zipkin.init(camelContext); + + return zipkin; + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java new file mode 100644 index 0000000..3a2f9d3 --- /dev/null +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java @@ -0,0 +1,31 @@ +/** + * 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.starter; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +/** + * A configuration controller to enable Zipkin via the configuration property. + * Useful to bootstrap Zipkin when not using the {@link CamelZipkin} annotation. + */ +@Configuration +@ConditionalOnProperty(value = "camel.zipkin.enabled") +@Import(ZipkinAutoConfiguration.class) +public class ZipkinConditionalAutoConfiguration { +} http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java new file mode 100644 index 0000000..5a45f57 --- /dev/null +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java @@ -0,0 +1,154 @@ +/** + * 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.starter; + +import java.util.Map; +import java.util.Set; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "camel.zipkin") +public class ZipkinConfigurationProperties { + + /** + * Sets a hostname for the remote zipkin server to use. + */ + private String hostName; + + /** + * Sets the port number for the remote zipkin server to use. + */ + private int port; + + /** + * Configures a rate that decides how many events should be traced by zipkin. + * The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f is 10%). + */ + private float rate = 1.0f; + + /** + * Whether to include the Camel message body in the zipkin traces. + * + * This is not recommended for production usage, or when having big payloads. + * You can limit the size by configuring camel.springboot.log-debug-max-chars option. + */ + private boolean includeMessageBody; + + /** + * Whether to include message bodies that are stream based in the zipkin traces. + * + * This is not recommended for production usage, or when having big payloads. + * You can limit the size by configuring camel.springboot.log-debug-max-chars option. + */ + private boolean includeMessageBodyStreams; + + /** + * To use a global service name that matches all Camel events + */ + private String serviceName; + + /** + * Sets exclude pattern(s) that will disable tracing with zipkin for Camel messages that matches the pattern. + */ + private Set<String> excludePatterns; + + /** + * 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> 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 + + public String getHostName() { + return hostName; + } + + public void setHostName(String hostName) { + this.hostName = hostName; + } + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } + + public float getRate() { + return rate; + } + + public void setRate(float rate) { + this.rate = rate; + } + + public boolean isIncludeMessageBody() { + return includeMessageBody; + } + + public void setIncludeMessageBody(boolean includeMessageBody) { + this.includeMessageBody = includeMessageBody; + } + + public boolean isIncludeMessageBodyStreams() { + return includeMessageBodyStreams; + } + + public void setIncludeMessageBodyStreams(boolean includeMessageBodyStreams) { + this.includeMessageBodyStreams = includeMessageBodyStreams; + } + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public Set<String> getExcludePatterns() { + return excludePatterns; + } + + public void setExcludePatterns(Set<String> excludePatterns) { + this.excludePatterns = excludePatterns; + } + + 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 setServerServiceMappings(Map<String, String> serverServiceMappings) { + this.serverServiceMappings = serverServiceMappings; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/camel-zipkin-starter/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-zipkin-starter/src/main/resources/META-INF/LICENSE.txt new file mode 100755 index 0000000..6b0b127 --- /dev/null +++ b/components-starter/camel-zipkin-starter/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/c967a4d2/components-starter/camel-zipkin-starter/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-zipkin-starter/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components-starter/camel-zipkin-starter/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/c967a4d2/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.factories ---------------------------------------------------------------------- diff --git a/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..94e7b6a --- /dev/null +++ b/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,19 @@ +# +# 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. +# + +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +org.apache.camel.zipkin.starter.ZipkinConditionalAutoConfiguration \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/pom.xml b/components-starter/pom.xml index 1eb9535..fc96de1 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -276,6 +276,7 @@ <module>camel-xstream-starter</module> <module>camel-yammer-starter</module> <module>camel-zipfile-starter</module> + <module>camel-zipkin-starter</module> <module>camel-zookeeper-starter</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index d0dc235..10ea47e 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -287,7 +287,6 @@ <module>camel-yammer</module> <module>camel-zipfile</module> <module>camel-zipkin</module> - <module>camel-zipkin-starter</module> <module>camel-zookeeper</module> </modules> http://git-wip-us.apache.org/repos/asf/camel/blob/c967a4d2/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java index dfa6d05..8d37d06 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java @@ -77,8 +77,8 @@ import freemarker.template.TemplateException; public class SpringBootStarterMojo extends AbstractMojo { // TO ADD?: "camel-chronicle", "camel-guava-eventbus" ?, "camel-johnzon", "camel-ribbon" - private static final String[] IGNORE_MODULES = {/* OSGi -> */ "camel-core-osgi", "camel-eventadmin", "camel-paxlogging", /* deprecated -> */"camel-swagger", "camel-mina", /* others -> */ - "camel-zipkin", "camel-zipkin-starter"}; + private static final String[] IGNORE_MODULES = {/* OSGi -> */ "camel-core-osgi", "camel-eventadmin", "camel-paxlogging", /* deprecated (and not working perfectly) -> */"camel-swagger", "camel-mina", + /* others (not managed) -> */ "camel-zipkin"}; private static final boolean IGNORE_TEST_MODULES = true;
