cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cxf git commit: CXF-7164: Support tracing using OpenZipkin Brave. Refactored JAX-WS support in the tracing-brave module.
Date Thu, 29 Dec 2016 00:43:42 GMT
Repository: cxf
Updated Branches:
  refs/heads/master c9da051de -> 7c191d4d5


CXF-7164: Support tracing using OpenZipkin Brave. Refactored JAX-WS support in the tracing-brave module.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7c191d4d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7c191d4d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7c191d4d

Branch: refs/heads/master
Commit: 7c191d4d590a5ef621a0dd5adfff59512c91daf3
Parents: c9da051
Author: reta <drreta@gmail.com>
Authored: Wed Dec 28 19:43:01 2016 -0500
Committer: reta <drreta@gmail.com>
Committed: Wed Dec 28 19:43:01 2016 -0500

----------------------------------------------------------------------
 .../tracing/brave/AbstractBraveInterceptor.java | 179 +++++++++++++++++++
 .../tracing/brave/BraveStartInterceptor.java    |  49 +++++
 .../cxf/tracing/brave/BraveStopInterceptor.java |  48 +++++
 .../cxf/tracing/brave/jaxrs/BraveFeature.java   |   6 +-
 .../cxf/tracing/brave/jaxws/BraveFeature.java   |  11 +-
 .../tracing/brave/jaxws/BraveInInterceptor.java |  58 ------
 .../brave/jaxws/BraveOutInterceptor.java        |  57 ------
 .../tracing/brave/jaxws/CxfClientRequest.java   |  49 -----
 .../tracing/brave/jaxws/CxfServerRequest.java   |  48 -----
 .../tracing/brave/jaxws/HttpResponse200.java    |  28 ---
 .../cxf/tracing/brave/jaxws/ParsedMessage.java  | 121 -------------
 .../cxf/tracing/brave/BraveTraceTest.java       |  99 ++++++++++
 .../tracing/brave/LoggingSpanNameProvider.java  |  31 ++++
 .../org/apache/cxf/tracing/brave/MyService.java |  26 +++
 .../apache/cxf/tracing/brave/MyServiceImpl.java |  28 +++
 .../cxf/tracing/brave/jaxws/BraveTraceTest.java |  98 ----------
 .../brave/jaxws/LoggingSpanNameProvider.java    |  31 ----
 .../cxf/tracing/brave/jaxws/MyService.java      |  26 ---
 .../cxf/tracing/brave/jaxws/MyServiceImpl.java  |  28 ---
 19 files changed, 472 insertions(+), 549 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
