[
https://issues.apache.org/jira/browse/CAMEL-12153?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16328717#comment-16328717
]
ASF GitHub Bot commented on CAMEL-12153:
----------------------------------------
oscerd closed pull request #2181: CAMEL-12153 Upgrade OpenTracing Java API
version to 0.31
URL: https://github.com/apache/camel/pull/2181
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/components/camel-opentracing/pom.xml
b/components/camel-opentracing/pom.xml
index 95e79bb741d..5ae0830effd 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -81,6 +81,12 @@
<version>${opentracing-version}</version>
<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>
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc
b/components/camel-opentracing/src/main/docs/opentracing.adoc
index f7e0a8b841d..99e8c7cca23 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 c3395c9c5b8..776559cb451 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.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 e2c8f189876..1749f2fb9de 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 b1941ee1320..5b5f3f814bc 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Upgrade to OpenTracing Java API 0.31
> ------------------------------------
>
> Key: CAMEL-12153
> URL: https://issues.apache.org/jira/browse/CAMEL-12153
> Project: Camel
> Issue Type: Task
> Components: camel-opentracing
> Environment: Upgrade to use the OpenTracing Java API 0.31.
> This has breaking API changes, changing the 'active span' mechanism to use
> the concept of scopes. Therefore it will require use of a Tracer
> implementation that is also compatible with this new API.
> Reporter: Gary Brown
> Priority: Major
> Fix For: 2.21.0
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
