From 7d2d3ef3e449ac40a28bb1f925e5a23f3ea755a0 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Wed, 26 Apr 2017 16:24:58 -0700
Subject: [PATCH 1/6] moving instance_name logging to log entry label removing
 unsupported resource labels for standard, flex

---
 .../cloud/logging/MonitoredResourceUtil.java  | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

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
index 301740acde76..d50e7b47c5e4 100644
--- 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
@@ -19,8 +19,10 @@
 import com.google.cloud.MetadataConfig;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.ServiceOptions;
+import com.google.cloud.logging.LogEntry.Builder;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -79,16 +81,14 @@ String getKey() {
         new ImmutableMap.Builder<String, Label[]>()
             .put(
                 Resource.GaeAppFlex.getKey(),
-                new Label[] {
-                  Label.InstanceName,
-                  Label.ModuleId,
-                  Label.VersionId,
-                  Label.InstanceId,
-                  Label.Zone
+                new Label[]{
+                    Label.ModuleId,
+                    Label.VersionId,
+                    Label.Zone
                 })
             .put(
                 Resource.GaeAppStandard.getKey(),
-                new Label[] {Label.AppId, Label.ModuleId, Label.VersionId})
+                new Label[] {Label.ModuleId, Label.VersionId})
             .put(Resource.Container.getKey(), new Label[] {Label.ClusterName, Label.Zone})
             .put(Resource.GceInstance.getKey(), new Label[] {Label.InstanceId, Label.Zone})
             .build();
@@ -193,12 +193,15 @@ private static String getAppEngineInstanceName() {
   }
 
   private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
-    List<LoggingEnhancer> enhancers;
+    List<LoggingEnhancer> enhancers = new ArrayList<>();
     switch (resourceType) {
       // Trace logging enhancer is supported on GAE Flex and Standard.
-      case GaeAppStandard:
       case GaeAppFlex:
         enhancers = new ArrayList<>();
+        enhancers.add(new LabelLoggingEnhancer(Collections.singletonList(Label.InstanceName)));
+        enhancers.add(new TraceLoggingEnhancer());
+        break;
+      case GaeAppStandard:
         enhancers.add(new TraceLoggingEnhancer());
         break;
       default:
@@ -207,4 +210,28 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
     }
     return enhancers;
   }
+
+  /**
+   *  Adds additional resource-based labels to log entries.
+   *  Labels that can be provided with {@link MonitoredResource.Builder#addLabel(String, String)}
+   *  are restricted to a supported set per resource.
+   *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
+   */
+  static class LabelLoggingEnhancer implements LoggingEnhancer {
+    List<Label> labels;
+
+    LabelLoggingEnhancer(List<Label> labels) {
+      this.labels = labels;
+    }
+
+    @Override
+    public void enhanceLogEntry(Builder logEntry) {
+      for (Label label : labels) {
+        String labelValue = MonitoredResourceUtil.getValue(label);
+        if (labelValue != null) {
+          logEntry.addLabel(label.getKey(), labelValue);
+        }
+      }
+    }
+  }
 }

From 51131e4d09c72bc8d7c10b0c1d32079b6387a8c8 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Fri, 28 Apr 2017 12:02:55 -0700
Subject: [PATCH 2/6] adding app engine specific label prefix to instance_name,
 trace_id

---
 .../cloud/logging/MonitoredResourceUtil.java      | 15 ++++++++++-----
 .../cloud/logging/TraceLoggingEnhancer.java       |  7 ++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

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
index d50e7b47c5e4..3c784ba91a95 100644
--- 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
index 62078d5e1a16..d07ecc62fed9 100644
--- 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);
     }
   }
 }

From 33bccbd7424ae27c3d3868d84d7ed494fe6e9d62 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Fri, 28 Apr 2017 15:02:49 -0700
Subject: [PATCH 3/6] formatting, visibilty fixes removing redundant code

---
 .../google/cloud/logging/MonitoredResourceUtil.java   | 11 +++++------
 .../google/cloud/logging/TraceLoggingEnhancer.java    |  3 ++-
 2 files changed, 7 insertions(+), 7 deletions(-)

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
index 3c784ba91a95..5e83d896a5ca 100644
--- 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,7 +74,7 @@ String getKey() {
     }
   }
 
