Repository: cxf Updated Branches: refs/heads/master bc73cc529 -> a4167fb84
CXF-7164: Support tracing using OpenZipkin Brave. Removing dependency to JAXRSUtils from AbstractBraveProvider (and AbstractHTraceProvider). Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a4167fb8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4167fb8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4167fb8 Branch: refs/heads/master Commit: a4167fb84baa1834bbe86be8a749c385f1af8c82 Parents: bc73cc5 Author: reta <[email protected]> Authored: Sun Jan 29 12:51:42 2017 -0500 Committer: reta <[email protected]> Committed: Sun Jan 29 12:51:42 2017 -0500 ---------------------------------------------------------------------- .../org/apache/cxf/tracing/brave/AbstractBraveProvider.java | 6 +++--- .../org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a4167fb8/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java index e661766..3a656eb 100644 --- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java +++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java @@ -34,7 +34,7 @@ import com.github.kristofa.brave.http.SpanNameProvider; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.CastUtils; -import org.apache.cxf.jaxrs.utils.JAXRSUtils; +import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.tracing.AbstractTracingProvider; public abstract class AbstractBraveProvider extends AbstractTracingProvider { @@ -131,10 +131,10 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider { } private void propagateContinuationSpan(final ServerSpan continuationScope) { - JAXRSUtils.getCurrentMessage().put(ServerSpan.class, continuationScope); + PhaseInterceptorChain.getCurrentMessage().put(ServerSpan.class, continuationScope); } protected boolean isAsyncResponse() { - return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous(); + return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous(); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/a4167fb8/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java index 5fe2e20..0cc179d 100644 --- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java +++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.CastUtils; -import org.apache.cxf.jaxrs.utils.JAXRSUtils; +import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.tracing.AbstractTracingProvider; import org.apache.htrace.core.SpanId; import org.apache.htrace.core.TraceScope; @@ -95,11 +95,11 @@ public abstract class AbstractHTraceProvider extends AbstractTracingProvider { } private void propagateContinuationSpan(final TraceScope continuationScope) { - JAXRSUtils.getCurrentMessage().put(TraceScope.class, continuationScope); + PhaseInterceptorChain.getCurrentMessage().put(TraceScope.class, continuationScope); } protected boolean isAsyncResponse() { - return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous(); + return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous(); } private static SpanId getFirstValueOrDefault(final Map<String, List<String>> headers,
