phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-04 02:03:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: fix tele test

Browse source 
# What does this PR do?


## Test Plan
This commit is contained in:
Eric Huang 2025-10-30 11:02:27 -07:00
parent 5e20938832
commit b71a870f04
2 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/integration-tests.sh
View file

@ -187,6 +187,11 @@ if ! command -v pytest &> /dev/null; then
exit 1 exit 1
fi fi
# Configure telemetry collector port shared between host and container
COLLECTOR_PORT=4319
export LLAMA_STACK_TEST_COLLECTOR_PORT="${COLLECTOR_PORT}"
export OTEL_EXPORTER_OTLP_ENDPOINT="http://localhost:${COLLECTOR_PORT}"
# Start Llama Stack Server if needed # Start Llama Stack Server if needed
if [[ "$STACK_CONFIG" == *"server:"* && "$COLLECT_ONLY" == false ]]; then if [[ "$STACK_CONFIG" == *"server:"* && "$COLLECT_ONLY" == false ]]; then
stop_server() { stop_server() {
@ -284,10 +289,6 @@ if [[ "$STACK_CONFIG" == *"docker:"* && "$COLLECT_ONLY" == false ]]; then
docker stop "$container_name" 2>/dev/null || true docker stop "$container_name" 2>/dev/null || true
docker rm "$container_name" 2>/dev/null || true docker rm "$container_name" 2>/dev/null || true
# Configure telemetry collector port shared between host and container
COLLECTOR_PORT=4317
export LLAMA_STACK_TEST_COLLECTOR_PORT="${COLLECTOR_PORT}"
# Build environment variables for docker run # Build environment variables for docker run
DOCKER_ENV_VARS="" DOCKER_ENV_VARS=""
DOCKER_ENV_VARS="$DOCKER_ENV_VARS -e LLAMA_STACK_TEST_INFERENCE_MODE=$INFERENCE_MODE" DOCKER_ENV_VARS="$DOCKER_ENV_VARS -e LLAMA_STACK_TEST_INFERENCE_MODE=$INFERENCE_MODE"

16
tests/integration/telemetry/conftest.py
View file

@ -25,17 +25,6 @@ def telemetry_test_collector():
collector = OtlpHttpTestCollector() collector = OtlpHttpTestCollector()
except RuntimeError as exc: except RuntimeError as exc:
pytest.skip(str(exc)) pytest.skip(str(exc))
env_overrides = {
"OTEL_EXPORTER_OTLP_ENDPOINT": collector.endpoint,
"OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf",
"OTEL_BSP_SCHEDULE_DELAY": "200",
"OTEL_BSP_EXPORT_TIMEOUT": "2000",
}
previous_env = {key: os.environ.get(key) for key in env_overrides}
for key, value in env_overrides.items():
os.environ[key] = value
telemetry_module._TRACER_PROVIDER = None telemetry_module._TRACER_PROVIDER = None
@ -43,11 +32,6 @@ def telemetry_test_collector():
yield collector yield collector
finally: finally:
collector.shutdown() collector.shutdown()
for key, prior in previous_env.items():
if prior is None:
os.environ.pop(key, None)
else:
os.environ[key] = prior
else: else:
manager = InMemoryTelemetryManager() manager = InMemoryTelemetryManager()
try: try: