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 2017/04/11 13:36:39 UTC
camel git commit: Update OpenTracing agent version to 0.0.11,
and update rule file name/location.
Repository: camel
Updated Branches:
refs/heads/master a421db268 -> 80156b3c1
Update OpenTracing agent version to 0.0.11, and update rule file name/location.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80156b3c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80156b3c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80156b3c
Branch: refs/heads/master
Commit: 80156b3c1f3d749aec703ce6620015aee5db43c4
Parents: a421db2
Author: Gary Brown <ga...@brownuk.com>
Authored: Tue Apr 11 14:31:00 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 11 15:36:31 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/otagent/apache-camel.btm | 32 --------------------
.../src/main/resources/otarules.btm | 32 ++++++++++++++++++++
parent/pom.xml | 2 +-
3 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/80156b3c/components/camel-opentracing/src/main/resources/otagent/apache-camel.btm
----------------------------------------------------------------------
diff --git a/components/camel-opentracing/src/main/resources/otagent/apache-camel.btm b/components/camel-opentracing/src/main/resources/otagent/apache-camel.btm
deleted file mode 100644
index 609153b..0000000
--- a/components/camel-opentracing/src/main/resources/otagent/apache-camel.btm
+++ /dev/null
@@ -1,32 +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.
-#
-
-# State 0 - camel context not initialized
-# State 1 - camel context initialized
-
-RULE apache-camel: Install OpenTracing tracer
-CLASS org.apache.camel.impl.DefaultCamelContext
-METHOD startRouteDefinitions
-HELPER io.opentracing.contrib.agent.OpenTracingHelper
-BIND
- ottracer:org.apache.camel.opentracing.OpenTracingTracer = new org.apache.camel.opentracing.OpenTracingTracer();
-AT ENTRY
-IF getState($0) == 0
-DO
- ottracer.init($0);
- setState($0, 1);
-ENDRULE
http://git-wip-us.apache.org/repos/asf/camel/blob/80156b3c/components/camel-opentracing/src/main/resources/otarules.btm
----------------------------------------------------------------------
diff --git a/components/camel-opentracing/src/main/resources/otarules.btm b/components/camel-opentracing/src/main/resources/otarules.btm
new file mode 100644
index 0000000..609153b
--- /dev/null
+++ b/components/camel-opentracing/src/main/resources/otarules.btm
@@ -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.
+#
+
+# State 0 - camel context not initialized
+# State 1 - camel context initialized
+
+RULE apache-camel: Install OpenTracing tracer
+CLASS org.apache.camel.impl.DefaultCamelContext
+METHOD startRouteDefinitions
+HELPER io.opentracing.contrib.agent.OpenTracingHelper
+BIND
+ ottracer:org.apache.camel.opentracing.OpenTracingTracer = new org.apache.camel.opentracing.OpenTracingTracer();
+AT ENTRY
+IF getState($0) == 0
+DO
+ ottracer.init($0);
+ setState($0, 1);
+ENDRULE
http://git-wip-us.apache.org/repos/asf/camel/blob/80156b3c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ffb3a7..6812d24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -498,7 +498,7 @@
<openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
<openstack4j-version>3.0.2</openstack4j-version>
<openstack4j-guava-version>17.0</openstack4j-guava-version>
- <opentracing-java-agent-version>0.0.10</opentracing-java-agent-version>
+ <opentracing-java-agent-version>0.0.11</opentracing-java-agent-version>
<opentracing-java-spanmanager-version>0.0.3</opentracing-java-spanmanager-version>
<opentracing-version>0.21.0</opentracing-version>
<ops4j-base-version>1.5.0</ops4j-base-version>