Skip to content

Commit 22db8a8

Browse files
can-anyscalecan-anyscale
committed
[core] remove otel from hard dependencies
Signed-off-by: can <can@anyscale.com>
1 parent 0e9d93b commit 22db8a8

File tree

9 files changed

+52
-55
lines changed

9 files changed

+52
-55
lines changed

‎.buildkite/serve.rayci.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ steps:
1818
- name: servepydantic1build
1919
wanda: ci/docker/servepydantic1.build.wanda.yaml
2020

21+
- name: servetracingbuild
22+
wanda: ci/docker/servetracing.build.wanda.yaml
23+
2124
- name: minbuild-serve
2225
label: "wanda: minbuild-{{matrix}}-py39"
2326
wanda: ci/docker/min.build.wanda.yaml
@@ -37,7 +40,7 @@ steps:
3740
instance_type: large
3841
commands:
3942
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
40-
--except-tags post_wheel_build,gpu,ha_integration
43+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
4144
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
4245
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9
4346
depends_on: "servebuild"
@@ -51,7 +54,7 @@ steps:
5154
soft_fail: true
5255
commands:
5356
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
54-
--except-tags post_wheel_build,gpu,ha_integration
57+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
5558
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
5659
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
5760
depends_on: servepydantic1build
@@ -64,7 +67,7 @@ steps:
6467
instance_type: large
6568
commands:
6669
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
67-
--except-tags post_wheel_build,gpu,ha_integration
70+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
6871
--workers 2 --worker-id {{matrix.worker_id}} --parallelism-per-worker 3
6972
--python-version {{matrix.python}}
7073
--test-env=EXPECTED_PYTHON_VERSION={{matrix.python}}
@@ -167,6 +170,16 @@ steps:
167170
- raycpubase
168171
- servebuild
169172

173+
- label: ":ray-serve: serve: tracing tests"
174+
tags:
175+
- serve
176+
- python
177+
instance_type: medium
178+
commands:
179+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
180+
--only-tags serve_tracing --build-name servetracingbuild
181+
depends_on: servetracingbuild
182+
170183
- label: ":ray-serve: serve: doc gpu tests"
171184
tags:
172185
- serve

‎ci/docker/serve.build.Dockerfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_build
44
FROM $DOCKER_IMAGE_BASE_BUILD
55

6+
ARG ENABLE_TRACING
67
ARG PYDANTIC_VERSION
78
ARG PYTHON
89

@@ -35,4 +36,13 @@ else
3536
echo "Not installing Pydantic from source"
3637
fi
3738

39+
if [[ "${ENABLE_TRACING-}" == "1" ]]; then
40+
# Install tracing dependencies if requested. Intentionally, we do not use
41+
# requirements_compiled.txt as the constraint file. They are not compatible with
42+
# a few packages in that file (e.g. requiring an ugprade to protobuf 5+).
43+
pip install -U opentelemetry-exporter-otlp
44+
else
45+
echo "Not installing tracing dependencies"
46+
fi
47+
3848
EOF

‎ci/docker/servetracing.build.wanda.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: "servetracingbuild"
2+
froms: ["cr.ray.io/rayproject/oss-ci-base_build"]
3+
dockerfile: ci/docker/serve.build.Dockerfile
4+
srcs:
5+
- python/requirements.txt
6+
- python/requirements_compiled.txt
7+
- python/requirements/test-requirements.txt
8+
build_args:
9+
- ENABLE_TRACING=1
10+
tags:
11+
- cr.ray.io/rayproject/servetracingbuild