-  private static String appEngineLabelPrefix = "appengine.googleapis.com/";
+  private static final String APPENGINE_LABEL_PREFIX = "appengine.googleapis.com/";
 
   private static Map<String, Label[]> resourceTypeWithLabels;
 
@@ -199,13 +199,12 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
     switch (resourceType) {
       // Trace logging enhancer is supported on GAE Flex and Standard.
       case GaeAppFlex:
-        enhancers = new ArrayList<>();
         enhancers.add(new LabelLoggingEnhancer(
-            appEngineLabelPrefix, Collections.singletonList(Label.InstanceName)));
-        enhancers.add(new TraceLoggingEnhancer(appEngineLabelPrefix));
+            APPENGINE_LABEL_PREFIX, Collections.singletonList(Label.InstanceName)));
+        enhancers.add(new TraceLoggingEnhancer(APPENGINE_LABEL_PREFIX));
         break;
       case GaeAppStandard:
-        enhancers.add(new TraceLoggingEnhancer(appEngineLabelPrefix));
+        enhancers.add(new TraceLoggingEnhancer(APPENGINE_LABEL_PREFIX));
         break;
       default:
         enhancers = Collections.emptyList();
@@ -220,7 +219,7 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
    *  are restricted to a supported set per resource.
    *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
    */
