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 2018/09/26 01:36:06 UTC
[cxf] branch 3.2.x-fixes updated: CXF-7844: Change Zipkin/Brave XML
to use brave-spring-beans. Adding destroy-method to senders.
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 b8f5d21 CXF-7844: Change Zipkin/Brave XML to use brave-spring-beans. Adding destroy-method to senders.
b8f5d21 is described below
commit b8f5d217096f4e97a9b3e47ce10fb99cb91c747f
Author: reta <dr...@gmail.com>
AuthorDate: Tue Sep 25 21:34:20 2018 -0400
CXF-7844: Change Zipkin/Brave XML to use brave-spring-beans. Adding destroy-method to senders.
---
.../src/main/release/samples/jax_rs/tracing_brave_osgi/README.txt | 1 +
.../src/main/resources/OSGI-INF/blueprint/context.xml | 4 ++--
.../src/main/resources/OSGI-INF/blueprint/context.xml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/README.txt
index 913eaee..a977707 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/README.txt
@@ -57,6 +57,7 @@ for this demo bundle.
feature:install cxf-jaxrs
feature:install cxf-jsr-json
feature:install cxf-tracing-brave
+ feature:install aries-blueprint
Install this demo bundle (using the appropriate bundle version number)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
index 3cfc9ca..c0979e5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
@@ -27,11 +27,11 @@
http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd">
- <bean id="sender" class="zipkin2.reporter.okhttp3.OkHttpSender" factory-method="create">
+ <bean id="sender" class="zipkin2.reporter.okhttp3.OkHttpSender" factory-method="create" destroy-method="close">
<argument index="0" value="http://localhost:9411/api/v2/spans" />
</bean>
- <bean id="tracing" class="demo.jaxrs.tracing.server.CatalogTracingFactory" factory-method="create">
+ <bean id="tracing" class="demo.jaxrs.tracing.server.CatalogTracingFactory" factory-method="create">
<argument index="0" value="catalog-service" />
<argument index="1" ref="sender" />
</bean>
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
index 190c72b..79e8c31 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
@@ -42,7 +42,7 @@
<argument index="0" ref="tracing" />
</bean>
- <bean id="sender" class="zipkin2.reporter.okhttp3.OkHttpSender" factory-method="create">
+ <bean id="sender" class="zipkin2.reporter.okhttp3.OkHttpSender" factory-method="create" destroy-method="close">
<argument index="0" value="http://localhost:9411/api/v2/spans" />
</bean>