Skip to content

Commit bc2befd

Browse files
committed
Replace '-0' and '-1' with semantically meaningful suffixes.
1 parent 63e43d5 commit bc2befd

File tree

8 files changed

+207
-97
lines changed

8 files changed

+207
-97
lines changed

instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Copyright The OpenTelemetry Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
16+
# ********************************
17+
# WARNING: NOT HERMETIC !!!!!!!!!!
18+
# ********************************
19+
#
20+
# This "requirements.txt" is installed in conjuction
21+
# with multiple other dependencies in the top-level "tox.ini"
22+
# file. In particular, please see:
23+
#
24+
# openai-recent-deps: {[testenv]test_deps}
25+
# openai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt
26+
#
27+
# This provides additional dependencies, namely:
28+
#
29+
# opentelemetry-api
30+
# opentelemetry-sdk
31+
# opentelemetry-semantic-conventions
32+
#
33+
# ... with a "dev" version based on the latest distribution.
34+
35+
36+
# This variant of the requirements aims to test the system using
37+
# the newest supported version of external depenendencies.
38+
39+
openai==1.26.0
40+
pydantic==2.8.2
41+
httpx==0.27.2
42+
Deprecated==1.2.14
43+
importlib-metadata==6.11.0
44+
packaging==24.0
45+
pytest==7.4.4
46+
pytest-vcr==1.0.2
47+
pytest-asyncio==0.21.0
48+
wrapt==1.16.0
49+
# test with the latest version of opentelemetry-api, sdk, and semantic conventions
50+
51+
-e opentelemetry-instrumentation
52+
-e instrumentation-genai/opentelemetry-instrumentation-openai-v2
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Copyright The OpenTelemetry Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# This variant of the requirements aims to test the system using
16+
# the oldest supported version of external depenendencies.
17+
18+
openai==1.26.0
19+
pydantic==2.8.2
20+
httpx==0.27.2
21+
Deprecated==1.2.14
22+
importlib-metadata==6.11.0
23+
packaging==24.0
24+
pytest==7.4.4
25+
pytest-vcr==1.0.2
26+
pytest-asyncio==0.21.0
27+
wrapt==1.16.0
28+
opentelemetry-exporter-otlp-proto-http~=1.30
29+
opentelemetry-api==1.30 # when updating, also update in pyproject.toml
30+
opentelemetry-sdk==1.30 # when updating, also update in pyproject.toml
31+
opentelemetry-semantic-conventions==0.51b0 # when updating, also update in pyproject.toml
32+
33+
-e instrumentation-genai/opentelemetry-instrumentation-openai-v2

instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt

