[CI] Keep OTel bytecode out of mounted checkouts (#56766)
Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com> Co-authored-by: OpenAI Codex <codex@openai.com>
This commit is contained in:
co-authored by
OpenAI Codex
parent
dc2e8f1157
commit
5236bef721
@@ -26,7 +26,8 @@ if [ -z "${CI_INFRA_OTEL_RUNTIME_DIR}" ] ||
|
||||
[ -z "${_CI_INFRA_OTEL_PYTHON}" ] ||
|
||||
[ ! -f "${CI_INFRA_OTEL_DIR}/ci_otel.py" ] ||
|
||||
! mkdir -p "${CI_INFRA_OTEL_SPOOL_DIR}" ||
|
||||
! PYTHONPATH="${CI_INFRA_OTEL_DIR}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
! PYTHONDONTWRITEBYTECODE=1 \
|
||||
PYTHONPATH="${CI_INFRA_OTEL_DIR}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${_CI_INFRA_OTEL_PYTHON}" -c "import ci_otel" >/dev/null 2>&1; then
|
||||
echo "vLLM CI OTel: tracing unavailable; test command will run normally" >&2 || :
|
||||
if [ "${_CI_INFRA_OTEL_OWNS_RUNTIME}" = "1" ]; then
|
||||
@@ -58,9 +59,9 @@ fi
|
||||
|
||||
_ci_otel_python() {
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout 2s "${_CI_INFRA_OTEL_PYTHON}" "$@"
|
||||
PYTHONDONTWRITEBYTECODE=1 timeout 2s "${_CI_INFRA_OTEL_PYTHON}" "$@"
|
||||
else
|
||||
"${_CI_INFRA_OTEL_PYTHON}" "$@"
|
||||
PYTHONDONTWRITEBYTECODE=1 "${_CI_INFRA_OTEL_PYTHON}" "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -86,7 +87,8 @@ ci_otel_start() {
|
||||
if [ "${CI_INFRA_GPU_SAMPLING:-1}" != "0" ] &&
|
||||
[ -f "${CI_INFRA_OTEL_DIR}/ci_gpu.py" ] &&
|
||||
command -v nvidia-smi >/dev/null 2>&1; then
|
||||
"${_CI_INFRA_OTEL_PYTHON}" "${CI_INFRA_OTEL_DIR}/ci_gpu.py" "$$" </dev/null &
|
||||
PYTHONDONTWRITEBYTECODE=1 \
|
||||
"${_CI_INFRA_OTEL_PYTHON}" "${CI_INFRA_OTEL_DIR}/ci_gpu.py" "$$" </dev/null &
|
||||
_CI_INFRA_GPU_PID=$!
|
||||
fi
|
||||
}
|
||||
@@ -137,9 +139,11 @@ _ci_otel_on_exit() {
|
||||
trap - 0
|
||||
ci_otel_finish "${_CI_INFRA_OTEL_EXIT_STATUS}" || :
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout 4s "${_CI_INFRA_OTEL_PYTHON}" "${CI_INFRA_OTEL_DIR}/ci_otel.py" flush || :
|
||||
PYTHONDONTWRITEBYTECODE=1 timeout 4s \
|
||||
"${_CI_INFRA_OTEL_PYTHON}" "${CI_INFRA_OTEL_DIR}/ci_otel.py" flush || :
|
||||
else
|
||||
"${_CI_INFRA_OTEL_PYTHON}" "${CI_INFRA_OTEL_DIR}/ci_otel.py" flush || :
|
||||
PYTHONDONTWRITEBYTECODE=1 \
|
||||
"${_CI_INFRA_OTEL_PYTHON}" "${CI_INFRA_OTEL_DIR}/ci_otel.py" flush || :
|
||||
fi
|
||||
if [ "${_CI_INFRA_OTEL_OWNS_RUNTIME}" = "1" ]; then
|
||||
rm -rf -- "${CI_INFRA_OTEL_RUNTIME_DIR}" || :
|
||||
|
||||
@@ -6,6 +6,7 @@ from __future__ import annotations
|
||||
import json
|
||||
import os
|
||||
import shlex
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
@@ -396,6 +397,35 @@ def test_shell_wrapper_preserves_failure_status(tmp_path):
|
||||
assert result.returncode == 1
|
||||
|
||||
|
||||
def test_shell_wrapper_does_not_write_bytecode_to_helper_tree(tmp_path):
|
||||
helper_dir = tmp_path / "ci-otel"
|
||||
shutil.copytree(
|
||||
SCRIPTS_DIR,
|
||||
helper_dir,
|
||||
ignore=shutil.ignore_patterns("__pycache__"),
|
||||
)
|
||||
shell = (
|
||||
f'. "{helper_dir / "ci_otel.sh"}"; '
|
||||
f"ci_otel_start 1 {_quoted('true')}; ci_otel_finish 0"
|
||||
)
|
||||
|
||||
result = subprocess.run(
|
||||
["/bin/sh", "-c", shell],
|
||||
check=False,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
env={
|
||||
**os.environ,
|
||||
"CI_INFRA_OTEL_DIR": str(helper_dir),
|
||||
"CI_INFRA_GPU_SAMPLING": "0",
|
||||
"CI_INFRA_OTEL_SPOOL_DIR": str(tmp_path / "spans"),
|
||||
},
|
||||
)
|
||||
|
||||
assert result.returncode == 0, result.stderr
|
||||
assert list(helper_dir.rglob("*.pyc")) == []
|
||||
|
||||
|
||||
def test_ci_otel_run_records_command_and_preserves_status(tmp_path):
|
||||
shell = (
|
||||
f'. "{SCRIPTS_DIR / "ci_otel.sh"}"; '
|
||||
|
||||
Reference in New Issue
Block a user