This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 79466c5 Incompatibility with recent Brave versions causes
NullPointerException and hides root cause (#639)
79466c5 is described below
commit 79466c55a2a1191df9c28a02568b82a8c3d08fbd
Author: Tim Peeters <[email protected]>
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
---
distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml | 2 +-
.../org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java | 5 ++++-
parent/pom.xml | 6 +++---
3 files changed, 8 insertions(+), 5 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 a025323..7caf655 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,7 +30,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <cxf.brave.version>5.4.2</cxf.brave.version>
+ <cxf.brave.version>5.9.4</cxf.brave.version>
</properties>
<profiles>
<profile>
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 d1df0f4..03f44d7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,9 +88,9 @@
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
<cxf.bcprov.version>1.64</cxf.bcprov.version>
- <cxf.brave.reporter.version>2.10.0</cxf.brave.reporter.version>
- <cxf.brave.version>5.6.9</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.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
<cxf.cdi.api.version>2.0</cxf.cdi.api.version>
<cxf.classgraph.version>4.6.32</cxf.classgraph.version>
