---

jabubake · garrettjonesgoogle · commit fd403425d9f6 · 2017-05-04T13:47:24.000-07:00
yaml --- r: 8067 b: refs/heads/tswast-patch-1 c: 43203a7 h: refs/heads/master i: 8065: 4ebea33 8063: 6d4ad77
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 5d502490a9e9677c105441941f1d471bdde8a916
+refs/heads/tswast-patch-1: 43203a7712075d31424202c0115b0a036920e316
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java b/branches/tswast-patch-1/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.createResourceEnhancers();
+      List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.getResourceEnhancers();
       if (loggingEnhancers != null) {
         this.enhancers.addAll(loggingEnhancers);
       }
diff --git a/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -128,9 +128,9 @@ public static MonitoredResource getResource(String projectId, String resourceTyp
   /**
    * Returns custom log entry enhancers (if available) for resource type.
    *
-   * @return custom long entry enhancers
+   * @return custom log entry enhancers
    */
-  public static List<LoggingEnhancer> createResourceEnhancers() {
+  public static List<LoggingEnhancer> getResourceEnhancers() {
     Resource resourceType = getAutoDetectedResourceType();
     return createEnhancers(resourceType);
   }
diff --git a/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java b/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
@@ -19,10 +19,15 @@
 /* Adds tracing support for logging with thread-local trace ID tracking. */
 public class TraceLoggingEnhancer implements LoggingEnhancer {
 
+  private final static String TRACE_ID = "trace_id";
   private final String traceIdLabel;
 
+  public TraceLoggingEnhancer() {
+    traceIdLabel = TRACE_ID;
+  }
+
   public TraceLoggingEnhancer(String prefix) {
-    this.traceIdLabel = (prefix != null) ? prefix + "trace_id" : "";
+    traceIdLabel = (prefix != null) ? prefix + TRACE_ID : TRACE_ID;
   }
 
   private static final ThreadLocal<String> traceId = new ThreadLocal<>();

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.createResourceEnhancers();`
	`209`	`+ List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.getResourceEnhancers();`
`210`	`210`	`if (loggingEnhancers != null) {`
`211`	`211`	`this.enhancers.addAll(loggingEnhancers);`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,9 @@ public static MonitoredResource getResource(String projectId, String resourceTyp`
`128`	`128`	`/**`
`129`	`129`	`* Returns custom log entry enhancers (if available) for resource type.`
`130`	`130`	`*`
`131`		`- * @return custom long entry enhancers`
	`131`	`+ * @return custom log entry enhancers`
`132`	`132`	`*/`
`133`		`- public static List<LoggingEnhancer> createResourceEnhancers() {`
	`133`	`+ public static List<LoggingEnhancer> getResourceEnhancers() {`
`134`	`134`	`Resource resourceType = getAutoDetectedResourceType();`
`135`	`135`	`return createEnhancers(resourceType);`
`136`	`136`	`}`