fixing perf, concurrent update issues

jabubake · jabubake · commit 8936d807776c · 2017-05-01T14:39:15.000-07:00
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
@@ -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
@@ -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
@@ -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);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public LoggingHandler(`
`206`	`206`
`207`	`207`	`this.enhancers.addAll(enhancersParam);`
`208`	`208`
`209`		`- List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.getResourceEnhancers();`
	`209`	`+ List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.createResourceEnhancers();`
`210`	`210`	`if (loggingEnhancers != null) {`
`211`	`211`	`this.enhancers.addAll(loggingEnhancers);`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`	`/* Adds tracing support for logging with thread-local trace ID tracking. */`
`20`	`20`	`public class TraceLoggingEnhancer implements LoggingEnhancer {`
`21`	`21`
`22`		`- private final String prefix;`
	`22`	`+ private final String traceIdLabel;`
`23`	`23`
`24`	`24`	`public TraceLoggingEnhancer(String prefix) {`
`25`		`- this.prefix = (prefix != null) ? prefix : "";`
	`25`	`+ this.traceIdLabel = (prefix != null) ? prefix + "trace_id" : "";`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private static final ThreadLocal<String> traceId = new ThreadLocal<>();`
`@@ -49,7 +49,7 @@ public static String getCurrentTraceId() {`
`49`	`49`	`public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {`
`50`	`50`	`String traceId = getCurrentTraceId();`
`51`	`51`	`if (traceId != null) {`
`52`		`- builder.addLabel(prefix + "trace_id", traceId);`
	`52`	`+ builder.addLabel(traceIdLabel, traceId);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`