2020-12-23 18:08:20 +00:00
|
|
|
# Copyright (C) 2020 The Android Open Source Project
|
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
|
|
|
"""Provide event logging in the git trace2 EVENT format.
|
|
|
|
|
|
|
|
The git trace2 EVENT format is defined at:
|
|
|
|
https://www.kernel.org/pub/software/scm/git/docs/technical/api-trace2.html#_event_format
|
|
|
|
https://git-scm.com/docs/api-trace2#_the_event_format_target
|
|
|
|
|
|
|
|
Usage:
|
|
|
|
|
|
|
|
git_trace_log = EventLog()
|
|
|
|
git_trace_log.StartEvent()
|
|
|
|
...
|
|
|
|
git_trace_log.ExitEvent()
|
|
|
|
git_trace_log.Write()
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
import datetime
|
2022-03-08 18:24:43 +00:00
|
|
|
import errno
|
2020-12-23 18:08:20 +00:00
|
|
|
import json
|
|
|
|
import os
|
2022-03-08 18:24:43 +00:00
|
|
|
import socket
|
2020-12-23 18:08:20 +00:00
|
|
|
import sys
|
|
|
|
import tempfile
|
|
|
|
import threading
|
|
|
|
|
|
|
|
from git_command import GitCommand, RepoSourceVersion
|
|
|
|
|
|
|
|
|
|
|
|
class EventLog(object):
|
|
|
|
"""Event log that records events that occurred during a repo invocation.
|
|
|
|
|
|
|
|
Events are written to the log as a consecutive JSON entries, one per line.
|
|
|
|
Entries follow the git trace2 EVENT format.
|
|
|
|
|
|
|
|
Each entry contains the following common keys:
|
|
|
|
- event: The event name
|
|
|
|
- sid: session-id - Unique string to allow process instance to be identified.
|
|
|
|
- thread: The thread name.
|
|
|
|
- time: is the UTC time of the event.
|
|
|
|
|
|
|
|
Valid 'event' names and event specific fields are documented here:
|
|
|
|
https://git-scm.com/docs/api-trace2#_event_format
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, env=None):
|
|
|
|
"""Initializes the event log."""
|
|
|
|
self._log = []
|
|
|
|
# Try to get session-id (sid) from environment (setup in repo launcher).
|
|
|
|
KEY = 'GIT_TRACE2_PARENT_SID'
|
|
|
|
if env is None:
|
|
|
|
env = os.environ
|
|
|
|
|
|
|
|
now = datetime.datetime.utcnow()
|
|
|
|
|
|
|
|
# Save both our sid component and the complete sid.
|
|
|
|
# We use our sid component (self._sid) as the unique filename prefix and
|
|
|
|
# the full sid (self._full_sid) in the log itself.
|
|
|
|
self._sid = 'repo-%s-P%08x' % (now.strftime('%Y%m%dT%H%M%SZ'), os.getpid())
|
|
|
|
parent_sid = env.get(KEY)
|
|
|
|
# Append our sid component to the parent sid (if it exists).
|
|
|
|
if parent_sid is not None:
|
|
|
|
self._full_sid = parent_sid + '/' + self._sid
|
|
|
|
else:
|
|
|
|
self._full_sid = self._sid
|
|
|
|
|
|
|
|
# Set/update the environment variable.
|
|
|
|
# Environment handling across systems is messy.
|
|
|
|
try:
|
|
|
|
env[KEY] = self._full_sid
|
|
|
|
except UnicodeEncodeError:
|
|
|
|
env[KEY] = self._full_sid.encode()
|
|
|
|
|
|
|
|
# Add a version event to front of the log.
|
|
|
|
self._AddVersionEvent()
|
|
|
|
|
|
|
|
@property
|
|
|
|
def full_sid(self):
|
|
|
|
return self._full_sid
|
|
|
|
|
|
|
|
def _AddVersionEvent(self):
|
|
|
|
"""Adds a 'version' event at the beginning of current log."""
|
|
|
|
version_event = self._CreateEventDict('version')
|
2021-01-19 17:04:28 +00:00
|
|
|
version_event['evt'] = "2"
|
2020-12-23 18:08:20 +00:00
|
|
|
version_event['exe'] = RepoSourceVersion()
|
|
|
|
self._log.insert(0, version_event)
|
|
|
|
|
|
|
|
def _CreateEventDict(self, event_name):
|
|
|
|
"""Returns a dictionary with the common keys/values for git trace2 events.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
event_name: The event name.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Dictionary with the common event fields populated.
|
|
|
|
"""
|
|
|
|
return {
|
|
|
|
'event': event_name,
|
|
|
|
'sid': self._full_sid,
|
2022-11-25 07:45:37 +00:00
|
|
|
'thread': threading.current_thread().name,
|
2020-12-23 18:08:20 +00:00
|
|
|
'time': datetime.datetime.utcnow().isoformat() + 'Z',
|
|
|
|
}
|
|
|
|
|
|
|
|
def StartEvent(self):
|
|
|
|
"""Append a 'start' event to the current log."""
|
|
|
|
start_event = self._CreateEventDict('start')
|
|
|
|
start_event['argv'] = sys.argv
|
|
|
|
self._log.append(start_event)
|
|
|
|
|
|
|
|
def ExitEvent(self, result):
|
|
|
|
"""Append an 'exit' event to the current log.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
result: Exit code of the event
|
|
|
|
"""
|
|
|
|
exit_event = self._CreateEventDict('exit')
|
|
|
|
|
|
|
|
# Consider 'None' success (consistent with event_log result handling).
|
|
|
|
if result is None:
|
|
|
|
result = 0
|
|
|
|
exit_event['code'] = result
|
|
|
|
self._log.append(exit_event)
|
|
|
|
|
2021-03-16 21:24:14 +00:00
|
|
|
def CommandEvent(self, name, subcommands):
|
|
|
|
"""Append a 'command' event to the current log.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
name: Name of the primary command (ex: repo, git)
|
|
|
|
subcommands: List of the sub-commands (ex: version, init, sync)
|
|
|
|
"""
|
|
|
|
command_event = self._CreateEventDict('command')
|
|
|
|
command_event['name'] = name
|
|
|
|
command_event['subcommands'] = subcommands
|
|
|
|
self._log.append(command_event)
|
|
|
|
|
2021-07-28 21:36:49 +00:00
|
|
|
def LogConfigEvents(self, config, event_dict_name):
|
|
|
|
"""Append a |event_dict_name| event for each config key in |config|.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
config: Configuration dictionary.
|
|
|
|
event_dict_name: Name of the event dictionary for items to be logged under.
|
|
|
|
"""
|
|
|
|
for param, value in config.items():
|
|
|
|
event = self._CreateEventDict(event_dict_name)
|
|
|
|
event['param'] = param
|
|
|
|
event['value'] = value
|
|
|
|
self._log.append(event)
|
|
|
|
|
2021-03-05 19:04:49 +00:00
|
|
|
def DefParamRepoEvents(self, config):
|
|
|
|
"""Append a 'def_param' event for each repo.* config key to the current log.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
config: Repo configuration dictionary
|
|
|
|
"""
|
|
|
|
# Only output the repo.* config parameters.
|
|
|
|
repo_config = {k: v for k, v in config.items() if k.startswith('repo.')}
|
2021-07-28 21:36:49 +00:00
|
|
|
self.LogConfigEvents(repo_config, 'def_param')
|
2021-03-05 19:04:49 +00:00
|
|
|
|
2021-09-27 22:15:47 +00:00
|
|
|
def GetDataEventName(self, value):
|
|
|
|
"""Returns 'data-json' if the value is an array else returns 'data'."""
|
|
|
|
return 'data-json' if value[0] == '[' and value[-1] == ']' else 'data'
|
2021-09-27 17:55:44 +00:00
|
|
|
|
sync: Log repo sync state events as 'data' events.
git_trace2_event_log.py:
+ Added LogDataConfigEvents method to log 'data' events.
Sync's current_sync_state and previous_sync_state are logged
as 'data' events in the current log.
It logs are key/value in the |config| argument. Each key is
prefixed with |prefix| argument.
The following are sample events that are logged during repo sync.
{"event":"data",
"sid":"repo-20210914T181545Z-P000330c0/repo-20210914T181545Z-P000330c0",
"thread":"MainThread",
"time":"2021-09-14T18:16:19.935846Z",
"key":"previous_sync_state/repo.syncstate.main.synctime",
"value":"2021-09-14T17:27:11.573717Z"}
{"event":"data",
"sid":"repo-20210914T181545Z-P000330c0/repo-20210914T181545Z-P000330c0",
"thread":"MainThread",
"time":"2021-09-14T18:16:19.955546Z",
"key":"current_sync_state/repo.syncstate.main.synctime",
"value":"2021-09-14T18:16:19.935979Z"}
tests/test_git_trace2_event_log.py:
+ Added unit tests
sync.py:
+ Changed logging calls to LogDataConfigEvents.
Tested:
$ ./run_tests
Tested it by running the following command multiple times.
$ repo_dev sync -j 20
repo sync has finished successfully
Verified config data is looged in trace2 event logs.
Bug: [google internal] b/199758376
Change-Id: I75fd830e90c1811ec28510538c99a2632b104e85
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/317823
Reviewed-by: Josh Steadmon <steadmon@google.com>
Reviewed-by: Xin Li <delphij@google.com>
Tested-by: Raman Tenneti <rtenneti@google.com>
2021-09-14 00:40:07 +00:00
|
|
|
def LogDataConfigEvents(self, config, prefix):
|
|
|
|
"""Append a 'data' event for each config key/value in |config| to the current log.
|
|
|
|
|
|
|
|
For each keyX and valueX of the config, "key" field of the event is '|prefix|/keyX'
|
|
|
|
and the "value" of the "key" field is valueX.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
config: Configuration dictionary.
|
|
|
|
prefix: Prefix for each key that is logged.
|
|
|
|
"""
|
|
|
|
for key, value in config.items():
|
2021-09-27 22:15:47 +00:00
|
|
|
event = self._CreateEventDict(self.GetDataEventName(value))
|
sync: Log repo sync state events as 'data' events.
git_trace2_event_log.py:
+ Added LogDataConfigEvents method to log 'data' events.
Sync's current_sync_state and previous_sync_state are logged
as 'data' events in the current log.
It logs are key/value in the |config| argument. Each key is
prefixed with |prefix| argument.
The following are sample events that are logged during repo sync.
{"event":"data",
"sid":"repo-20210914T181545Z-P000330c0/repo-20210914T181545Z-P000330c0",
"thread":"MainThread",
"time":"2021-09-14T18:16:19.935846Z",
"key":"previous_sync_state/repo.syncstate.main.synctime",
"value":"2021-09-14T17:27:11.573717Z"}
{"event":"data",
"sid":"repo-20210914T181545Z-P000330c0/repo-20210914T181545Z-P000330c0",
"thread":"MainThread",
"time":"2021-09-14T18:16:19.955546Z",
"key":"current_sync_state/repo.syncstate.main.synctime",
"value":"2021-09-14T18:16:19.935979Z"}
tests/test_git_trace2_event_log.py:
+ Added unit tests
sync.py:
+ Changed logging calls to LogDataConfigEvents.
Tested:
$ ./run_tests
Tested it by running the following command multiple times.
$ repo_dev sync -j 20
repo sync has finished successfully
Verified config data is looged in trace2 event logs.
Bug: [google internal] b/199758376
Change-Id: I75fd830e90c1811ec28510538c99a2632b104e85
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/317823
Reviewed-by: Josh Steadmon <steadmon@google.com>
Reviewed-by: Xin Li <delphij@google.com>
Tested-by: Raman Tenneti <rtenneti@google.com>
2021-09-14 00:40:07 +00:00
|
|
|
event['key'] = f'{prefix}/{key}'
|
|
|
|
event['value'] = value
|
|
|
|
self._log.append(event)
|
|
|
|
|
2021-06-09 00:41:08 +00:00
|
|
|
def ErrorEvent(self, msg, fmt):
|
|
|
|
"""Append a 'error' event to the current log."""
|
|
|
|
error_event = self._CreateEventDict('error')
|
|
|
|
error_event['msg'] = msg
|
|
|
|
error_event['fmt'] = fmt
|
|
|
|
self._log.append(error_event)
|
|
|
|
|
2021-01-07 00:26:31 +00:00
|
|
|
def _GetEventTargetPath(self):
|
|
|
|
"""Get the 'trace2.eventtarget' path from git configuration.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
path: git config's 'trace2.eventtarget' path if it exists, or None
|
|
|
|
"""
|
|
|
|
path = None
|
|
|
|
cmd = ['config', '--get', 'trace2.eventtarget']
|
|
|
|
# TODO(https://crbug.com/gerrit/13706): Use GitConfig when it supports
|
|
|
|
# system git config variables.
|
|
|
|
p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True,
|
|
|
|
bare=True)
|
|
|
|
retval = p.Wait()
|
|
|
|
if retval == 0:
|
|
|
|
# Strip trailing carriage-return in path.
|
|
|
|
path = p.stdout.rstrip('\n')
|
|
|
|
elif retval != 1:
|
|
|
|
# `git config --get` is documented to produce an exit status of `1` if
|
|
|
|
# the requested variable is not present in the configuration. Report any
|
|
|
|
# other return value as an error.
|
|
|
|
print("repo: error: 'git config --get' call failed with return code: %r, stderr: %r" % (
|
|
|
|
retval, p.stderr), file=sys.stderr)
|
|
|
|
return path
|
|
|
|
|
2022-03-08 18:24:43 +00:00
|
|
|
def _WriteLog(self, write_fn):
|
|
|
|
"""Writes the log out using a provided writer function.
|
|
|
|
|
|
|
|
Generate compact JSON output for each item in the log, and write it using
|
|
|
|
write_fn.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
write_fn: A function that accepts byts and writes them to a destination.
|
|
|
|
"""
|
|
|
|
|
|
|
|
for e in self._log:
|
|
|
|
# Dump in compact encoding mode.
|
|
|
|
# See 'Compact encoding' in Python docs:
|
|
|
|
# https://docs.python.org/3/library/json.html#module-json
|
|
|
|
write_fn(json.dumps(e, indent=None, separators=(',', ':')).encode('utf-8') + b'\n')
|
|
|
|
|
2020-12-23 18:08:20 +00:00
|
|
|
def Write(self, path=None):
|
2022-03-08 18:24:43 +00:00
|
|
|
"""Writes the log out to a file or socket.
|
2020-12-23 18:08:20 +00:00
|
|
|
|
|
|
|
Log is only written if 'path' or 'git config --get trace2.eventtarget'
|
2022-03-08 18:24:43 +00:00
|
|
|
provide a valid path (or socket) to write logs to.
|
2020-12-23 18:08:20 +00:00
|
|
|
|
|
|
|
Logging filename format follows the git trace2 style of being a unique
|
|
|
|
(exclusive writable) file.
|
|
|
|
|
|
|
|
Args:
|
2022-03-08 18:24:43 +00:00
|
|
|
path: Path to where logs should be written. The path may have a prefix of
|
|
|
|
the form "af_unix:[{stream|dgram}:]", in which case the path is
|
|
|
|
treated as a Unix domain socket. See
|
|
|
|
https://git-scm.com/docs/api-trace2#_enabling_a_target for details.
|
2020-12-23 18:08:20 +00:00
|
|
|
|
|
|
|
Returns:
|
2022-03-08 18:24:43 +00:00
|
|
|
log_path: Path to the log file or socket if log is written, otherwise None
|
2020-12-23 18:08:20 +00:00
|
|
|
"""
|
|
|
|
log_path = None
|
|
|
|
# If no logging path is specified, get the path from 'trace2.eventtarget'.
|
|
|
|
if path is None:
|
2021-01-07 00:26:31 +00:00
|
|
|
path = self._GetEventTargetPath()
|
|
|
|
|
|
|
|
# If no logging path is specified, exit.
|
|
|
|
if path is None:
|
|
|
|
return None
|
2020-12-23 18:08:20 +00:00
|
|
|
|
2022-03-08 18:24:43 +00:00
|
|
|
path_is_socket = False
|
|
|
|
socket_type = None
|
2020-12-23 18:08:20 +00:00
|
|
|
if isinstance(path, str):
|
2022-03-08 18:24:43 +00:00
|
|
|
parts = path.split(':', 1)
|
|
|
|
if parts[0] == 'af_unix' and len(parts) == 2:
|
|
|
|
path_is_socket = True
|
|
|
|
path = parts[1]
|
|
|
|
parts = path.split(':', 1)
|
|
|
|
if parts[0] == 'stream' and len(parts) == 2:
|
|
|
|
socket_type = socket.SOCK_STREAM
|
|
|
|
path = parts[1]
|
|
|
|
elif parts[0] == 'dgram' and len(parts) == 2:
|
|
|
|
socket_type = socket.SOCK_DGRAM
|
|
|
|
path = parts[1]
|
|
|
|
else:
|
|
|
|
# Get absolute path.
|
|
|
|
path = os.path.abspath(os.path.expanduser(path))
|
2020-12-23 18:08:20 +00:00
|
|
|
else:
|
|
|
|
raise TypeError('path: str required but got %s.' % type(path))
|
|
|
|
|
|
|
|
# Git trace2 requires a directory to write log to.
|
|
|
|
|
|
|
|
# TODO(https://crbug.com/gerrit/13706): Support file (append) mode also.
|
2022-03-08 18:24:43 +00:00
|
|
|
if not (path_is_socket or os.path.isdir(path)):
|
|
|
|
return None
|
|
|
|
|
|
|
|
if path_is_socket:
|
|
|
|
if socket_type == socket.SOCK_STREAM or socket_type is None:
|
|
|
|
try:
|
|
|
|
with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
|
|
|
|
sock.connect(path)
|
|
|
|
self._WriteLog(sock.sendall)
|
|
|
|
return f'af_unix:stream:{path}'
|
|
|
|
except OSError as err:
|
|
|
|
# If we tried to connect to a DGRAM socket using STREAM, ignore the
|
|
|
|
# attempt and continue to DGRAM below. Otherwise, issue a warning.
|
|
|
|
if err.errno != errno.EPROTOTYPE:
|
|
|
|
print(f'repo: warning: git trace2 logging failed: {err}', file=sys.stderr)
|
|
|
|
return None
|
|
|
|
if socket_type == socket.SOCK_DGRAM or socket_type is None:
|
|
|
|
try:
|
|
|
|
with socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) as sock:
|
|
|
|
self._WriteLog(lambda bs: sock.sendto(bs, path))
|
|
|
|
return f'af_unix:dgram:{path}'
|
|
|
|
except OSError as err:
|
|
|
|
print(f'repo: warning: git trace2 logging failed: {err}', file=sys.stderr)
|
|
|
|
return None
|
|
|
|
# Tried to open a socket but couldn't connect (SOCK_STREAM) or write
|
|
|
|
# (SOCK_DGRAM).
|
|
|
|
print('repo: warning: git trace2 logging failed: could not write to socket', file=sys.stderr)
|
2020-12-23 18:08:20 +00:00
|
|
|
return None
|
2022-03-08 18:24:43 +00:00
|
|
|
|
|
|
|
# Path is an absolute path
|
2020-12-23 18:08:20 +00:00
|
|
|
# Use NamedTemporaryFile to generate a unique filename as required by git trace2.
|
|
|
|
try:
|
2022-03-08 18:24:43 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='xb', prefix=self._sid, dir=path,
|
2020-12-23 18:08:20 +00:00
|
|
|
delete=False) as f:
|
|
|
|
# TODO(https://crbug.com/gerrit/13706): Support writing events as they
|
|
|
|
# occur.
|
2022-03-08 18:24:43 +00:00
|
|
|
self._WriteLog(f.write)
|
2020-12-23 18:08:20 +00:00
|
|
|
log_path = f.name
|
|
|
|
except FileExistsError as err:
|
|
|
|
print('repo: warning: git trace2 logging failed: %r' % err,
|
|
|
|
file=sys.stderr)
|
|
|
|
return None
|
|
|
|
return log_path
|