Lines changed: 0 additions & 54 deletions
This file was deleted.
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# Copyright The OpenTelemetry Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
16+
# ********************************
17+
# WARNING: NOT HERMETIC !!!!!!!!!!
18+
# ********************************
19+
#
20+
# This "requirements.txt" is installed in conjuction
21+
# with multiple other dependencies in the top-level "tox.ini"
22+
# file. In particular, please see:
23+
#
24+
# vertexai-recent-deps: {[testenv]test_deps}
25+
# vertexai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt
26+
#
27+
# This provides additional dependencies, namely:
28+
#
29+
# opentelemetry-api
30+
# opentelemetry-sdk
31+
# opentelemetry-semantic-conventions
32+
#
33+
# ... with a "dev" version based on the latest distribution.
34+
35+
36+
# This variant of the requirements aims to test the system using
37+
# the newest supported version of external depenendencies.
38+
39+
annotated-types==0.7.0
40+
asgiref==3.8.1
41+
cachetools==5.5.0
42+
certifi==2024.8.30
43+
charset-normalizer==3.4.0
44+
Deprecated==1.2.15
45+
docstring_parser==0.16
46+
exceptiongroup==1.2.2
47+
google-api-core==2.23.0
48+
google-auth==2.36.0
49+
google-cloud-aiplatform==1.79.0
50+
google-cloud-bigquery==3.27.0
51+
google-cloud-core==2.4.1
52+
google-cloud-resource-manager==1.13.1
53+
google-cloud-storage==2.19.0
54+
google-crc32c==1.5.0
55+
google-resumable-media==2.7.2
56+
googleapis-common-protos==1.66.0
57+
grpc-google-iam-v1==0.13.1
58+
grpcio==1.68.1
59+
grpcio-status==1.68.1
60+
idna==3.10
61+
importlib_metadata==8.5.0
62+
iniconfig==2.0.0
63+
multidict==6.1.0
64+
packaging==24.2
65+
pluggy==1.5.0
66+
propcache==0.2.0
67+
proto-plus==1.25.0
68+
protobuf==5.29.1
69+
pyasn1==0.6.1
70+
pyasn1_modules==0.4.1
71+
pydantic==2.10.3
72+
pydantic_core==2.27.1
73+
pytest==7.4.4
74+
pytest-asyncio==0.21.0
75+
pytest-vcr==1.0.2
76+
python-dateutil==2.9.0.post0
77+
PyYAML==6.0.2
78+
requests==2.32.3
79+
rsa==4.9
80+
shapely==2.0.6
81+
six==1.17.0
82+
tomli==2.2.1
83+
typing_extensions==4.12.2
84+
urllib3==1.26.20
85+
vcrpy==6.0.2
86+
wrapt==1.17.0
87+
yarl==1.15.2
88+
zipp==3.20.2
89+
# test with the latest version of opentelemetry-api, sdk, and semantic conventions
90+
91+
-e opentelemetry-instrumentation
92+
-e instrumentation-genai/opentelemetry-instrumentation-vertexai[instruments]

instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt renamed to instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Copyright The OpenTelemetry Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# This variant of the requirements aims to test the system using
16+
# the oldest supported version of external depenendencies.
17+
118
annotated-types==0.7.0
219
cachetools==5.5.0
320
certifi==2024.8.30

tox.ini

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ envlist =
99
; for specifying supported Python versions per package.
1010

1111
; instrumentation-openai
12-
py3{8,9,10,11,12,13}-test-instrumentation-openai-v2-{0,1}
13-
pypy3-test-instrumentation-openai-v2-{0,1}
12+
py3{8,9,10,11,12,13}-test-instrumentation-openai-v2-{old-deps,recent-deps}
13+
pypy3-test-instrumentation-openai-v2-{old-deps,recent-deps}
1414
lint-instrumentation-openai-v2
1515

1616
; instrumentation-vertexai
17-
py3{8,9,10,11,12,13}-test-instrumentation-vertexai-{0,1}
17+
py3{8,9,10,11,12,13}-test-instrumentation-vertexai-{old-deps,recent-deps}
1818
# Disabling pypy3 as shapely does not have wheels and fails to compile
19-
# pypy3-test-instrumentation-vertexai-{0,1}
19+
# pypy3-test-instrumentation-vertexai-{old-deps,recent-deps}
2020
lint-instrumentation-vertexai
2121

2222
; opentelemetry-resource-detector-container
@@ -435,16 +435,16 @@ deps =
435435

436436
# packages that are released individually should provide a test-requirements.txt with the lowest version of OTel API
437437
# and SDK supported to test we are honoring it
438-
openai-0: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
438+
openai-old-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt
439439
# and the latest version of OTel API and SDK
440-
openai-1: {[testenv]test_deps}
441-
openai-1: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt
442-
lint-instrumentation-openai-v2: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
443-
444-
vertexai-0: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt
445-
vertexai-1: {[testenv]test_deps}
446-
vertexai-1: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt
447-
lint-instrumentation-vertexai: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt
440+
openai-recent-deps: {[testenv]test_deps}
441+
openai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt
442+
lint-instrumentation-openai-v2: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt
443+
444+
vertexai-old-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt
445+
vertexai-recent-deps: {[testenv]test_deps}
446+
vertexai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt
447+
lint-instrumentation-vertexai: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt
448448

449449
asgi: {[testenv]test_deps}
450450
asgi: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt

0 commit comments

Comments
 (0)