Merge pull request #260 from laci9/operation-name-fix

added request uri as the operation name of the spam

utilities/tools.descartes.teastore.registryclient/src/main/java/tools/descartes/teastore/registryclient/tracing/Tracing.java

@@ -72,7 +72,7 @@ public static Scope extractCurrentSpan(HttpServletRequest request) {
     for (String headerName : Collections.list(request.getHeaderNames())) {
       headers.put(headerName, request.getHeader(headerName));
     }
-    return buildSpanFromHeaders(headers);
+    return buildSpanFromHeaders(headers, request.getRequestURI());
   }
 
   /**
@@ -89,22 +89,23 @@ public static Scope extractCurrentSpan(HttpHeaders httpHeaders) {
     for (String headerName : httpHeaders.getRequestHeaders().keySet()) {
       headers.put(headerName, httpHeaders.getRequestHeader(headerName).get(0));
     }
-    return buildSpanFromHeaders(headers);
+    return buildSpanFromHeaders(headers, "op");
   }
 
   /**
    * Helper method to extract and build the active span out of Map containing the
    * processed headers.
    *
    * @param headers is the Map of the processed headers
+   * @param operationName is the operation name of the span (can be either URL or URI)
    * @return Scope containing the extracted span marked as active. Can be used
    *         with try-with-resource construct
    */
-  private static Scope buildSpanFromHeaders(Map<String, String> headers) {
-    Tracer.SpanBuilder spanBuilder = GlobalTracer.get().buildSpan("op");
+  private static Scope buildSpanFromHeaders(Map<String, String> headers, String operationName) {
+    Tracer.SpanBuilder spanBuilder = GlobalTracer.get().buildSpan(operationName);
     try {
       SpanContext parentSpanCtx = GlobalTracer.get().extract(Format.Builtin.HTTP_HEADERS,
-          new TextMapExtractAdapter(headers));
+              new TextMapExtractAdapter(headers));
       if (parentSpanCtx != null) {
         spanBuilder = spanBuilder.asChildOf(parentSpanCtx);
       }