new file mode 100644
index 0000000..32e2560
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -0,0 +1,179 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.HttpClientRequest;
+import com.github.kristofa.brave.http.HttpServerRequest;
+import com.github.kristofa.brave.http.SpanNameProvider;
+
+import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+
+public abstract class AbstractBraveInterceptor extends AbstractPhaseInterceptor<Message> {
+    protected final Brave brave;
+    protected final SpanNameProvider spanNameProvider;
+    
+    private static class ParsedMessage {
+        private Message message;
+
+        ParsedMessage(Message message) {
+            this.message = message;
+        }
+        
+        String safeGet(String key) {
+            if (!message.containsKey(key)) {
+                return null;
+            }
+            Object value = message.get(key);
+            return (value instanceof String) ? value.toString() : null;
+        }
+        
+        public String getUriSt() {
+            String uri = safeGet(Message.REQUEST_URL);
+            if (uri == null) {
+                String address = safeGet(Message.ENDPOINT_ADDRESS);
+                uri = safeGet(Message.REQUEST_URI);
+                if (uri != null && uri.startsWith("/")) {
+                    if (address != null && !address.startsWith(uri)) {
+                        if (address.endsWith("/") && address.length() > 1) {
+                            address = address.substring(0, address.length());
+                        }
+                        uri = address + uri;
+                    }
+                } else {
+                    uri = address;
+                }
+            }
+            String query = safeGet(Message.QUERY_STRING);
+            if (query != null) {
+                return uri + "?" + query;
+            } else {
+                return uri;
+            }
+        }
+        
+        public URI getUri() {
+            try {
+                String uriSt = getUriSt();
+                return uriSt != null ? new URI(uriSt) : new URI("");
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+        
+        Message getEffectiveMessage() {
+            boolean isRequestor = MessageUtils.isRequestor(message);
+            boolean isOutbound = MessageUtils.isOutbound(message);
+            if (isRequestor) {
+                return isOutbound ? message : message.getExchange().getOutMessage();
+            } else {
+                return isOutbound ? message.getExchange().getInMessage() : message;
+            }
+        }
+        
+        Map<String, String> getHeaders() {
+            Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
+            Map<String, String> result = new HashMap<>();
+            if (headers == null) {
+                return result;
+            }
+            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+                if (entry.getValue().size() == 1) {
+                    result.put(entry.getKey(), entry.getValue().get(0));
+                } else {
+                    String[] valueAr = entry.getValue().toArray(new String[] {});
+                    result.put(entry.getKey(), valueAr.toString());
+                }
+            }
+            return result;
+        }
+        
+        void addHeader(String key, String value) {
+            Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
+            if (headers == null) {
+                headers = new HashMap<String, List<String>>();
+                message.put(Message.PROTOCOL_HEADERS, headers);
+            }
+            headers.put(key, Arrays.asList(value));
+        }
+
+        public String getHttpMethod() {
+            ParsedMessage eMessage = new ParsedMessage(getEffectiveMessage());
+            return eMessage.safeGet(Message.HTTP_REQUEST_METHOD);
+        }
+    }
+
+    protected AbstractBraveInterceptor(String phase, Brave brave, SpanNameProvider spanNameProvider) {
+        super(phase);
+        this.brave = brave;
+        this.spanNameProvider = spanNameProvider;
+    }
+    
+    protected HttpClientRequest getClientRequest(final Message message) {
+        final ParsedMessage parsedMessage = new ParsedMessage(message);
+        
+        return new HttpClientRequest() {
+            @Override
+            public URI getUri() {
+                return parsedMessage.getUri();
+            }
+
+            @Override
+            public String getHttpMethod() {
+                return parsedMessage.getHttpMethod();
+            }
+
+            @Override
+            public void addHeader(String header, String value) {
+                parsedMessage.addHeader(header, value);
+            }
+        };
+    }
+    
+    protected HttpServerRequest getServerRequest(final Message message) {
+        final ParsedMessage parsedMessage = new ParsedMessage(message);
+        
+        return new HttpServerRequest() {
+            @Override
+            public URI getUri() {
+                return parsedMessage.getUri();
+            }
+
+            @Override
+            public String getHttpMethod() {
+                return parsedMessage.getHttpMethod();
+            }
+
+            @Override
+            public String getHttpHeaderValue(String headerName) {
+                return parsedMessage.getHeaders().get(headerName);
+            }
+        };
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
new file mode 100644
index 0000000..c075aaa
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+import com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.HttpClientResponseAdapter;
+import com.github.kristofa.brave.http.HttpServerRequestAdapter;
+import com.github.kristofa.brave.http.SpanNameProvider;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.Phase;
+
+/**
+ * 
+ */
+@NoJSR250Annotations
+public class BraveStartInterceptor extends AbstractBraveInterceptor {
+    public BraveStartInterceptor(Brave brave, SpanNameProvider spanNameProvider) {
+        super(Phase.PRE_INVOKE, brave, spanNameProvider);
+    }
+
+    public void handleMessage(Message message) throws Fault {       
+        if (MessageUtils.isRequestor(message)) {
+            brave.clientResponseInterceptor().handle(new HttpClientResponseAdapter(() -> 200));
+        } else {
+            HttpServerRequestAdapter adapter = 
+                new HttpServerRequestAdapter(getServerRequest(message), spanNameProvider);
+            brave.serverRequestInterceptor().handle(adapter);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
new file mode 100644
index 0000000..de01464
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+import com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.HttpClientRequestAdapter;
+import com.github.kristofa.brave.http.HttpServerResponseAdapter;
+import com.github.kristofa.brave.http.SpanNameProvider;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.Phase;
+
+/**
+ * 
+ */
+@NoJSR250Annotations
+public class BraveStopInterceptor extends AbstractBraveInterceptor {
+    public BraveStopInterceptor(Brave brave, SpanNameProvider spanNameProvider) {
+        super(Phase.PRE_PROTOCOL, brave, spanNameProvider);
+    }
+
+    public void handleMessage(Message message) throws Fault {
+        if (MessageUtils.isRequestor(message)) {
+            brave.clientRequestInterceptor().handle(
+                new HttpClientRequestAdapter(getClientRequest(message), spanNameProvider));
+        } else {
+            brave.serverResponseInterceptor().handle(new HttpServerResponseAdapter(() -> 200));
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
index b6bcbc8..b654fb6 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
@@ -31,7 +31,11 @@ public class BraveFeature extends AbstractFeature {
     private final Brave brave;
     
     public BraveFeature() {
-        this(new Brave.Builder().build());
+        this("");
+    }
+    
+    public BraveFeature(final String name) {
+        this(new Brave.Builder(name).build());
     }
 
     public BraveFeature(final Brave brave) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
index a349d89..876d026 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
@@ -20,23 +20,26 @@ package org.apache.cxf.tracing.brave.jaxws;
 
 import com.github.kristofa.brave.Brave;
 import com.github.kristofa.brave.http.DefaultSpanNameProvider;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.Provider;
 import org.apache.cxf.annotations.Provider.Type;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.InterceptorProvider;
+import org.apache.cxf.tracing.brave.BraveStartInterceptor;
+import org.apache.cxf.tracing.brave.BraveStopInterceptor;
 
 @NoJSR250Annotations
 @Provider(value = Type.Feature)
 public class BraveFeature extends AbstractFeature {
-    private BraveInInterceptor in;
-    private BraveOutInterceptor out;
+    private BraveStartInterceptor in;
+    private BraveStopInterceptor out;
 
     public BraveFeature(Brave brave) {
         DefaultSpanNameProvider nameProvider = new DefaultSpanNameProvider();
-        in = new BraveInInterceptor(brave, nameProvider);
-        out = new BraveOutInterceptor(brave, nameProvider);
+        in = new BraveStartInterceptor(brave, nameProvider);
+        out = new BraveStopInterceptor(brave, nameProvider);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveInInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveInInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveInInterceptor.java
deleted file mode 100644
index a9c1718..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveInInterceptor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import com.github.kristofa.brave.Brave;
-import com.github.kristofa.brave.http.HttpClientResponseAdapter;
-import com.github.kristofa.brave.http.HttpServerRequestAdapter;
-import com.github.kristofa.brave.http.SpanNameProvider;
-import org.apache.cxf.common.injection.NoJSR250Annotations;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-
-/**
- * 
- */
-@NoJSR250Annotations
-public class BraveInInterceptor extends AbstractPhaseInterceptor<Message> {
-
-    private Brave brave;
-    private SpanNameProvider spanNameProvider;
-
-    public BraveInInterceptor(Brave brave, SpanNameProvider spanNameProvider) {
-        super(Phase.PRE_INVOKE);
-        this.brave = brave;
-        this.spanNameProvider = spanNameProvider;
-    }
-
-    public void handleMessage(Message cxfMessage) throws Fault {
-        ParsedMessage message = new ParsedMessage(cxfMessage);
-        if (MessageUtils.isRequestor(cxfMessage)) {
-            brave.clientResponseInterceptor().handle(new HttpClientResponseAdapter(new HttpResponse200()));
-        } else {
-            HttpServerRequestAdapter adapter = 
-                new HttpServerRequestAdapter(new CxfServerRequest(message), spanNameProvider);
-            brave.serverRequestInterceptor().handle(adapter);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveOutInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveOutInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveOutInterceptor.java
deleted file mode 100644
index fd4e8f3..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveOutInterceptor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import com.github.kristofa.brave.Brave;
-import com.github.kristofa.brave.http.HttpClientRequest;
-import com.github.kristofa.brave.http.HttpClientRequestAdapter;
-import com.github.kristofa.brave.http.HttpServerResponseAdapter;
-import com.github.kristofa.brave.http.SpanNameProvider;
-import org.apache.cxf.common.injection.NoJSR250Annotations;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-
-/**
- * 
- */
-@NoJSR250Annotations
-public class BraveOutInterceptor extends AbstractPhaseInterceptor<Message> {
-
-    private Brave brave;
-    private SpanNameProvider spanNameProvider;
-
-    public BraveOutInterceptor(Brave brave, SpanNameProvider spanNameProvider) {
-        super(Phase.PRE_PROTOCOL);
-        this.brave = brave;
-        this.spanNameProvider = spanNameProvider;
-    }
-
-    public void handleMessage(Message message) throws Fault {
-        if (MessageUtils.isRequestor(message)) {
-            final HttpClientRequest req = new CxfClientRequest(message);
-            brave.clientRequestInterceptor().handle(new HttpClientRequestAdapter(req, spanNameProvider));
-        } else {
-            brave.serverResponseInterceptor().handle(new HttpServerResponseAdapter(new HttpResponse200()));
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfClientRequest.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfClientRequest.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfClientRequest.java
deleted file mode 100644
index 646e235..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfClientRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import java.net.URI;
-
-import com.github.kristofa.brave.http.HttpClientRequest;
-import org.apache.cxf.message.Message;
-
-public class CxfClientRequest implements HttpClientRequest {
-
-    private ParsedMessage message;
-
-    public CxfClientRequest(Message message) {
-        this.message = new ParsedMessage(message);
-    }
-
-    @Override
-    public URI getUri() {
-        return message.getUri();
-    }
-
-    @Override
-    public String getHttpMethod() {
-        return message.getHttpMethod();
-    }
-
-    @Override
-    public void addHeader(String header, String value) {
-        message.addHeader(header, value);
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfServerRequest.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfServerRequest.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfServerRequest.java
deleted file mode 100644
index a7d2eba..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/CxfServerRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import java.net.URI;
-
-import com.github.kristofa.brave.http.HttpServerRequest;
-
-public class CxfServerRequest implements HttpServerRequest {
-
-    private ParsedMessage message;
-
-    public CxfServerRequest(ParsedMessage message) {
-        this.message = message;
-    }
-
-    @Override
-    public URI getUri() {
-        return message.getUri();
-    }
-
-    @Override
-    public String getHttpMethod() {
-        return message.getHttpMethod();
-    }
-
-    @Override
-    public String getHttpHeaderValue(String headerName) {
-        return message.getHeaders().get(headerName);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/HttpResponse200.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/HttpResponse200.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/HttpResponse200.java
deleted file mode 100644
index 9d5046b..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/HttpResponse200.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import com.github.kristofa.brave.http.HttpResponse;
-
-final class HttpResponse200 implements HttpResponse {
-    @Override
-    public int getHttpStatusCode() {
-        return 200;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/ParsedMessage.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/ParsedMessage.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/ParsedMessage.java
deleted file mode 100644
index e2951ec..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/ParsedMessage.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
-
-public class ParsedMessage {
-    
-    private Message message;
-
-    public ParsedMessage(Message message) {
-        this.message = message;
-    }
-    
-    String safeGet(String key) {
-        if (!message.containsKey(key)) {
-            return null;
-        }
-        Object value = message.get(key);
-        return (value instanceof String) ? value.toString() : null;
-    }
-    
-    public String getUriSt() {
-        String uri = safeGet(Message.REQUEST_URL);
-        if (uri == null) {
-            String address = safeGet(Message.ENDPOINT_ADDRESS);
-            uri = safeGet(Message.REQUEST_URI);
-            if (uri != null && uri.startsWith("/")) {
-                if (address != null && !address.startsWith(uri)) {
-                    if (address.endsWith("/") && address.length() > 1) {
-                        address = address.substring(0, address.length());
-                    }
-                    uri = address + uri;
-                }
-            } else {
-                uri = address;
-            }
-        }
-        String query = safeGet(Message.QUERY_STRING);
-        if (query != null) {
-            return uri + "?" + query;
-        } else {
-            return uri;
-        }
-    }
-    
-    public URI getUri() {
-        try {
-            String uriSt = getUriSt();
-            return uriSt != null ? new URI(uriSt) : new URI("");
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-    
-    Message getEffectiveMessage() {
-        boolean isRequestor = MessageUtils.isRequestor(message);
-        boolean isOutbound = MessageUtils.isOutbound(message);
-        if (isRequestor) {
-            return isOutbound ? message : message.getExchange().getOutMessage();
-        } else {
-            return isOutbound ? message.getExchange().getInMessage() : message;
-        }
-    }
-    
-    Map<String, String> getHeaders() {
-        Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
-        Map<String, String> result = new HashMap<>();
-        if (headers == null) {
-            return result;
-        }
-        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-            if (entry.getValue().size() == 1) {
-                result.put(entry.getKey(), entry.getValue().get(0));
-            } else {
-                String[] valueAr = entry.getValue().toArray(new String[] {});
-                result.put(entry.getKey(), valueAr.toString());
-            }
-        }
-        return result;
-    }
-    
-    void addHeader(String key, String value) {
-        Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
-        if (headers == null) {
-            headers = new HashMap<String, List<String>>();
-            message.put(Message.PROTOCOL_HEADERS, headers);
-        }
-        headers.put(key, Arrays.asList(value));
-    }
-
-    public String getHttpMethod() {
-        ParsedMessage eMessage = new ParsedMessage(getEffectiveMessage());
-        return eMessage.safeGet(Message.HTTP_REQUEST_METHOD);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
new file mode 100644
index 0000000..7ba28c3
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.github.kristofa.brave.Brave;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.feature.Feature;
+import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.tracing.brave.jaxws.BraveFeature;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import zipkin.Span;
+import zipkin.reporter.Reporter;
+
+public class BraveTraceTest {
+    
+    private static final String ADDRESS = "http://localhost:8182";
+    private Server server;
+    private BraveFeature logging;
+    private Localreporter localReporter;
+
+    @Before
+    public void startServer() {
+        localReporter = new Localreporter();
+        logging = createLoggingFeature(localReporter);
+        server = createServer(logging);
+    }
+
+    @Test
+    public void testMyService() {
+        MyService myService = createProxy(logging);
+        myService.echo("test");
+        for (Span span : localReporter.spans) {
+            System.out.println(span);
+        }
+        Assert.assertEquals(2, localReporter.spans.size());
+
+    }
+    
+    @After
+    public void stopServer() {
+        server.destroy();
+    }
+    
+    private static Server createServer(Feature logging) {
+        JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
+        factory.setAddress(ADDRESS);
+        factory.setServiceBean(new MyServiceImpl());
+        factory.setFeatures(Arrays.asList(logging));
+        return factory.create();
+    }
+    
+    private static MyService createProxy(Feature trace) {
+        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+        factory.setServiceClass(MyService.class);
+        factory.setAddress(ADDRESS);
+        factory.setFeatures(Arrays.asList(trace));
+        return (MyService)factory.create();
+    }
+
+    private static BraveFeature createLoggingFeature(Reporter<Span> reporter) {
+        Brave brave = new Brave.Builder("myservice").reporter(reporter).build();
+        return new BraveFeature(brave);
+    }
+    
+    static final class Localreporter implements Reporter<Span> {
+        List<Span> spans = new ArrayList<Span>();
+
+        @Override
+        public void report(Span span) {
+            spans.add(span);
+        }
+        
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
new file mode 100644
index 0000000..5751e2c
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+import com.github.kristofa.brave.http.HttpRequest;
+import com.github.kristofa.brave.http.SpanNameProvider;
+
+public class LoggingSpanNameProvider implements SpanNameProvider {
+
+    @Override
+    public String spanName(HttpRequest request) {
+        return (request instanceof SpanNameProvider) ? ((SpanNameProvider)request).spanName(request) : ""; 
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyService.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyService.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyService.java
new file mode 100644
index 0000000..77dc709
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyService.java
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+import javax.jws.WebService;
+
+@WebService
+public interface MyService {
+    String echo(String msg);
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyServiceImpl.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyServiceImpl.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyServiceImpl.java
new file mode 100644
index 0000000..594e8c7
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/MyServiceImpl.java
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tracing.brave;
+
+public class MyServiceImpl implements MyService {
+
+    @Override
+    public String echo(String msg) {
+        return msg;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/BraveTraceTest.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/BraveTraceTest.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/BraveTraceTest.java
deleted file mode 100644
index 3f63a85..0000000
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/BraveTraceTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.github.kristofa.brave.Brave;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.feature.Feature;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import zipkin.Span;
-import zipkin.reporter.Reporter;
-
-public class BraveTraceTest {
-    
-    private static final String ADDRESS = "http://localhost:8182";
-    private Server server;
-    private BraveFeature logging;
-    private Localreporter localReporter;
-
-    @Before
-    public void startServer() {
-        localReporter = new Localreporter();
-        logging = createLoggingFeature(localReporter);
-        server = createServer(logging);
-    }
-
-    @Test
-    public void testMyService() {
-        MyService myService = createProxy(logging);
-        myService.echo("test");
-        for (Span span : localReporter.spans) {
-            System.out.println(span);
-        }
-        Assert.assertEquals(2, localReporter.spans.size());
-
-    }
-    
-    @After
-    public void stopServer() {
-        server.destroy();
-    }
-    
-    private static Server createServer(Feature logging) {
-        JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
-        factory.setAddress(ADDRESS);
-        factory.setServiceBean(new MyServiceImpl());
-        factory.setFeatures(Arrays.asList(logging));
-        return factory.create();
-    }
-    
-    private static MyService createProxy(Feature trace) {
-        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
-        factory.setServiceClass(MyService.class);
-        factory.setAddress(ADDRESS);
-        factory.setFeatures(Arrays.asList(trace));
-        return (MyService)factory.create();
-    }
-
-    private static BraveFeature createLoggingFeature(Reporter<Span> reporter) {
-        Brave brave = new Brave.Builder("myservice").reporter(reporter).build();
-        return new BraveFeature(brave);
-    }
-    
-    static final class Localreporter implements Reporter<Span> {
-        List<Span> spans = new ArrayList<Span>();
-
-        @Override
-        public void report(Span span) {
-            spans.add(span);
-        }
-        
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/LoggingSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/LoggingSpanNameProvider.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/LoggingSpanNameProvider.java
deleted file mode 100644
index 5d5627c..0000000
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/LoggingSpanNameProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import com.github.kristofa.brave.http.HttpRequest;
-import com.github.kristofa.brave.http.SpanNameProvider;
-
-public class LoggingSpanNameProvider implements SpanNameProvider {
-
-    @Override
-    public String spanName(HttpRequest request) {
-        return (request instanceof SpanNameProvider) ? ((SpanNameProvider)request).spanName(request) : ""; 
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyService.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyService.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyService.java
deleted file mode 100644
index 12da92a..0000000
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-import javax.jws.WebService;
-
-@WebService
-public interface MyService {
-    String echo(String msg);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyServiceImpl.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyServiceImpl.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyServiceImpl.java
deleted file mode 100644
index b0a42a2..0000000
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/jaxws/MyServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tracing.brave.jaxws;
-
-public class MyServiceImpl implements MyService {
-
-    @Override
-    public String echo(String msg) {
-        return msg;
-    }
-
-}


Mime
View raw message