‎python/ray/tests/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,7 @@ py_test(
11881188
"exclusive",
11891189
"medium_size_python_tests_k_to_z",
11901190
"no_windows",
1191+
"serve_tracing",
11911192
"team:serve",
11921193
],
11931194
deps = [

‎python/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ smart_open
3333
lz4
3434
numpy>=1.20
3535
aiorwlock
36-
opentelemetry-exporter-otlp
3736
scipy
3837
colorful
3938
rich
40-
opentelemetry-sdk
39+
opentelemetry-sdk>=1.30.0
40+
opentelemetry-api
4141
opentelemetry-exporter-prometheus
42+
opentelemetry-proto
4243
fastapi
4344
gymnasium==1.0.0
4445
virtualenv!=20.21.1,>=20.0.24
45-
opentelemetry-api
4646
opencensus
4747
aiohttp_cors
4848
dm_tree

‎python/requirements/cloud-requirements.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
jupyterlab==3.6.1
22
ipywidgets
3-
opentelemetry-api
4-
opentelemetry-sdk
5-
opentelemetry-exporter-otlp
63
google-cloud-storage
74
grpcio>=1.66.1
85
grpcio-tools

‎python/requirements/test-requirements.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ moto[s3,server]==4.2.12
3333
mypy==1.7.0
3434
numba==0.59.1
3535
openpyxl==3.0.10
36-
opentelemetry-api==1.26.0
37-
opentelemetry-sdk==1.26.0
38-
opentelemetry-exporter-otlp>=1.26.0
36+
opentelemetry-api
37+
opentelemetry-sdk
3938
opencensus-proto==0.1.0
4039
pexpect==4.8.0
4140
Pillow==10.3.0; platform_system != "Windows"

‎python/requirements_compiled.txt‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -411,12 +411,6 @@ delta-sharing==1.0.5
411411
# via -r python/requirements/ml/data-test-requirements.txt
412412
deltalake==0.18.2
413413
# via -r python/requirements/ml/data-test-requirements.txt
414-
deprecated==1.2.18
415-
# via
416-
# opentelemetry-api
417-
# opentelemetry-exporter-otlp-proto-grpc
418-
# opentelemetry-exporter-otlp-proto-http
419-
# opentelemetry-semantic-conventions
420414
dill==0.3.7
421415
# via
422416
# datasets
@@ -658,8 +652,6 @@ googleapis-common-protos==1.61.0
658652
# via
659653
# google-api-core
660654
# grpcio-status
661-
# opentelemetry-exporter-otlp-proto-grpc
662-
# opentelemetry-exporter-otlp-proto-http
663655
# tensorflow-metadata
664656
gpy==1.13.1
665657
# via -r python/requirements/ml/tune-test-requirements.txt
@@ -692,7 +684,6 @@ grpcio==1.66.2 ; sys_platform != "darwin"
692684
# grpcio-tools
693685
# mlagents-envs
694686
# opencensus-proto
695-
# opentelemetry-exporter-otlp-proto-grpc
696687
# tensorboard
697688
# tensorflow
698689
grpcio-status==1.48.2
@@ -1325,47 +1316,25 @@ opencv-python-headless==4.9.0.80
13251316
# via -r python/requirements/ml/rllib-test-requirements.txt
13261317
openpyxl==3.0.10
13271318
# via -r python/requirements/test-requirements.txt
1328-
opentelemetry-api==1.26.0
1319+
opentelemetry-api==1.34.1
13291320
# via
13301321
# -r python/requirements.txt
1331-
# -r python/requirements/cloud-requirements.txt
13321322
# -r python/requirements/test-requirements.txt
13331323
# mlflow-skinny
1334-
# opentelemetry-exporter-otlp-proto-grpc
1335-
# opentelemetry-exporter-otlp-proto-http
13361324
# opentelemetry-exporter-prometheus
13371325
# opentelemetry-sdk
13381326
# opentelemetry-semantic-conventions
1339-
opentelemetry-exporter-otlp==1.26.0
1340-
# via
1341-
# -r python/requirements.txt
1342-
# -r python/requirements/cloud-requirements.txt
1343-
# -r python/requirements/test-requirements.txt
1344-
opentelemetry-exporter-otlp-proto-common==1.26.0
1345-
# via
1346-
# opentelemetry-exporter-otlp-proto-grpc
1347-
# opentelemetry-exporter-otlp-proto-http
1348-
opentelemetry-exporter-otlp-proto-grpc==1.26.0
1349-
# via opentelemetry-exporter-otlp
1350-
opentelemetry-exporter-otlp-proto-http==1.26.0
1351-
# via opentelemetry-exporter-otlp
1352-
opentelemetry-exporter-prometheus==0.47b0
1327+
opentelemetry-exporter-prometheus==0.55b1
13531328
# via -r python/requirements.txt
1354-
opentelemetry-proto==1.26.0
1355-
# via
1356-
# opentelemetry-exporter-otlp-proto-common
1357-
# opentelemetry-exporter-otlp-proto-grpc
1358-
# opentelemetry-exporter-otlp-proto-http
1359-
opentelemetry-sdk==1.26.0
1329+
opentelemetry-proto==1.27.0
1330+
# via -r python/requirements.txt
1331+
opentelemetry-sdk==1.34.1
13601332
# via
13611333
# -r python/requirements.txt
1362-
# -r python/requirements/cloud-requirements.txt
13631334
# -r python/requirements/test-requirements.txt
13641335
# mlflow-skinny
1365-
# opentelemetry-exporter-otlp-proto-grpc
1366-
# opentelemetry-exporter-otlp-proto-http
13671336
# opentelemetry-exporter-prometheus
1368-
opentelemetry-semantic-conventions==0.47b0
1337+
opentelemetry-semantic-conventions==0.55b1
13691338
# via opentelemetry-sdk
13701339
opt-einsum==3.3.0
13711340
# via
@@ -1903,7 +1872,6 @@ requests==2.32.3
19031872
# moto
19041873
# msal
19051874
# msrest
1906-
# opentelemetry-exporter-otlp-proto-http
19071875
# pyiceberg
19081876
# ray
19091877
# requests-oauthlib
@@ -2410,7 +2378,9 @@ typing-extensions==4.12.2
24102378
# mypy
24112379
# myst-nb
24122380
# nevergrad
2381+
# opentelemetry-api
24132382
# opentelemetry-sdk
2383+
# opentelemetry-semantic-conventions
24142384
# pydantic
24152385
# pydantic-core
24162386
# pyopenssl
@@ -2531,7 +2501,6 @@ wrapt==1.14.1
25312501
# aiobotocore
25322502
# aws-xray-sdk
25332503
# comet-ml
2534-
# deprecated
25352504
# tensorflow
25362505
# tensorflow-datasets
25372506
wurlitzer==3.1.1

‎python/setup.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def get_packages(self):
260260
"grpcio >= 1.32.0; python_version < '3.10'", # noqa:E501
261261
"grpcio >= 1.42.0; python_version >= '3.10'", # noqa:E501
262262
"opencensus",
263-
"opentelemetry-sdk",
263+
"opentelemetry-sdk >= 1.30.0",
264264
"opentelemetry-exporter-prometheus",
265265
"opentelemetry-proto",
266266
pydantic_dep,
@@ -269,9 +269,6 @@ def get_packages(self):
269269
"virtualenv >=20.0.24, !=20.21.1", # For pip runtime env.
270270
],
271271
"observability": [
272-
"opentelemetry-api",
273-
"opentelemetry-sdk",
274-
"opentelemetry-exporter-otlp",
275272
"memray; sys_platform != 'win32'",
276273
],
277274
"serve": [

0 commit comments

Comments
 (0)