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/11 09:44:06 UTC
camel git commit: CAMEL-9795: camel-zipkin - polished
Repository: camel
Updated Branches:
refs/heads/master 57caadfcd -> 7e154e6be
CAMEL-9795: camel-zipkin - polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e154e6b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e154e6b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e154e6b
Branch: refs/heads/master
Commit: 7e154e6be3dd3008cd7c28460c154e3443b6fd4e
Parents: 57caadf
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Apr 11 09:36:54 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Apr 11 09:43:57 2016 +0200
----------------------------------------------------------------------
components/camel-zipkin/pom.xml | 4 ++--
.../src/main/java/org/apache/camel/zipkin/ZipkinTracer.java | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7e154e6b/components/camel-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 2cb8411..a0794b0 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_COLLECTOR_SERVICE_HOST>192.168.99.100</ZIPKIN_COLLECTOR_SERVICE_HOST>
- <ZIPKIN_COLLECTOR_SERVICE_PORT>9410</ZIPKIN_COLLECTOR_SERVICE_PORT>
+ <ZIPKIN_COLLECTOR_SERVICE_THRIFT_HOST>192.168.99.100</ZIPKIN_COLLECTOR_SERVICE_THRIFT_HOST>
+ <ZIPKIN_COLLECTOR_SERVICE_THRIFT_PORT>9410</ZIPKIN_COLLECTOR_SERVICE_THRIFT_PORT>
</environmentVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/7e154e6b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
index 8a5b765..05916f1 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
@@ -84,8 +84,8 @@ import static org.apache.camel.builder.ExpressionBuilder.routeIdExpression;
* Camel will auto-configure a {@link ScribeSpanCollector} if no SpanCollector explicit has been configured, and
* if the hostname and port to the span collector has been configured as environment variables
* <ul>
- * <li>ZIPKIN_COLLECTOR_SERVICE_HOST - The hostname</li>
- * <li>ZIPKIN_COLLECTOR_SERVICE_PORT - The port number</li>
+ * <li>ZIPKIN_COLLECTOR_THRIFT_SERVICE_HOST - The hostname</li>
+ * <li>ZIPKIN_COLLECTOR_THRIFT_SERVICE_PORT - The port number</li>
* </ul>
* <p/>
* This class is implemented as both an {@link org.apache.camel.spi.EventNotifier} and {@link RoutePolicy} that allows
@@ -96,6 +96,7 @@ import static org.apache.camel.builder.ExpressionBuilder.routeIdExpression;
public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory, StaticService, CamelContextAware {
private static final Logger LOG = LoggerFactory.getLogger(ZipkinTracer.class);
+ private static final String ZIPKIN_COLLECTOR_THRIFT_SERVICE = "zipkin-collector-thrift";
private final ZipkinEventNotifier eventNotifier = new ZipkinEventNotifier();
private final Map<String, Brave> braves = new HashMap<>();
private transient boolean useFallbackServiceNames;
@@ -311,8 +312,8 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
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-collector");
- String port = new ServicePortPropertiesFunction().apply("zipkin-collector");
+ String host = new ServiceHostPropertiesFunction().apply(ZIPKIN_COLLECTOR_THRIFT_SERVICE);
+ String port = new ServicePortPropertiesFunction().apply(ZIPKIN_COLLECTOR_THRIFT_SERVICE);
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);