---

andreamlin · web-flow · commit 827c28a6e7d5 · 2018-06-05T12:47:56.000-07:00
yaml --- r: 9699 b: refs/heads/master c: 5c41d41 h: refs/heads/master i: 9697: 2c6e38a 9695: 9698a91
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3db8085fb0c4ada19d3fc438e52ecb667995ed92
+refs/heads/master: 5c41d41c1ce36456a3778146b2d2f695d61531fa
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: e04ec732e2dd43f0ebc9921f3a6291b50c820e3a
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java b/trunk/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
@@ -35,7 +35,7 @@ public TraceLoggingEnhancer(String prefix) {
   /**
    * Set the Trace ID associated with any logging done by the current thread.
    *
-   * @param id The traceID
+   * @param id The traceID, in the form projects/[PROJECT_ID]/traces/[TRACE_ID]
    */
   public static void setCurrentTraceId(String id) {
     if (id == null) {
@@ -58,7 +58,7 @@ public static String getCurrentTraceId() {
   public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {
     String traceId = getCurrentTraceId();
     if (traceId != null) {
-      builder.addLabel(traceIdLabel, traceId);
+      builder.setTrace(traceId);
     }
   }
 }
diff --git a/trunk/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java b/trunk/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
@@ -131,6 +131,13 @@ public class LoggingHandlerTest {
       .addLabel("levelValue", String.valueOf(LoggingLevel.EMERGENCY.intValue()))
       .setTimestamp(123456789L)
       .build();
+  private static final LogEntry TRACE_ENTRY = LogEntry.newBuilder(StringPayload.of(MESSAGE))
+      .setSeverity(Severity.DEBUG)
+      .addLabel("levelName", "FINEST")
+      .addLabel("levelValue", String.valueOf(Level.FINEST.intValue()))
+      .setTrace("projects/projectId/traces/traceId")
+      .setTimestamp(123456789L)
+      .build();
   private static final String CONFIG_NAMESPACE = "com.google.cloud.logging.LoggingHandler";
   private static final ImmutableMap<String, String> CONFIG_MAP =
       ImmutableMap.<String, String>builder()
@@ -314,6 +321,31 @@ public void enhanceLogEntry(Builder builder) {
     handler.publish(newLogRecord(Level.FINEST, MESSAGE));
   }
 
+  @Test
+  public void testTraceEnhancedLogEntry() {
+    expect(options.getProjectId()).andReturn(PROJECT).anyTimes();
+    expect(options.getService()).andReturn(logging);
+    MonitoredResource resource = MonitoredResource.of("custom", ImmutableMap.<String, String>of());
+    logging.setFlushSeverity(Severity.ERROR);
+    expectLastCall().once();
+    logging.setWriteSynchronicity(Synchronicity.ASYNC);
+    expectLastCall().once();
+    logging.write(
+        ImmutableList.of(TRACE_ENTRY),
+        WriteOption.logName(LOG_NAME),
+        WriteOption.resource(resource),
+        WriteOption.labels(BASE_SEVERITY_MAP));
+    expectLastCall().once();
+    replay(options, logging);
+    LoggingEnhancer enhancer = new TraceLoggingEnhancer();
+    TraceLoggingEnhancer.setCurrentTraceId("projects/projectId/traces/traceId");
+    Handler handler =
+        new LoggingHandler(LOG_NAME, options, resource, Collections.singletonList(enhancer));
+    handler.setLevel(Level.ALL);
+    handler.setFormatter(new TestFormatter());
+    handler.publish(newLogRecord(Level.FINEST, MESSAGE));
+  }
+
   @Test
   public void testReportWriteError() {
     expect(options.getProjectId()).andReturn(PROJECT).anyTimes();

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public TraceLoggingEnhancer(String prefix) {`
`35`	`35`	`/**`
`36`	`36`	`* Set the Trace ID associated with any logging done by the current thread.`
`37`	`37`	`*`
`38`		`- * @param id The traceID`
	`38`	`+ * @param id The traceID, in the form projects/[PROJECT_ID]/traces/[TRACE_ID]`
`39`	`39`	`*/`
`40`	`40`	`public static void setCurrentTraceId(String id) {`
`41`	`41`	`if (id == null) {`
`@@ -58,7 +58,7 @@ public static String getCurrentTraceId() {`
`58`	`58`	`public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {`
`59`	`59`	`String traceId = getCurrentTraceId();`
`60`	`60`	`if (traceId != null) {`
`61`		`- builder.addLabel(traceIdLabel, traceId);`
	`61`	`+ builder.setTrace(traceId);`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`