trace2: clarify UTC datetime formatting
Update tr2_tbuf_utc_datetime to generate extended UTC format. Update tr2_tgt_event target to use extended format in 'time' columns. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff Hostetler committed
Apr 15, 2019 at 13:39 UTC
bad229aef232256f3fb6e8ed9c09e26ff654399c
4 files changed
+11
-11
Documentation/technical/api-trace2.txt
+6
-6
@@ -78,11 +78,11 @@ git version 2.20.1.155.g426c96fcdb
78
+
79
------------
80
$ cat ~/log.event
81
-{"event":"version","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16 17:28:42.620713","file":"common-main.c","line":38,"evt":"1","exe":"2.20.1.155.g426c96fcdb"}
82
-{"event":"start","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16 17:28:42.621027","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
83
-{"event":"cmd_name","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16 17:28:42.621122","file":"git.c","line":432,"name":"version","hierarchy":"version"}
84
-{"event":"exit","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16 17:28:42.621236","file":"git.c","line":662,"t_abs":0.001227,"code":0}
85
-{"event":"atexit","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16 17:28:42.621268","file":"trace2/tr2_tgt_event.c","line":163,"t_abs":0.001265,"code":0}
81
+{"event":"version","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"1","exe":"2.20.1.155.g426c96fcdb"}
82
+{"event":"start","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
83
+{"event":"cmd_name","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
84
+{"event":"exit","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
85
+{"event":"atexit","sid":"1547659722619736-11614","thread":"main","time":"2019-01-16T17:28:42.621268Z","file":"trace2/tr2_tgt_event.c","line":163,"t_abs":0.001265,"code":0}
86
------------
87
88
== Enabling a Target
@@ -542,7 +542,7 @@ The following key/value pairs are common to all events:
542
"event":"version",
543
"sid":"1547659722619736-11614",
544
"thread":"main",
545
- "time":"2019-01-16 17:28:42.620713",
545
+ "time":"2019-01-16T17:28:42.620713Z",
546
"file":"common-main.c",
547
"line":38,
548
...
trace2/tr2_tbuf.c
+2
-2
@@ -15,7 +15,7 @@ void tr2_tbuf_local_time(struct tr2_tbuf *tb)
15
tm.tm_min, tm.tm_sec, (long)tv.tv_usec);
16
}
17
18
-void tr2_tbuf_utc_time(struct tr2_tbuf *tb)
18
+void tr2_tbuf_utc_datetime_extended(struct tr2_tbuf *tb)
19
{
20
struct timeval tv;
21
struct tm tm;
@@ -26,7 +26,7 @@ void tr2_tbuf_utc_time(struct tr2_tbuf *tb)
26
gmtime_r(&secs, &tm);
27
28
xsnprintf(tb->buf, sizeof(tb->buf),
29
- "%4d-%02d-%02d %02d:%02d:%02d.%06ld", tm.tm_year + 1900,
29
+ "%4d-%02d-%02dT%02d:%02d:%02d.%06ldZ", tm.tm_year + 1900,
30
tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
31
(long)tv.tv_usec);
32
}
trace2/tr2_tbuf.h
+2
-2
@@ -16,8 +16,8 @@ struct tr2_tbuf {
16
void tr2_tbuf_local_time(struct tr2_tbuf *tb);
17
18
/*
19
- * Fill buffer with formatted UTC time string.
19
+ * Fill buffer with formatted UTC datatime string.
20
*/
21
-void tr2_tbuf_utc_time(struct tr2_tbuf *tb);
21
+void tr2_tbuf_utc_datetime_extended(struct tr2_tbuf *tb);
22
23
#endif /* TR2_TBUF_H */
trace2/tr2_tgt_event.c
+1
-1
@@ -94,7 +94,7 @@ static void event_fmt_prepare(const char *event_name, const char *file,
94
*/
95
if (!tr2env_event_be_brief || !strcmp(event_name, "version") ||
96
!strcmp(event_name, "atexit")) {
97
- tr2_tbuf_utc_time(&tb_now);
97
+ tr2_tbuf_utc_datetime_extended(&tb_now);
98
jw_object_string(jw, "time", tb_now.buf);
99
}
100