Skip to content

Commit 1795f04

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 1b412aa + 1759076 commit 1795f04

28 files changed

+2757
-4
lines changed

Documentation/config.txt

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

3250+
slog.path::
3251+
(EXPERIMENTAL) Enable structured logging to a file. This must be
3252+
an absolute path. (Git must be compiled with STRUCTURED_LOGGING=1.)
3253+
3254+
slog.pretty::
3255+
(EXPERIMENTAL) Pretty-print structured log data when true.
3256+
(Git must be compiled with STRUCTURED_LOGGING=1.)
3257+
3258+
slog.detail::
3259+
(EXPERIMENTAL) May be set to a boolean value or a list of comma
3260+
separated tokens. Controls which categories of optional "detail"
3261+
events are generated. Default to off. This is conceptually
3262+
similar to the different GIT_TRACE_<key> values.
3263+
+
3264+
Detail events are generic events with a context-specific payload. This
3265+
may represent a single function call or a section of performance sensitive
3266+
code.
3267+
+
3268+
This is intended to be an extendable facility where new events can easily
3269+
be added (possibly only for debugging or performance testing purposes).
3270+
3271+
slog.timers::
3272+
(EXPERIMENTAL) May be set to a boolean value or a list of comma
3273+
separated tokens. Controls which categories of SLOG timers are
3274+
enabled. Defaults to off. Data for enabled timers is added to
3275+
the `cmd_exit` event.
3276+
3277+
slog.aux::
3278+
(EXPERIMENTAL) May be set to a boolean value or a list of
3279+
comma separated tokens. Controls which categories of SLOG
3280+
"aux" data are enabled. Defaults to off. "Aux" data is added
3281+
to the `cmd_exit` event.
3282+
32503283
splitIndex.maxPercentChange::
32513284
When the split index feature is used, this specifies the
32523285
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)