0edf1d38e2
As part of the build team's effort to cleanup envseup.sh. Remove the run_tool_with_logging rundtion from envsetup.sh and add it as a standalone script under build/soong/bin Test: atest run_tool_with_logging Test: manually do source envsetup.sh and run adb devices -l and check the event log is sent to clearcut, tested with both bash and zsh Bug: 342066042 Change-Id: I2fbc69a064832af61d75d14b0e33a62cb56186df
55 lines
1.6 KiB
Bash
Executable file
55 lines
1.6 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright (C) 2024 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.
|
|
|
|
# Run commands in a subshell for us to handle forced terminations with a trap
|
|
# handler.
|
|
(
|
|
tool_tag="$1"
|
|
shift
|
|
tool_binary="$1"
|
|
shift
|
|
|
|
# If the logger is not configured, run the original command and return.
|
|
if [[ -z "${ANDROID_TOOL_LOGGER}" ]]; then
|
|
"${tool_binary}" "${@}"
|
|
exit $?
|
|
fi
|
|
|
|
# Otherwise, run the original command and call the logger when done.
|
|
start_time=$(date +%s.%N)
|
|
logger=${ANDROID_TOOL_LOGGER}
|
|
|
|
# Install a trap to call the logger even when the process terminates abnormally.
|
|
# The logger is run in the background and its output suppressed to avoid
|
|
# interference with the user flow.
|
|
trap '
|
|
exit_code=$?;
|
|
# Remove the trap to prevent duplicate log.
|
|
trap - EXIT;
|
|
"${logger}" \
|
|
--tool_tag="${tool_tag}" \
|
|
--start_timestamp="${start_time}" \
|
|
--end_timestamp="$(date +%s.%N)" \
|
|
--tool_args="$*" \
|
|
--exit_code="${exit_code}" \
|
|
${ANDROID_TOOL_LOGGER_EXTRA_ARGS} \
|
|
> /dev/null 2>&1 &
|
|
exit ${exit_code}
|
|
' SIGINT SIGTERM SIGQUIT EXIT
|
|
|
|
# Run the original command.
|
|
"${tool_binary}" "${@}"
|
|
)
|