about summary refs log tree commit diff
path: root/third_party/git/trace2/tr2_tgt_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/trace2/tr2_tgt_event.c')
-rw-r--r--third_party/git/trace2/tr2_tgt_event.c36
1 files changed, 12 insertions, 24 deletions
diff --git a/third_party/git/trace2/tr2_tgt_event.c b/third_party/git/trace2/tr2_tgt_event.c
index 6353e8ad9156..c2852d1bd2bd 100644
--- a/third_party/git/trace2/tr2_tgt_event.c
+++ b/third_party/git/trace2/tr2_tgt_event.c
@@ -10,17 +10,16 @@
 #include "trace2/tr2_tgt.h"
 #include "trace2/tr2_tls.h"
 
-static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 };
+static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0 };
 
 /*
- * The version number of the JSON data generated by the EVENT target in this
- * source file. The version should be incremented if new event types are added,
- * if existing fields are removed, or if there are significant changes in
- * interpretation of existing events or fields. Smaller changes, such as adding
- * a new field to an existing event, do not require an increment to the EVENT
- * format version.
+ * The version number of the JSON data generated by the EVENT target
+ * in this source file.  Update this if you make a significant change
+ * to the JSON fields or message structure.  You probably do not need
+ * to update this if you just add another call to one of the existing
+ * TRACE2 API methods.
  */
-#define TR2_EVENT_VERSION "2"
+#define TR2_EVENT_VERSION "1"
 
 /*
  * Region nesting limit for messages written to the event target.
@@ -108,19 +107,6 @@ static void event_fmt_prepare(const char *event_name, const char *file,
 		jw_object_intmax(jw, "repo", repo->trace2_repo_id);
 }
 
-static void fn_too_many_files_fl(const char *file, int line)
-{
-	const char *event_name = "too_many_files";
-	struct json_writer jw = JSON_WRITER_INIT;
-
-	jw_object_begin(&jw, 0);
-	event_fmt_prepare(event_name, file, line, NULL, &jw);
-	jw_end(&jw);
-
-	tr2_dst_write_line(&tr2dst_event, &jw.json);
-	jw_release(&jw);
-}
-
 static void fn_version_fl(const char *file, int line)
 {
 	const char *event_name = "version";
@@ -134,9 +120,6 @@ static void fn_version_fl(const char *file, int line)
 
 	tr2_dst_write_line(&tr2dst_event, &jw.json);
 	jw_release(&jw);
-
-	if (tr2dst_event.too_many_files)
-		fn_too_many_files_fl(file, line);
 }
 
 static void fn_start_fl(const char *file, int line,
@@ -222,6 +205,11 @@ static void maybe_add_string_va(struct json_writer *jw, const char *field_name,
 		strbuf_release(&buf);
 		return;
 	}
+
+	if (fmt && *fmt) {
+		jw_object_string(jw, field_name, fmt);
+		return;
+	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,