You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2020/02/11 01:42:52 UTC
[cxf] branch 3.2.x-fixes updated: Incompatibility with recent Brave
versions causes NullPointerException and hides root cause (#639)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 6caa9d7 Incompatibility with recent Brave versions causes NullPointerException and hides root cause (#639)
6caa9d7 is described below
commit 6caa9d73cb46f52bedf884353c0abf3b54b91eda
Author: Tim Peeters <ti...@users.noreply.github.com>
AuthorDate: Tue Feb 11 01:07:18 2020 +0100
Incompatibility with recent Brave versions causes NullPointerException and hides root cause (#639)
* Bump to latest Brave and Zipkin versions
* Fix NullPointerException in case of SOAP faults
---
.../src/main/release/samples/jax_rs/tracing_brave/pom.xml | 9 +++++----
.../apache/cxf/tracing/brave/AbstractBraveClientProvider.java | 5 ++++-
parent/pom.xml | 6 +++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
index 89d1b3e..69df6d5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
@@ -30,6 +30,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <cxf.brave.version>5.9.4</cxf.brave.version>
</properties>
<profiles>
<profile>
@@ -204,22 +205,22 @@
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-context-slf4j</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-httpclient</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-httpasyncclient</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-okhttp3</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index 2f4d7ed..4071d0c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -28,6 +28,8 @@ import brave.Span;
import brave.Tracer.SpanInScope;
import brave.http.HttpClientAdapter;
import brave.http.HttpClientHandler;
+import brave.http.HttpClientRequest;
+import brave.http.HttpClientResponse;
import brave.http.HttpTracing;
import brave.propagation.Propagation.Setter;
import org.apache.cxf.common.logging.LogUtils;
@@ -123,7 +125,8 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
brave.tracing().tracer().joinSpan(scope.getSpan().context());
}
- final HttpClientHandler<?, Response> handler = HttpClientHandler.create(brave, null);
+ final HttpClientHandler<HttpClientRequest, HttpClientResponse> handler =
+ HttpClientHandler.create(brave);
handler.handleReceive(null, ex, scope.getSpan());
} finally {
scope.close();
diff --git a/parent/pom.xml b/parent/pom.xml
index ecd24b6..e646231 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -227,9 +227,9 @@
<cxf.jexl.version>2.1.1</cxf.jexl.version>
<cxf.htrace.version>4.2.0-incubating</cxf.htrace.version>
<cxf.zest.version>2.1</cxf.zest.version>
- <cxf.brave.reporter.version>2.8.4</cxf.brave.reporter.version>
- <cxf.brave.version>5.6.5</cxf.brave.version>
- <cxf.brave.zipkin.version>2.14.2</cxf.brave.zipkin.version>
+ <cxf.brave.reporter.version>2.12.1</cxf.brave.reporter.version>
+ <cxf.brave.version>5.9.4</cxf.brave.version>
+ <cxf.brave.zipkin.version>2.19.3</cxf.brave.zipkin.version>
<cxf.opentracing.version>0.30.0</cxf.opentracing.version>
<cxf.jaeger.version>0.20.6</cxf.jaeger.version>
<cxf.findbugs.version>3.0.2</cxf.findbugs.version>