camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel] 02/02: Final touches to Zipkin update + regen
Date Sun, 17 Jun 2018 17:31:12 GMT
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.git

commit e14108b3e6fd57552b1738ee906b30a7e763ed09
Author: Andrea Cosentino <ancosen@gmail.com>
AuthorDate: Sun Jun 17 19:06:18 2018 +0200

    Final touches to Zipkin update + regen
---
 .../camel-jms/src/main/docs/jms-component.adoc     |  2 +-
 .../apache/camel/zipkin/LogSpanReporterTest.java   | 32 ++++++++++++++++++++++
 .../camel/zipkin/SpringZipkinSimpleRouteTest.xml   |  2 +-
 .../karaf/features/src/main/resources/features.xml |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index d027209..2418084 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -196,7 +196,7 @@ about these properties by consulting the relevant Spring documentation.
 
 
 // component options: START
-The JMS component supports 80 options, which are listed below.
+The JMS component supports 80 options which are listed below.
 
 
 
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/LogSpanReporterTest.java
b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/LogSpanReporterTest.java
new file mode 100644
index 0000000..598bf35
--- /dev/null
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/LogSpanReporterTest.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 org.apache.camel.zipkin;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import zipkin2.reporter.Reporter;
+
+public class LogSpanReporterTest<S> implements Reporter<S> {
+
+    Logger log = LoggerFactory.getLogger(LogSpanReporterTest.class);
+
+    @Override
+    public void report(S span) {
+        log.info(span.toString());
+    }
+}
diff --git a/components/camel-zipkin/src/test/resources/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.xml
b/components/camel-zipkin/src/test/resources/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.xml
index 7257e82..4f46fad 100644
--- a/components/camel-zipkin/src/test/resources/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.xml
+++ b/components/camel-zipkin/src/test/resources/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.xml
@@ -25,7 +25,7 @@
     ">
 
   <!-- to use a logger as the span reporter (for testing) -->
-  <bean id="logSpanReporter" class="com.github.kristofa.brave.LoggingReporter"/>
+  <bean id="logSpanReporter" class="org.apache.camel.zipkin.LogSpanReporterTest"/>
 
   <!-- setup zipkin tracer -->
   <bean id="zipkinTracer" class="org.apache.camel.zipkin.ZipkinTracer">
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c932b7e..7fc58b3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2483,6 +2483,7 @@
   <feature name='camel-zipkin' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:io.zipkin.brave/brave-core/${brave-zipkin-version}</bundle>
+    <bundle dependency='true'>mvn:io.zipkin.java/zipkin/${zipkin-version}</bundle>
     <bundle dependency='true'>mvn:io.zipkin.zipkin2/zipkin/${zipkin-version}</bundle>
     <bundle dependency='true'>mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin-reporter-version}</bundle>
     <bundle dependency='true'>mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter-version}</bundle>

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

Mime
View raw message