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 16:08:43 UTC
[2/3] 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/6dfa897e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6dfa897e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6dfa897e
Branch: refs/heads/master
Commit: 6dfa897e88342317eb7e3e5a28ad9653f578184a
Parents: 7e40ae0
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 15:54:49 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 16:08:34 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/zipkin/ZipkinTracer.java | 9 +++++++++
.../java/org/apache/camel/zipkin/ZipkinABCRouteTest.java | 3 +--
.../org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java | 4 +++-
.../apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java | 4 +++-
.../java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java | 4 ++--
.../java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java | 4 +++-
.../apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java | 3 +--
.../camel/zipkin/scribe/ZipkinAutoConfigureScribe.java | 4 +++-
.../camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java | 4 +++-
.../apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java | 4 +++-
.../apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java | 4 +++-
.../apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java | 4 +++-
.../apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java | 4 +++-
13 files changed, 40 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/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 7df3d7d..f4b2aea 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
@@ -102,6 +102,15 @@ public class ZipkinTracer extends EventNotifierSupport implements RoutePolicy, R
public ZipkinTracer() {
}
+ public void init(CamelContext camelContext) {
+ if (!camelContext.getManagementStrategy().getEventNotifiers().contains(this)) {
+ camelContext.getManagementStrategy().addEventNotifier(this);
+ }
+ if (!camelContext.getRoutePolicyFactories().contains(this)) {
+ camelContext.addRoutePolicyFactory(this);
+ }
+ }
+
public CamelContext getCamelContext() {
return camelContext;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
index dacde09..d1c0ea9 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
@@ -44,8 +44,7 @@ public class ZipkinABCRouteTest extends CamelTestSupport {
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
// attaching ourself to CamelContext
- context.getManagementStrategy().addEventNotifier(zipkin);
- context.addRoutePolicyFactory(zipkin);
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
index 694f922..f734a33 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
@@ -37,7 +37,9 @@ public class ZipkinRouteConcurrentTest extends CamelTestSupport {
zipkin.addClientServiceMapping("seda:foo", "foo");
zipkin.addServerServiceMapping("seda:bar", "bar");
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
index 025f59d..691a545 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
@@ -38,7 +38,9 @@ public class ZipkinSimpleFallbackRouteTest extends CamelTestSupport {
// we do not want to trace any direct endpoints
zipkin.addExcludePattern("direct:*");
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
index a3840d8..6875e27 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
@@ -37,8 +37,8 @@ public class ZipkinSimpleRouteTest extends CamelTestSupport {
zipkin.setServiceName("dude");
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
- context.addService(zipkin);
-// context.getManagementStrategy().addEventNotifier(zipkin);
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
index 124ab91..9e6d1de 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
@@ -39,7 +39,9 @@ public class ZipkinTwoRouteTest extends CamelTestSupport {
// capture message body as well
zipkin.setIncludeMessageBody(true);
zipkin.setSpanCollector(new ZipkinLoggingSpanCollector());
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java
index 80be8a2..0fae6c4 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java
@@ -48,8 +48,7 @@ public class ZipkinABCRouteScribe extends CamelTestSupport {
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
// attaching ourself to CamelContext
- context.getManagementStrategy().addEventNotifier(zipkin);
- context.addRoutePolicyFactory(zipkin);
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
index 16885d6..963329d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
@@ -44,7 +44,9 @@ public class ZipkinAutoConfigureScribe extends CamelTestSupport {
zipkin.addClientServiceMapping("seda:cat", "cat");
zipkin.addServerServiceMapping("seda:cat", "cat");
// should auto configure as we have not setup a spanCollector
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java
index 3b34ae8..ae5e5a7 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java
@@ -47,7 +47,9 @@ public class ZipkinOneRouteFallbackScribe extends CamelTestSupport {
zipkin.addExcludePattern("direct:*");
zipkin.setIncludeMessageBody(true);
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
index 772b332..c2ab130 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
@@ -46,7 +46,9 @@ public class ZipkinOneRouteScribe extends CamelTestSupport {
zipkin.addClientServiceMapping("seda:cat", "cat");
zipkin.addServerServiceMapping("seda:cat", "cat");
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
index e1289ee..347cd3e 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
@@ -46,7 +46,9 @@ public class ZipkinSimpleRouteScribe extends CamelTestSupport {
zipkin.addClientServiceMapping("seda:dude", "dude");
zipkin.addServerServiceMapping("seda:dude", "dude");
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
index df4d607..f98249a 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
@@ -50,7 +50,9 @@ public class ZipkinTimerRouteScribe extends CamelTestSupport {
zipkin.addClientServiceMapping("seda:timer", "timer");
zipkin.addServerServiceMapping("seda:timer", "timer");
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6dfa897e/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
index 4dbe3a9..5a9c701 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
@@ -50,7 +50,9 @@ public class ZipkinTwoRouteScribe extends CamelTestSupport {
// capture message body as well
zipkin.setIncludeMessageBody(true);
zipkin.setSpanCollector(new ScribeSpanCollector(ip, 9410));
- context.getManagementStrategy().addEventNotifier(zipkin);
+
+ // attaching ourself to CamelContext
+ zipkin.init(context);
return context;
}