---

pongad · web-flow · commit 6fb93219818e · 2018-01-18T12:39:03.000+11:00
yaml --- r: 8945 b: refs/heads/lesv-patch-1 c: 8d64683 h: refs/heads/master i: 8943: 12e5beb
diff --git a/[refs] b/[refs]
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
 refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
 refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
 refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
-refs/heads/lesv-patch-1: 19c22a6e59df87e722b6203954ce1fc15d39cefd
+refs/heads/lesv-patch-1: 8d646838b341cb8e41155a5e41ac77265356b6f8
 refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
 refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
 refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb
diff --git a/branches/lesv-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java b/branches/lesv-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
@@ -38,7 +38,11 @@ public TraceLoggingEnhancer(String prefix) {
    * @param id The traceID
    */
   public static void setCurrentTraceId(String id) {
-    traceId.set(id);
+    if (id == null) {
+      traceId.remove();
+    } else {
+      traceId.set(id);
+    }
   }
 
   /**
