From bc422cc4f7c00139eb806fd8e4ed08dee03d42ff Mon Sep 17 00:00:00 2001
From: Dmitry <anoshindx@gmail.com>
Date: Thu, 14 May 2020 14:21:15 -0700
Subject: [PATCH] Change trace related log fields in adservice

---
 src/adservice/src/main/resources/log4j2.xml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/adservice/src/main/resources/log4j2.xml b/src/adservice/src/main/resources/log4j2.xml
index dbb8cb1..7fb4f39 100644
--- a/src/adservice/src/main/resources/log4j2.xml
+++ b/src/adservice/src/main/resources/log4j2.xml
@@ -3,17 +3,13 @@
   <Appenders>
     <Console name="STDOUT" target="SYSTEM_OUT">
 
-      <!-- This is a JSON format that can be read by the Stackdriver Logging agent. The trace ID,
-           span ID, sampling decision, and timestamp are interpreted by Stackdriver. It uses the
-           special JSON keys that the Stackdriver Logging agent converts to "trace", "spanId",
-           "traceSampled", and "timestamp" in the Stackdriver LogEntry
-           (https://cloud.google.com/logging/docs/agent/configuration#special-fields). -->
+      <!-- This is a JSON appender adds additional fields to logs for logs-traces correlation: 
+           trace ID, span ID, and flag showing sampling decision. -->
 
       <JsonLayout compact="true" eventEol="true">
-        <KeyValuePair key="logging.googleapis.com/trace" value="$${ctx:traceId}"/>
-        <KeyValuePair key="logging.googleapis.com/spanId" value="$${ctx:spanId}"/>
-        <KeyValuePair key="logging.googleapis.com/traceSampled" value="$${ctx:traceSampled}"/>
-        <KeyValuePair key="time" value="$${date:yyyy-MM-dd}T$${date:HH:mm:ss.SSS}Z"/>
+        <KeyValuePair key="trace_id" value="$${ctx:traceId}"/>
+        <KeyValuePair key="span_id" value="$${ctx:spanId}"/>
+        <KeyValuePair key="trace_sampled" value="$${ctx:traceSampled}"/>
      </JsonLayout>
 
     </Console>