You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/07/29 09:50:33 UTC
[camel-spring-boot] branch master updated (0727c73 -> 1859e39)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from 0727c73 Regen
new acbdd17 Regen camel-opentracing starter
new 5510de3 CAMEL-15339 - Added camel-opentelemetry spring boot starter
new 1859e39 Added camel-opentelemetry integration test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/springboot/catalog/others.properties | 1 +
.../springboot/catalog/others/opentelemetry.json | 15 ++++++
components-starter/README.adoc | 5 +-
components-starter/camel-corda-starter/pom.xml | 12 +++++
components-starter/camel-iota-starter/pom.xml | 12 +++++
.../pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.provides | 2 +-
.../camel-opentracing-starter/pom.xml | 4 +-
.../src/main/docs/opentracing-starter.adoc | 31 ------------
.../opentracing/starter/CamelOpenTracing.java | 34 -------------
.../starter/OpenTracingAutoConfiguration.java | 57 ----------------------
.../OpenTracingConditionalAutoConfiguration.java | 31 ------------
.../OpenTracingConfigurationProperties.java | 52 --------------------
.../src/main/resources/META-INF/spring.factories | 18 -------
components-starter/pom.xml | 3 +-
docs/modules/ROOT/pages/list.adoc | 5 +-
...eveldbTest.java => CamelOpentelemetryTest.java} | 4 +-
tooling/camel-spring-boot-dependencies/pom.xml | 15 ++++++
20 files changed, 72 insertions(+), 233 deletions(-)
create mode 100644 catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/opentelemetry.json
copy components-starter/{camel-arangodb-starter => camel-opentelemetry-starter}/pom.xml (95%)
copy {tooling/camel-spring-boot-docs-maven-plugin => components-starter/camel-opentelemetry-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/camel-spring-boot-docs-maven-plugin => components-starter/camel-opentelemetry-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
copy components-starter/{camel-ahc-ws-starter => camel-opentelemetry-starter}/src/main/resources/META-INF/spring.provides (96%)
delete mode 100644 components-starter/camel-opentracing-starter/src/main/docs/opentracing-starter.adoc
delete mode 100644 components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/CamelOpenTracing.java
delete mode 100644 components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingAutoConfiguration.java
delete mode 100644 components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConditionalAutoConfiguration.java
delete mode 100644 components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConfigurationProperties.java
delete mode 100644 components-starter/camel-opentracing-starter/src/main/resources/META-INF/spring.factories
copy tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelLeveldbTest.java => CamelOpentelemetryTest.java} (91%)
[camel-spring-boot] 01/03: Regen camel-opentracing starter
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit acbdd17f997b7b70a9877ca7de2ce09153866168
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 29 11:38:39 2020 +0200
Regen camel-opentracing starter
---
components-starter/camel-corda-starter/pom.xml | 12 +++++
components-starter/camel-iota-starter/pom.xml | 12 +++++
.../camel-opentracing-starter/pom.xml | 4 +-
.../src/main/docs/opentracing-starter.adoc | 31 ------------
.../opentracing/starter/CamelOpenTracing.java | 34 -------------
.../starter/OpenTracingAutoConfiguration.java | 57 ----------------------
.../OpenTracingConditionalAutoConfiguration.java | 31 ------------
.../OpenTracingConfigurationProperties.java | 52 --------------------
.../src/main/resources/META-INF/spring.factories | 18 -------
components-starter/pom.xml | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 10 ++++
11 files changed, 37 insertions(+), 226 deletions(-)
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index 254cb1b..7f14a21 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml
index 9427c49..1cb0cae 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-opentracing-starter/pom.xml b/components-starter/camel-opentracing-starter/pom.xml
index 3979b26..06be567 100644
--- a/components-starter/camel-opentracing-starter/pom.xml
+++ b/components-starter/camel-opentracing-starter/pom.xml
@@ -26,8 +26,8 @@
</parent>
<artifactId>camel-opentracing-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: OpenTracing</name>
- <description>Spring-Boot Starter for Distributed message tracing using OpenTracing</description>
+ <!-- <name>Camel Spring Boot :: Starters :: Dozer</name>-->
+ <!-- <description>Spring-Boot Starter for Camel Support for the Dozer type conversion framework</description>-->
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/components-starter/camel-opentracing-starter/src/main/docs/opentracing-starter.adoc b/components-starter/camel-opentracing-starter/src/main/docs/opentracing-starter.adoc
deleted file mode 100644
index 8273355..0000000
--- a/components-starter/camel-opentracing-starter/src/main/docs/opentracing-starter.adoc
+++ /dev/null
@@ -1,31 +0,0 @@
-// spring-boot-auto-configure options: START
-:page-partial:
-:doctitle: Camel Spring Boot Starter for opentracing
-
-== Spring Boot Auto-Configuration
-
-When using opentracing with Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-opentracing-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
-The component supports 2 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.opentracing.encoding* | Activate or deactivate dash encoding in headers (required by JMS) for messaging | | Boolean
-| *camel.opentracing.exclude-patterns* | Sets exclude pattern(s) that will disable tracing for Camel messages that matches the pattern. | | Set
-|===
-
-// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/CamelOpenTracing.java b/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/CamelOpenTracing.java
deleted file mode 100644
index 079c5a1..0000000
--- a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/CamelOpenTracing.java
+++ /dev/null
@@ -1,34 +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.opentracing.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(OpenTracingAutoConfiguration.class)
-public @interface CamelOpenTracing {
-}
diff --git a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingAutoConfiguration.java b/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingAutoConfiguration.java
deleted file mode 100644
index 9069f62..0000000
--- a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingAutoConfiguration.java
+++ /dev/null
@@ -1,57 +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.opentracing.starter;
-
-import io.opentracing.Tracer;
-import org.apache.camel.CamelContext;
-import org.apache.camel.opentracing.OpenTracingTracer;
-import org.springframework.beans.factory.annotation.Autowired;
-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(proxyBeanMethods = false)
-@EnableConfigurationProperties(OpenTracingConfigurationProperties.class)
-@ConditionalOnProperty(value = "camel.opentracing.enabled", matchIfMissing = true)
-public class OpenTracingAutoConfiguration {
-
- @Autowired(required = false)
- private Tracer tracer;
-
- @Bean(initMethod = "", destroyMethod = "")
- // Camel handles the lifecycle of this bean
- @ConditionalOnMissingBean(OpenTracingTracer.class)
- OpenTracingTracer openTracingEventNotifier(CamelContext camelContext,
- OpenTracingConfigurationProperties config) {
- OpenTracingTracer ottracer = new OpenTracingTracer();
- if (tracer != null) {
- ottracer.setTracer(tracer);
- }
- if (config.getExcludePatterns() != null) {
- ottracer.setExcludePatterns(config.getExcludePatterns());
- }
- if (config.getEncoding() != null) {
- ottracer.setEncoding(config.getEncoding().booleanValue());
- }
- ottracer.init(camelContext);
-
- return ottracer;
- }
-
-}
diff --git a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConditionalAutoConfiguration.java b/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConditionalAutoConfiguration.java
deleted file mode 100644
index 24183a5..0000000
--- a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConditionalAutoConfiguration.java
+++ /dev/null
@@ -1,31 +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.opentracing.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 OpenTracing via the configuration property.
- * Useful to bootstrap OpenTracing when not using the {@link CamelOpenTracing} annotation.
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(value = "camel.opentracing.enabled")
-@Import(OpenTracingAutoConfiguration.class)
-public class OpenTracingConditionalAutoConfiguration {
-}
diff --git a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConfigurationProperties.java b/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConfigurationProperties.java
deleted file mode 100644
index 4cdd7f7..0000000
--- a/components-starter/camel-opentracing-starter/src/main/java/org/apache/camel/opentracing/starter/OpenTracingConfigurationProperties.java
+++ /dev/null
@@ -1,52 +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.opentracing.starter;
-
-import java.util.Set;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.opentracing")
-public class OpenTracingConfigurationProperties {
-
- /**
- * Sets exclude pattern(s) that will disable tracing for Camel messages that
- * matches the pattern.
- */
- private Set<String> excludePatterns;
- /**
- * Activate or deactivate dash encoding in headers (required by JMS) for
- * messaging
- */
- private Boolean encoding;
-
- public Set<String> getExcludePatterns() {
- return excludePatterns;
- }
-
- public void setExcludePatterns(Set<String> excludePatterns) {
- this.excludePatterns = excludePatterns;
- }
-
- public Boolean getEncoding() {
- return encoding;
- }
-
- public void setEncoding(Boolean encoding) {
- this.encoding = encoding;
- }
-}
diff --git a/components-starter/camel-opentracing-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-opentracing-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 9294dbb..0000000
--- a/components-starter/camel-opentracing-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.opentracing.starter.OpenTracingConditionalAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 2f6398b..09c5060 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -412,8 +412,8 @@
<module>camel-univocity-parsers-starter</module>
<module>camel-validator-starter</module>
<module>camel-velocity-starter</module>
- <module>camel-vertx-starter</module>
<module>camel-vertx-http-starter</module>
+ <module>camel-vertx-starter</module>
<module>camel-vertx-websocket-starter</module>
<module>camel-vm-starter</module>
<module>camel-weather-starter</module>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index fa7ab1c..5f370a0 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -3214,6 +3214,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-opentelemetry</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-opentracing</artifactId>
<version>3.5.0-SNAPSHOT</version>
</dependency>
@@ -3684,6 +3689,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-tracing</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-twilio</artifactId>
<version>3.5.0-SNAPSHOT</version>
</dependency>
[camel-spring-boot] 03/03: Added camel-opentelemetry integration
test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 1859e39f70bef664e9e1a359ff42c9d060832a8d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 29 11:49:25 2020 +0200
Added camel-opentelemetry integration test
---
.../itest/springboot/CamelOpentelemetryTest.java | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java
new file mode 100644
index 0000000..0c06b37
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelOpentelemetryTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelOpentelemetryTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ // no component test
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}
[camel-spring-boot] 02/03: CAMEL-15339 - Added camel-opentelemetry
spring boot starter
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 5510de3ed97c21f63329e843d93c6c4afb4af6ca
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 29 11:44:02 2020 +0200
CAMEL-15339 - Added camel-opentelemetry spring boot starter
---
.../camel/springboot/catalog/others.properties | 1 +
.../springboot/catalog/others/opentelemetry.json | 15 ++
components-starter/README.adoc | 5 +-
.../camel-opentelemetry-starter/pom.xml | 53 ++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
.../src/main/resources/META-INF/spring.provides | 17 ++
components-starter/pom.xml | 1 +
docs/modules/ROOT/pages/list.adoc | 5 +-
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
10 files changed, 314 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
index ba7e95b..d7e0b12 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
@@ -5,6 +5,7 @@ jasypt
leveldb
lra
openapi-java
+opentelemetry
opentracing
reactor
resilience4j
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/opentelemetry.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/opentelemetry.json
new file mode 100644
index 0000000..30810e7
--- /dev/null
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/opentelemetry.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "opentelemetry",
+ "title": "OpenTelemetry",
+ "description": "Distributed tracing using OpenTelemetry",
+ "deprecated": false,
+ "firstVersion": "3.5.0",
+ "label": "monitoring,microservice",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-opentelemetry-starter",
+ "version": "3.5.0-SNAPSHOT"
+ }
+}
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index fef956d..1c26c88 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -1231,7 +1231,7 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated)
== Miscellaneous Extensions
// others: START
-Number of miscellaneous extensions: 22 in 22 JAR artifacts (1 deprecated)
+Number of miscellaneous extensions: 23 in 23 JAR artifacts (1 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1258,6 +1258,9 @@ Number of miscellaneous extensions: 22 in 22 JAR artifacts (1 deprecated)
| link:https://camel.apache.org/components/latest/others/openapi-java.html[Openapi Java] +
(camel-openapi-java-starter) | 3.1 | Rest-dsl support for using openapi doc
+| link:https://camel.apache.org/components/latest/others/opentelemetry.html[OpenTelemetry] +
+(camel-opentelemetry-starter) | 3.5 | Distributed tracing using OpenTelemetry
+
| link:https://camel.apache.org/components/latest/others/opentracing.html[OpenTracing] +
(camel-opentracing-starter) | 2.19 | Distributed tracing using OpenTracing
diff --git a/components-starter/camel-opentelemetry-starter/pom.xml b/components-starter/camel-opentelemetry-starter/pom.xml
new file mode 100644
index 0000000..42efb28
--- /dev/null
+++ b/components-starter/camel-opentelemetry-starter/pom.xml
@@ -0,0 +1,53 @@
+<?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.springboot</groupId>
+ <artifactId>components-starter</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>camel-opentelemetry-starter</artifactId>
+ <packaging>jar</packaging>
+ <!-- <name>Camel Spring Boot :: Starters :: Dozer</name>-->
+ <!-- <description>Spring-Boot Starter for Camel Support for the Dozer type conversion framework</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-opentelemetry</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
+ <!--START OF GENERATED CODE-->
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-core-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ </dependency>
+ <!--END OF GENERATED CODE-->
+ </dependencies>
+</project>
diff --git a/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components-starter/camel-opentelemetry-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.
+
diff --git a/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components-starter/camel-opentelemetry-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.
diff --git a/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring.provides b/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..7b20cf2
--- /dev/null
+++ b/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+provides: camel-opentelemetry
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 09c5060..9529c33 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -328,6 +328,7 @@
<module>camel-olingo4-starter</module>
<module>camel-openapi-java-starter</module>
<module>camel-openstack-starter</module>
+ <module>camel-opentelemetry-starter</module>
<module>camel-opentracing-starter</module>
<module>camel-optaplanner-starter</module>
<module>camel-paho-starter</module>
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index fef956d..1c26c88 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -1231,7 +1231,7 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated)
== Miscellaneous Extensions
// others: START
-Number of miscellaneous extensions: 22 in 22 JAR artifacts (1 deprecated)
+Number of miscellaneous extensions: 23 in 23 JAR artifacts (1 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1258,6 +1258,9 @@ Number of miscellaneous extensions: 22 in 22 JAR artifacts (1 deprecated)
| link:https://camel.apache.org/components/latest/others/openapi-java.html[Openapi Java] +
(camel-openapi-java-starter) | 3.1 | Rest-dsl support for using openapi doc
+| link:https://camel.apache.org/components/latest/others/opentelemetry.html[OpenTelemetry] +
+(camel-opentelemetry-starter) | 3.5 | Distributed tracing using OpenTelemetry
+
| link:https://camel.apache.org/components/latest/others/opentracing.html[OpenTracing] +
(camel-opentracing-starter) | 2.19 | Distributed tracing using OpenTracing
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 5f370a0..71a6ed5 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1338,6 +1338,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-opentelemetry-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-opentracing-starter</artifactId>
<version>${project.version}</version>
</dependency>