adding app engine specific label prefix to instance_name, trace_id

jabubake · jabubake · commit 51131e4d09c7 · 2017-04-28T12:02:55.000-07:00
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -74,6 +74,8 @@ String getKey() {
     }
   }
 
+  private static String appEngineLabelPrefix = "appengine.googleapis.com/";
+
   private static Map<String, Label[]> resourceTypeWithLabels;
 
   static {
@@ -198,11 +200,12 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
       // Trace logging enhancer is supported on GAE Flex and Standard.
       case GaeAppFlex:
         enhancers = new ArrayList<>();
-        enhancers.add(new LabelLoggingEnhancer(Collections.singletonList(Label.InstanceName)));
-        enhancers.add(new TraceLoggingEnhancer());
+        enhancers.add(new LabelLoggingEnhancer(
+            appEngineLabelPrefix, Collections.singletonList(Label.InstanceName)));
+        enhancers.add(new TraceLoggingEnhancer(appEngineLabelPrefix));
         break;
       case GaeAppStandard:
-        enhancers.add(new TraceLoggingEnhancer());
+        enhancers.add(new TraceLoggingEnhancer(appEngineLabelPrefix));
         break;
       default:
         enhancers = Collections.emptyList();
@@ -218,9 +221,11 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
    *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
    */
   static class LabelLoggingEnhancer implements LoggingEnhancer {
+    String prefix;
     List<Label> labels;
 
-    LabelLoggingEnhancer(List<Label> labels) {
+    LabelLoggingEnhancer(String prefix, List<Label> labels) {
+      this.prefix = prefix != null ? prefix : "";
       this.labels = labels;
     }
 
@@ -229,7 +234,7 @@ public void enhanceLogEntry(Builder logEntry) {
       for (Label label : labels) {
         String labelValue = MonitoredResourceUtil.getValue(label);
         if (labelValue != null) {
-          logEntry.addLabel(label.getKey(), labelValue);
+          logEntry.addLabel(prefix + label.getKey(), labelValue);
         }
       }
     }
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
@@ -19,6 +19,11 @@
 /* Adds tracing support for logging with thread-local trace ID tracking. */
 public class TraceLoggingEnhancer implements LoggingEnhancer {
 
+  String prefix;
+  public TraceLoggingEnhancer(String prefix) {
+    this.prefix = (prefix != null) ? prefix : "";
+  }
+
   private static final ThreadLocal<String> traceId = new ThreadLocal<>();
 
   /**
@@ -43,7 +48,7 @@ public static String getCurrentTraceId() {
   public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {
     String traceId = getCurrentTraceId();
     if (traceId != null) {
-      builder.addLabel("trace_id", traceId);
+      builder.addLabel(prefix + "trace_id", traceId);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@`
`19`	`19`	`/* Adds tracing support for logging with thread-local trace ID tracking. */`
`20`	`20`	`public class TraceLoggingEnhancer implements LoggingEnhancer {`
`21`	`21`
	`22`	`+ String prefix;`
	`23`	`+ public TraceLoggingEnhancer(String prefix) {`
	`24`	`+ this.prefix = (prefix != null) ? prefix : "";`
	`25`	`+ }`
	`26`	`+`
`22`	`27`	`private static final ThreadLocal<String> traceId = new ThreadLocal<>();`
`23`	`28`
`24`	`29`	`/**`
`@@ -43,7 +48,7 @@ public static String getCurrentTraceId() {`
`43`	`48`	`public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {`
`44`	`49`	`String traceId = getCurrentTraceId();`
`45`	`50`	`if (traceId != null) {`
`46`		`- builder.addLabel("trace_id", traceId);`
	`51`	`+ builder.addLabel(prefix + "trace_id", traceId);`
`47`	`52`	`}`
`48`	`53`	`}`
`49`	`54`	`}`