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 2015/10/21 04:16:39 UTC
cxf git commit: CXF-6643: Upgraded Apache HTrace to 4.0 release
branch. Minor fixes related to deprecated APIs.
Repository: cxf
Updated Branches:
refs/heads/master 7a0736b8f -> 44d7b57b7
CXF-6643: Upgraded Apache HTrace to 4.0 release branch. Minor fixes related to deprecated APIs.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/44d7b57b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/44d7b57b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/44d7b57b
Branch: refs/heads/master
Commit: 44d7b57b7cbab26767eb3e485674210214d87673
Parents: 7a0736b
Author: reta <dr...@gmail.com>
Authored: Tue Oct 20 22:16:14 2015 -0400
Committer: reta <dr...@gmail.com>
Committed: Tue Oct 20 22:16:14 2015 -0400
----------------------------------------------------------------------
.../src/main/java/demo/jaxrs/tracing/client/Client.java | 3 +--
.../main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java | 3 +++
.../src/main/java/demo/jaxrs/tracing/server/Catalog.java | 2 +-
integration/tracing/tracing-htrace/pom.xml | 2 +-
.../java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java | 3 +--
parent/pom.xml | 4 ++--
.../jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java | 3 +--
.../cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java | 3 +--
.../cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java | 3 +--
9 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
index 9e741a3..c2047ee8 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -43,8 +43,7 @@ public final class Client {
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
- final Tracer tracer = new Tracer.Builder()
- .name("catalog-client")
+ final Tracer tracer = new Tracer.Builder("catalog-client")
.conf(HTraceConfiguration.fromMap(properties))
.build();
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
index 23a2fd3..a15c17a 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
@@ -24,6 +24,9 @@ import org.apache.htrace.core.StandardOutSpanReceiver;
public final class TracingConfiguration {
public static final Class<? extends SpanReceiver> SPAN_RECEIVER = StandardOutSpanReceiver.class;
+ // Apache HBase client still uses Apache HTrace 3.x release branch
+ public static final Class<? extends org.apache.htrace.SpanReceiver> HBASE_SPAN_RECEIVER =
+ org.apache.htrace.impl.StandardOutSpanReceiver.class;
private TracingConfiguration() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 11ac82b..b5017c2 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -60,7 +60,7 @@ public class Catalog {
final Configuration configuration = HBaseConfiguration.create();
configuration.set("hbase.zookeeper.quorum", "hbase");
configuration.set("hbase.zookeeper.property.clientPort", "2181");
- configuration.set(SpanReceiverHost.SPAN_RECEIVERS_CONF_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
+ configuration.set(SpanReceiverHost.SPAN_RECEIVERS_CONF_KEY, TracingConfiguration.HBASE_SPAN_RECEIVER.getName());
store = new CatalogStore(configuration, "catalog");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/integration/tracing/tracing-htrace/pom.xml
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/pom.xml b/integration/tracing/tracing-htrace/pom.xml
index c0b4f59..ea72300 100644
--- a/integration/tracing/tracing-htrace/pom.xml
+++ b/integration/tracing/tracing-htrace/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
+ <artifactId>htrace-core4</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
index 2658fa3..d9b8623 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
@@ -46,9 +46,8 @@ public class HTraceFeature extends AbstractFeature {
.getEndpoint()
.get(ServerProviderFactory.class.getName());
- final Tracer tracer = new Tracer.Builder()
+ final Tracer tracer = new Tracer.Builder(name)
.conf(configuration)
- .name(name)
.build();
if (providerFactory != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6bb03ab..e5ee6d2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -191,7 +191,7 @@
<cxf.olingo.version>1.2.0</cxf.olingo.version>
<cxf.tika.version>1.6</cxf.tika.version>
<cxf.jexl.version>2.1.1</cxf.jexl.version>
- <cxf.htrace.version>4.0.0-incubating</cxf.htrace.version>
+ <cxf.htrace.version>4.0.1-incubating</cxf.htrace.version>
<cxf.checkstyle.extension />
<cxf.jaxb.context.class />
<cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
@@ -1784,7 +1784,7 @@
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core</artifactId>
+ <artifactId>htrace-core4</artifactId>
<version>${cxf.htrace.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java
----------------------------------------------------------------------
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java
index ccc6b85..b7c5b32 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java
@@ -95,8 +95,7 @@ public class HTraceTracingCustomHeadersTest extends AbstractBusClientServerTestB
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, StandardOutSpanReceiver.class.getName());
properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
- tracer = new Tracer.Builder()
- .name("tracer")
+ tracer = new Tracer.Builder("tracer")
.conf(HTraceConfiguration.fromMap(properties))
.build();
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java
----------------------------------------------------------------------
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java
index 6b59144..7299d67 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java
@@ -94,8 +94,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase {
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, StandardOutSpanReceiver.class.getName());
properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
- tracer = new Tracer.Builder()
- .name("tracer")
+ tracer = new Tracer.Builder("tracer")
.conf(HTraceConfiguration.fromMap(properties))
.build();
http://git-wip-us.apache.org/repos/asf/cxf/blob/44d7b57b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java
----------------------------------------------------------------------
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java
index 8fb1cc2..d133116 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java
@@ -216,8 +216,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase {
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TestSpanReceiver.class.getName());
properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
- return new Tracer.Builder()
- .name("tracer")
+ return new Tracer.Builder("tracer")
.conf(HTraceConfiguration.fromMap(properties))
.build();
}