Merge pull request #81 from ubschmidt/master

Simplify labels; use the global labels where possible, otherwise use the new prefix.

Author: erikmcc

guice/annotation/src/main/java/com/google/cloud/trace/guice/annotation/TracerSpanInterceptor.java

@@ -55,15 +55,15 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
     if (span.callLabels() == Option.TRUE) {
       labelsBeforeCallBuilder
-          .add("trace.cloud.google.com/call/class",
+          .add("g.co/call/class",
               invocation.getMethod().getDeclaringClass().getName())
-          .add("trace.cloud.google.com/call/method",
+          .add("g.co/call/method",
               invocation.getMethod().getName())
-          .add("trace.cloud.google.com/call/package",
+          .add("g.co/call/package",
               invocation.getMethod().getDeclaringClass().getPackage().getName());
     }
     if (span.entry()) {
-      labelsBeforeCallBuilder.add("trace.cloud.google.com/agent", "cloud-trace-java/0.1");
+      labelsBeforeCallBuilder.add("/agent", "cloud-trace-java/0.1");
     }
 
     String methodName;
@@ -124,8 +124,8 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
     } catch (Throwable t) {
       if (span.callLabels() == Option.TRUE) {
         labelsAfterCallBuilder
-            .add("trace.cloud.google.com/exception/class", t.getClass().getName())
-            .add("trace.cloud.google.com/exception/message", t.getMessage());
+            .add("g.co/exception/class", t.getClass().getName())
+            .add("g.co/exception/message", t.getMessage());
       }
     } finally {
       if (stackTraceEnabled) {

sdk/servlet/src/main/java/com/google/cloud/trace/servlet/RequestLabelsHelper.java

@@ -46,15 +46,15 @@ public static String overrideName(HttpServletRequest request) {
    * @param labelsBuilder the labels builder to add span label annotations to.
    */
   public static void addRequestLabels(HttpServletRequest request, Labels.Builder labelsBuilder) {
-    labelsBuilder.add("trace.cloud.google.com/http/method", request.getMethod());
-    labelsBuilder.add("trace.cloud.google.com/http/url", request.getRequestURL().toString());
+    labelsBuilder.add("/http/method", request.getMethod());
+    labelsBuilder.add("/http/url", request.getRequestURL().toString());
     if (request.getContentLength() != -1) {
       labelsBuilder.add(
-          "trace.cloud.google.com/http/request/size", Integer.toString(request.getContentLength()));
+          "/http/request/size", Integer.toString(request.getContentLength()));
     }
-    labelsBuilder.add("trace.cloud.google.com/http/host", request.getServerName());
+    labelsBuilder.add("/http/host", request.getServerName());
     if (request.getHeader("user-agent") != null) {
-      labelsBuilder.add("trace.cloud.google.com/http/user_agent", request.getHeader("user-agent"));
+      labelsBuilder.add("/http/user_agent", request.getHeader("user-agent"));
     }
   }
 
@@ -66,11 +66,11 @@ public static void addRequestLabels(HttpServletRequest request, Labels.Builder l
    * @param labelsBuilder the labels builder to add span label annotations to.
    */
   public static void addResponseLabels(HttpServletResponse response, Labels.Builder labelsBuilder) {
-    // Add "trace.cloud.google.com/http/status_code" to Integer.toString(response.getStatus()), if
+    // Add "/http/status_code" to Integer.toString(response.getStatus()), if
     // GAE supports 3.0.
     if (response.getBufferSize() > 0) {
       labelsBuilder.add(
-          "trace.cloud.google.com/http/response/size", Integer.toString(response.getBufferSize()));
+          "/http/response/size", Integer.toString(response.getBufferSize()));
     }
   }
 }

sinks/v1/sink/src/main/java/com/google/cloud/trace/v1/producer/TraceProducer.java

@@ -159,7 +159,7 @@ public Trace generateSetStackTrace(
     stackTraceValue.append("]}");
 
     spanBuilder.putLabels(
-        "trace.cloud.google.com/stacktrace", stackTraceValue.toString());
+        "/stacktrace", stackTraceValue.toString());
 
     Trace.Builder traceBuilder =
         Trace.newBuilder()