/*
 * Copyright 2016 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *       http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.google.cloud.logging;

/* 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) {
    traceIdLabel = (prefix != null) ? prefix + TRACE_ID : TRACE_ID;
  }

  private static final ThreadLocal<String> traceId = new ThreadLocal<>();

  /**
   * Set the Trace ID associated with any logging done by the current thread.
   *
   * @param id The traceID
   */
  public static void setCurrentTraceId(String id) {
    traceId.set(id);
  }

  /**
   * Get the Trace ID associated with any logging done by the current thread.
   *
   * @return id The traceID
   */
  public static String getCurrentTraceId() {
    return traceId.get();
  }

  @Override
  public void enhanceLogEntry(com.google.cloud.logging.LogEntry.Builder builder) {
    String traceId = getCurrentTraceId();
    if (traceId != null) {
      builder.addLabel(traceIdLabel, traceId);
    }
  }
}

@@ -1289,24 +1289,85 @@
 tring id) %7B%0A
+    if (id == null) %7B%0A      traceId.remove();%0A    %7D else %7B%0A  
     traceId.
@@ -1375,16 +1375,22 @@
 et(id);%0A
+    %7D%0A
   %7D%0A%0A  /

clear null trace_id (#2760)