Skip to content

Commit bcb11b4

Browse files
committed
Merge branch 'jh/structured-logging' into pu
* jh/structured-logging: (25 commits) structured-logging: add config data facility structured-logging: t0420 tests for interacitve child_summary structured-logging: t0420 tests for child process detail events structured-logging: add child process classification structured-logging: add detail-events for child processes structured-logging: add structured logging to remote-curl structured-logging: t0420 tests for aux-data structured-logging: add aux-data for size of sparse-checkout file structured-logging: add aux-data for index size structured-logging: add aux-data facility structured-logging: t0420 tests for timers structured-logging: add timer around preload_index structured-logging: add timer around wt-status functions structured-logging: add timer around do_write_index structured-logging: add timer around do_read_index structured-logging: add timer facility structured-logging: add detail-event for lazy_init_name_hash structured-logging: add detail-event facility structured-logging: t0420 basic tests structured-logging: set sub_command field for checkout command ...
2 parents 703a61b + 1759076 commit bcb11b4

28 files changed

+2757
-4
lines changed

Documentation/config.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,6 +3298,39 @@ showbranch.default::
32983298
The default set of branches for linkgit:git-show-branch[1].
32993299
See linkgit:git-show-branch[1].
33003300

3301+
slog.path::
3302+
(EXPERIMENTAL) Enable structured logging to a file. This must be
3303+
an absolute path. (Git must be compiled with STRUCTURED_LOGGING=1.)
3304+
3305+
slog.pretty::
3306+
(EXPERIMENTAL) Pretty-print structured log data when true.
3307+
(Git must be compiled with STRUCTURED_LOGGING=1.)
3308+
3309+
slog.detail::
3310+
(EXPERIMENTAL) May be set to a boolean value or a list of comma
3311+
separated tokens. Controls which categories of optional "detail"
3312+
events are generated. Default to off. This is conceptually
3313+
similar to the different GIT_TRACE_<key> values.
3314+
+
3315+
Detail events are generic events with a context-specific payload. This
3316+
may represent a single function call or a section of performance sensitive
3317+
code.
3318+
+
3319+
This is intended to be an extendable facility where new events can easily
3320+
be added (possibly only for debugging or performance testing purposes).
3321+
3322+
slog.timers::
3323+
(EXPERIMENTAL) May be set to a boolean value or a list of comma
3324+
separated tokens. Controls which categories of SLOG timers are
3325+
enabled. Defaults to off. Data for enabled timers is added to
3326+
the `cmd_exit` event.
3327+
3328+
slog.aux::
3329+
(EXPERIMENTAL) May be set to a boolean value or a list of
3330+
comma separated tokens. Controls which categories of SLOG
3331+
"aux" data are enabled. Defaults to off. "Aux" data is added
3332+
to the `cmd_exit` event.
3333+
33013334
splitIndex.maxPercentChange::
33023335
When the split index feature is used, this specifies the
33033336
percent of entries the split index can contain compared to the

Documentation/git.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,12 @@ standard output.
766766
adequate and support for it is likely to be removed in the
767767
foreseeable future (along with the variable).
768768

769+
`GIT_SLOG_PARENT_SID`::
770+
(Experimental) A transient environment variable set by top-level
771+
Git commands and inherited by child Git commands. It contains
772+
a session id that will be written the structured logging output
773+
to help associate child and parent processes.
774+
769775
Discussion[[Discussion]]
770776
------------------------
771777

0 commit comments

Comments
 (0)