-  static class LabelLoggingEnhancer implements LoggingEnhancer {
+  private static class LabelLoggingEnhancer implements LoggingEnhancer {
     String prefix;
     List<Label> labels;
 
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
index d07ecc62fed9..05700dc22868 100644
--- 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,7 +19,8 @@
 /* Adds tracing support for logging with thread-local trace ID tracking. */
 public class TraceLoggingEnhancer implements LoggingEnhancer {
 
-  String prefix;
+  private final String prefix;
+
   public TraceLoggingEnhancer(String prefix) {
     this.prefix = (prefix != null) ? prefix : "";
   }

From 8936d807776c455ac19f005f23267f839b07ae6f Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Mon, 1 May 2017 14:39:15 -0700
Subject: [PATCH 4/6] fixing perf, concurrent update issues

---
 .../google/cloud/logging/LoggingHandler.java  |  2 +-
 .../cloud/logging/MonitoredResourceUtil.java  | 44 +++++++++++--------
 .../cloud/logging/TraceLoggingEnhancer.java   |  6 +--
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
index 435a0aea5030..24399fac823b 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
@@ -206,7 +206,7 @@ public LoggingHandler(
 
       this.enhancers.addAll(enhancersParam);
 
-      List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.getResourceEnhancers();
+      List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.createResourceEnhancers();
       if (loggingEnhancers != null) {
         this.enhancers.addAll(loggingEnhancers);
       }
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
index 5e83d896a5ca..2d8edeb29d20 100644
--- 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
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -83,7 +84,7 @@ String getKey() {
         new ImmutableMap.Builder<String, Label[]>()
             .put(
                 Resource.GaeAppFlex.getKey(),
-                new Label[]{
+                new Label[] {
                     Label.ModuleId,
                     Label.VersionId,
                     Label.Zone
@@ -126,9 +127,10 @@ public static MonitoredResource getResource(String projectId, String resourceTyp
 
   /**
    * Returns custom log entry enhancers (if available) for resource type.
+   *
    * @return custom long entry enhancers
    */
-  public static List<LoggingEnhancer> getResourceEnhancers() {
+  public static List<LoggingEnhancer> createResourceEnhancers() {
     Resource resourceType = getAutoDetectedResourceType();
     return getEnhancers(resourceType);
   }
@@ -195,7 +197,7 @@ private static String getAppEngineInstanceName() {
   }
 
   private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
-    List<LoggingEnhancer> enhancers = new ArrayList<>();
+    List<LoggingEnhancer> enhancers = new ArrayList<>(2);
     switch (resourceType) {
       // Trace logging enhancer is supported on GAE Flex and Standard.
       case GaeAppFlex:
@@ -207,34 +209,40 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
         enhancers.add(new TraceLoggingEnhancer(APPENGINE_LABEL_PREFIX));
         break;
       default:
-        enhancers = Collections.emptyList();
         break;
     }
     return enhancers;
   }
 
   /**
-   *  Adds additional resource-based labels to log entries.
-   *  Labels that can be provided with {@link MonitoredResource.Builder#addLabel(String, String)}
-   *  are restricted to a supported set per resource.
-   *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
+   * Adds additional resource-based labels to log entries.
+   * Labels that can be provided with {@link MonitoredResource.Builder#addLabel(String, String)}
+   * are restricted to a supported set per resource.
+   *
+   * @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
    */
   private static class LabelLoggingEnhancer implements LoggingEnhancer {
-    String prefix;
-    List<Label> labels;
 
-    LabelLoggingEnhancer(String prefix, List<Label> labels) {
-      this.prefix = prefix != null ? prefix : "";
-      this.labels = labels;
+    Map<String, String> labels;
+
+    LabelLoggingEnhancer(String prefix, List<Label> labelNames) {
+      labels = new HashMap<>();
+      if (labelNames != null) {
+        for (Label labelName : labelNames) {
+          String labelValue = MonitoredResourceUtil.getValue(labelName);
+          if (labelValue != null) {
+            String fullLabelName = (prefix != null) ?
+                prefix + labelName.getKey() : labelName.getKey();
+            labels.put(fullLabelName, labelValue);
+          }
+        }
+      }
     }
 
     @Override
     public void enhanceLogEntry(Builder logEntry) {
-      for (Label label : labels) {
-        String labelValue = MonitoredResourceUtil.getValue(label);
-        if (labelValue != null) {
-          logEntry.addLabel(prefix + label.getKey(), labelValue);
-        }
+      for (Map.Entry<String, String> label : labels.entrySet()) {
+        logEntry.addLabel(label.getKey(), label.getValue());
       }
     }
   }
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
index 05700dc22868..949fa1c195b9 100644
--- 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,10 +19,10 @@
 /* Adds tracing support for logging with thread-local trace ID tracking. */
 public class TraceLoggingEnhancer implements LoggingEnhancer {
 
-  private final String prefix;
+  private final String traceIdLabel;
 
   public TraceLoggingEnhancer(String prefix) {
-    this.prefix = (prefix != null) ? prefix : "";
+    this.traceIdLabel = (prefix != null) ? prefix + "trace_id" : "";
   }
 
   private static final ThreadLocal<String> traceId = new ThreadLocal<>();
@@ -49,7 +49,7 @@ public static String getCurrentTraceId() {
   public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {
     String traceId = getCurrentTraceId();
     if (traceId != null) {
-      builder.addLabel(prefix + "trace_id", traceId);
+      builder.addLabel(traceIdLabel, traceId);
     }
   }
 }

From bf7b47b924833bef970aa33b86300dfa5c3fb860 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Mon, 1 May 2017 14:42:52 -0700
Subject: [PATCH 5/6] renaming get to create for clarity

---
 .../java/com/google/cloud/logging/MonitoredResourceUtil.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 2d8edeb29d20..3a26b4881643 100644
--- 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
@@ -132,7 +132,7 @@ public static MonitoredResource getResource(String projectId, String resourceTyp
    */
   public static List<LoggingEnhancer> createResourceEnhancers() {
     Resource resourceType = getAutoDetectedResourceType();
-    return getEnhancers(resourceType);
+    return createEnhancers(resourceType);
   }
 
   private static String getValue(Label label) {
@@ -196,7 +196,7 @@ private static String getAppEngineInstanceName() {
     return System.getenv("GAE_INSTANCE");
   }
 
-  private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
+  private static List<LoggingEnhancer> createEnhancers(Resource resourceType) {
     List<LoggingEnhancer> enhancers = new ArrayList<>(2);
     switch (resourceType) {
       // Trace logging enhancer is supported on GAE Flex and Standard.

From 535f422aabc29b442924b07481af1e3795b25e10 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Tue, 2 May 2017 10:18:20 -0700
Subject: [PATCH 6/6] adding private final

---
 .../java/com/google/cloud/logging/MonitoredResourceUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 3a26b4881643..526ec84599a3 100644
--- 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
@@ -223,7 +223,7 @@ private static List<LoggingEnhancer> createEnhancers(Resource resourceType) {
    */
   private static class LabelLoggingEnhancer implements LoggingEnhancer {
 
-    Map<String, String> labels;
+    private final Map<String, String> labels;
 
     LabelLoggingEnhancer(String prefix, List<Label> labelNames) {
       labels = new HashMap<>();