This is an automated email from the ASF dual-hosted git repository.
buhhunyx 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 a05c7db cxf-systests-microprofile-tracing: switch to SpanHandler
a05c7db is described below
commit a05c7db2a8c09f38e98ad08c921da55f0d5f511f
Author: Alexey Markevich <[email protected]>
AuthorDate: Sat Mar 13 11:34:13 2021 +0300
cxf-systests-microprofile-tracing: switch to SpanHandler
---
.../rest/client/JaxrsHeaderPropagationTest.java | 30 ++++-----
.../rest/client/regex/JaxrsPathRegexTest.java | 30 ++++-----
.../rest/client/tracing/BookStore.java | 2 +-
.../client/tracing/brave/BraveTracingTest.java | 75 +++++++++++-----------
...{TestSpanReporter.java => TestSpanHandler.java} | 14 ++--
5 files changed, 68 insertions(+), 83 deletions(-)
diff --git
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
index 9a2c60f..02fbc6a 100644
---
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
+++
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
@@ -27,48 +27,41 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractServerTestServerBase;
import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JaxrsHeaderPropagationTest extends
AbstractBusClientServerTestBase {
+public class JaxrsHeaderPropagationTest extends AbstractClientServerTestBase {
public static final String PORT =
allocatePort(JaxrsHeaderPropagationTest.class);
WebClient client;
- @Ignore
- public static class Server extends AbstractBusTestServerBase {
- protected void run() {
+
+ public static class Server extends AbstractServerTestServerBase {
+ @Override
+ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws
Exception {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(JaxrsResource.class);
sf.setResourceProvider(JaxrsResource.class,
new SingletonResourceProvider(new JaxrsResource()));
sf.setAddress("http://localhost:"; + PORT + "/");
sf.setPublishedEndpointUrl("/");
- sf.create();
+ return sf.create();
}
- public static void main(String[] args) {
- try {
- Server s = new Server();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
+ public static void main(String[] args) throws Exception {
+ new Server().start();
}
}
@@ -78,7 +71,6 @@ public class JaxrsHeaderPropagationTest extends
AbstractBusClientServerTestBase
AbstractResourceInfo.clearAllMaps();
//keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
- createStaticBus();
System.out.println("Listening on port " + PORT);
ConfigProviderResolver.setInstance(
diff --git
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
index 660d93a..8f78544 100644
---
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
+++
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/regex/JaxrsPathRegexTest.java
@@ -20,16 +20,16 @@ package
org.apache.cxf.systest.microprofile.rest.client.regex;
import java.net.URI;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractServerTestServerBase;
import org.eclipse.microprofile.rest.client.RestClientBuilder;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -39,32 +39,25 @@ import static org.junit.Assert.fail;
/**
* Testing: @Path("/echoxmlbookregex/{id : [5-9]{3,4}}")
*/
-public class JaxrsPathRegexTest extends AbstractBusClientServerTestBase {
+public class JaxrsPathRegexTest extends AbstractClientServerTestBase {
public static final String PORT = allocatePort(JaxrsPathRegexTest.class);
WebClient client;
- @Ignore
- public static class Server extends AbstractBusTestServerBase {
- protected void run() {
+
+ public static class Server extends AbstractServerTestServerBase {
+ @Override
+ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws
Exception {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(BookStore.class);
sf.setResourceProvider(BookStore.class,
new SingletonResourceProvider(new BookStore()));
sf.setAddress("http://localhost:"; + PORT + "/");
sf.setPublishedEndpointUrl("/");
- sf.create();
+ return sf.create();
}
- public static void main(String[] args) {
- try {
- Server s = new Server();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
+ public static void main(String[] args) throws Exception {
+ new Server().start();
}
}
@@ -74,7 +67,6 @@ public class JaxrsPathRegexTest extends
AbstractBusClientServerTestBase {
AbstractResourceInfo.clearAllMaps();
//keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
- createStaticBus();
System.out.println("Listening on port " + PORT);
}
diff --git
a/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/BookStore.java
b/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/BookStore.java
index e3d8143..a1b2b06 100644
---
a/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/BookStore.java
+++
b/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/BookStore.java
@@ -41,7 +41,7 @@ public class BookStore<T extends Closeable> {
@Path("/books")
@Produces(MediaType.APPLICATION_JSON)
public Collection< Book > getBooks() throws IOException {
- try (T span = tracer.startSpan("Get Books")) {
+ try (T span = tracer.startSpan("get books")) {
return Arrays.asList(
new Book("Apache CXF in Action", UUID.randomUUID().toString()),
new Book("Mastering Apache CXF", UUID.randomUUID().toString())
diff --git
a/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/BraveTracingTest.java
b/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/BraveTracingTest.java
index 68ca0a9..3191b97 100644
---
a/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/BraveTracingTest.java
+++
b/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/BraveTracingTest.java
@@ -25,13 +25,14 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import brave.ScopedSpan;
import brave.Tracing;
import brave.sampler.Sampler;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systest.microprofile.rest.client.tracing.BookRestClient;
import org.apache.cxf.systest.microprofile.rest.client.tracing.BookStore;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractServerTestServerBase;
import org.apache.cxf.tracing.brave.TraceScope;
import org.apache.cxf.tracing.brave.jaxrs.BraveClientProvider;
import org.apache.cxf.tracing.brave.jaxrs.BraveFeature;
@@ -40,7 +41,6 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -48,18 +48,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.junit.Assert.assertTrue;
-public class BraveTracingTest extends AbstractBusClientServerTestBase {
+public class BraveTracingTest extends AbstractClientServerTestBase {
public static final String PORT = allocatePort(BraveTracingTest.class);
private Tracing brave;
private BraveClientProvider braveClientProvider;
- @Ignore
- public static class Server extends AbstractBusTestServerBase {
- protected void run() {
+ public static class Server extends AbstractServerTestServerBase {
+ @Override
+ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws
Exception {
final Tracing brave = Tracing
.newBuilder()
- .spanReporter(new TestSpanReporter())
+ .addSpanHandler(new TestSpanHandler())
.sampler(Sampler.ALWAYS_SAMPLE)
.build();
@@ -69,7 +69,7 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
sf.setAddress("http://localhost:"; + PORT);
sf.setProvider(new JacksonJsonProvider());
sf.setProvider(new BraveFeature(brave));
- sf.create();
+ return sf.create();
}
}
@@ -78,16 +78,15 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
AbstractResourceInfo.clearAllMaps();
//keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
- createStaticBus();
}
@Before
public void setUp() {
- TestSpanReporter.clear();
+ TestSpanHandler.clear();
brave = Tracing
.newBuilder()
- .spanReporter(new TestSpanReporter())
+ .addSpanHandler(new TestSpanHandler())
.sampler(Sampler.ALWAYS_SAMPLE)
.build();
@@ -99,14 +98,14 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
final BookRestClient client = createRestClient();
assertThat(client.getBooks(), hasSize(2));
- assertThat(TestSpanReporter.getAllSpans().size(),
+ assertThat(TestSpanHandler.getAllSpans().size(),
equalTo(3));
- assertThat(TestSpanReporter.getAllSpans().get(0).name(),
+ assertThat(TestSpanHandler.getAllSpans().get(0).name(),
equalTo("get books"));
- assertThat(TestSpanReporter.getAllSpans().get(1).name(),
- equalTo("get /bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(2).name(),
- equalTo("get http://localhost:"; + PORT + "/bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(1).name(),
+ equalTo("GET /bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(2).name(),
+ equalTo("GET http://localhost:"; + PORT + "/bookstore/books"));
}
@Test
@@ -114,14 +113,14 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
final BookRestClient client = createAsyncRestClient();
assertThat(client.getBooks(), hasSize(2));
- assertThat(TestSpanReporter.getAllSpans().size(),
+ assertThat(TestSpanHandler.getAllSpans().size(),
equalTo(3));
- assertThat(TestSpanReporter.getAllSpans().get(0).name(),
+ assertThat(TestSpanHandler.getAllSpans().get(0).name(),
equalTo("get books"));
- assertThat(TestSpanReporter.getAllSpans().get(1).name(),
- equalTo("get /bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(2).name(),
- equalTo("get http://localhost:"; + PORT + "/bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(1).name(),
+ equalTo("GET /bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(2).name(),
+ equalTo("GET http://localhost:"; + PORT + "/bookstore/books"));
}
@Test
@@ -135,15 +134,15 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
span.finish();
}
- assertThat(TestSpanReporter.getAllSpans().size(),
+ assertThat(TestSpanHandler.getAllSpans().size(),
equalTo(4));
- assertThat(TestSpanReporter.getAllSpans().get(0).name(),
+ assertThat(TestSpanHandler.getAllSpans().get(0).name(),
equalTo("get books"));
- assertThat(TestSpanReporter.getAllSpans().get(1).name(),
- equalTo("get /bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(2).name(),
- equalTo("get http://localhost:"; + PORT + "/bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(3).name(),
+ assertThat(TestSpanHandler.getAllSpans().get(1).name(),
+ equalTo("GET /bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(2).name(),
+ equalTo("GET http://localhost:"; + PORT + "/bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(3).name(),
equalTo("calling book service"));
}
@@ -158,15 +157,15 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
span.finish();
}
- assertThat(TestSpanReporter.getAllSpans().size(),
+ assertThat(TestSpanHandler.getAllSpans().size(),
equalTo(4));
- assertThat(TestSpanReporter.getAllSpans().get(0).name(),
+ assertThat(TestSpanHandler.getAllSpans().get(0).name(),
equalTo("get books"));
- assertThat(TestSpanReporter.getAllSpans().get(1).name(),
- equalTo("get /bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(2).name(),
- equalTo("get http://localhost:"; + PORT + "/bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(3).name(),
+ assertThat(TestSpanHandler.getAllSpans().get(1).name(),
+ equalTo("GET /bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(2).name(),
+ equalTo("GET http://localhost:"; + PORT + "/bookstore/books"));
+ assertThat(TestSpanHandler.getAllSpans().get(3).name(),
equalTo("calling book service"));
}
diff --git
a/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/TestSpanReporter.java
b/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/TestSpanHandler.java
similarity index 73%
rename from
systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/TestSpanReporter.java
rename to
systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/TestSpanHandler.java
index 0cb6c9d..bbe62aa 100644
---
a/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/TestSpanReporter.java
+++
b/systests/microprofile/client/tracing/src/test/java/org/apache/cxf/systest/microprofile/rest/client/tracing/brave/TestSpanHandler.java
@@ -22,18 +22,20 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import zipkin2.Span;
-import zipkin2.reporter.Reporter;
+import brave.handler.MutableSpan;
+import brave.handler.SpanHandler;
+import brave.propagation.TraceContext;
-public class TestSpanReporter implements Reporter<Span> {
- private static List<Span> spans = Collections.synchronizedList(new
ArrayList<>());
+public class TestSpanHandler extends SpanHandler {
+ private static List<MutableSpan> spans = Collections.synchronizedList(new
ArrayList<>());
@Override
- public void report(Span span) {
+ public boolean end(TraceContext context, MutableSpan span, Cause cause) {
spans.add(span);
+ return true;
}
- public static List<Span> getAllSpans() {
+ public static List<MutableSpan> getAllSpans() {
return spans;
}
