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:21 UTC
[3/6] camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Work in progress.
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