You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/01/17 12:58:43 UTC
[camel] branch master updated: CAMEL-12153 Upgrade OpenTracing Java
API version to 0.31
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
The following commit(s) were added to refs/heads/master by this push:
new 96b20a1 CAMEL-12153 Upgrade OpenTracing Java API version to 0.31
96b20a1 is described below
commit 96b20a1988fd858e2443ed176a5ad1346e28c466
Author: Gary Brown <ga...@brownuk.com>
AuthorDate: Wed Jan 17 12:34:54 2018 +0000
CAMEL-12153 Upgrade OpenTracing Java API version to 0.31
---
components/camel-opentracing/pom.xml | 6 ++++++
components/camel-opentracing/src/main/docs/opentracing.adoc | 3 +++
.../main/java/org/apache/camel/opentracing/OpenTracingTracer.java | 3 ++-
.../camel/opentracing/OpentracingSpanCollectorInRegistryTest.java | 4 ++--
parent/pom.xml | 6 +++---
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml
index 95e79bb..5ae0830 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -82,6 +82,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>${opentracing-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc b/components/camel-opentracing/src/main/docs/opentracing.adoc
index f7e0a8b..99e8c7c 100644
--- a/components/camel-opentracing/src/main/docs/opentracing.adoc
+++ b/components/camel-opentracing/src/main/docs/opentracing.adoc
@@ -3,6 +3,9 @@
*Available as of Camel 2.19*
+IMPORTANT: Starting with Camel 2.21, it will be necessary to use an OpenTracing complaint tracer that is
+compatible with OpenTracing Java API version 0.31 or higher.
+
The camel-opentracing component is used for tracing and timing incoming and
outgoing Camel messages using http://opentracing.io/[OpenTracing].
diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
index c3395c9..776559c 100644
--- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
+++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
@@ -23,13 +23,14 @@ import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
-import io.opentracing.NoopTracerFactory;
import io.opentracing.Span;
import io.opentracing.Tracer;
import io.opentracing.Tracer.SpanBuilder;
import io.opentracing.contrib.tracerresolver.TracerResolver;
+import io.opentracing.noop.NoopTracerFactory;
import io.opentracing.propagation.Format;
import io.opentracing.tag.Tags;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
index e2c8f18..1749f2f 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.opentracing;
-import io.opentracing.NoopTracer;
-import io.opentracing.NoopTracerFactory;
+import io.opentracing.noop.NoopTracer;
+import io.opentracing.noop.NoopTracerFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.JndiRegistry;
diff --git a/parent/pom.xml b/parent/pom.xml
index bb323f8..20b9b54 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -542,9 +542,9 @@
<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.1.0</opentracing-java-agent-version>
- <opentracing-version>0.30.0</opentracing-version>
- <opentracing-tracerresolver-version>0.1.0</opentracing-tracerresolver-version>
+ <opentracing-java-agent-version>0.2.0</opentracing-java-agent-version>
+ <opentracing-version>0.31.0</opentracing-version>
+ <opentracing-tracerresolver-version>0.1.4</opentracing-tracerresolver-version>
<ops4j-base-version>1.5.0</ops4j-base-version>
<optaplanner-version>7.3.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].