TraceLoggingEnhancer, MonitoredResourceUtil public methods reverted to 1.0.0 surface. (#2032)

jabubake · garrettjonesgoogle · commit 43203a771207 · 2017-05-04T13:47:24.000-07:00
* fixing un-intended breaking changes in logging api surface
* javadoc typo
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.createResourceEnhancers();
+      List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.getResourceEnhancers();
       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
@@ -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/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,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`	`}`