[chore] Replace '-0' and '-1' with semantically meaningful suffixes. Other minor fixes in 'instrumentation-genai' test structure.

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt

@@ -0,0 +1,52 @@
+# Copyright The OpenTelemetry Authors
+#
+# 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.
+
+
+# ********************************
+# WARNING: NOT HERMETIC !!!!!!!!!!
+# ********************************
+#
+# This "requirements.txt" is installed in conjuction
+# with multiple other dependencies in the top-level "tox.ini"
+# file. In particular, please see:
+#
+#   openai-recent-deps: {[testenv]test_deps}
+#   openai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt
+#
+# This provides additional dependencies, namely:
+#
+#   opentelemetry-api
+#   opentelemetry-sdk
+#   opentelemetry-semantic-conventions
+#
+# ... with a "dev" version based on the latest distribution.
+
+
+# This variant of the requirements aims to test the system using
+# the newest supported version of external depenendencies.
+
+openai==1.26.0
+pydantic==2.8.2
+httpx==0.27.2
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+packaging==24.0
+pytest==7.4.4
+pytest-vcr==1.0.2
+pytest-asyncio==0.21.0
+wrapt==1.16.0
+# test with the latest version of opentelemetry-api, sdk, and semantic conventions
+
+-e opentelemetry-instrumentation
+-e instrumentation-genai/opentelemetry-instrumentation-openai-v2

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt

@@ -0,0 +1,33 @@
+# Copyright The OpenTelemetry Authors
+#
+# 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.
+
+# This variant of the requirements aims to test the system using
+# the oldest supported version of external depenendencies.
+
+openai==1.26.0
+pydantic==2.8.2
+httpx==0.27.2
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+packaging==24.0
+pytest==7.4.4
+pytest-vcr==1.0.2
+pytest-asyncio==0.21.0
+wrapt==1.16.0
+opentelemetry-exporter-otlp-proto-http~=1.30
+opentelemetry-api==1.30  # when updating, also update in pyproject.toml
+opentelemetry-sdk==1.30  # when updating, also update in pyproject.toml
+opentelemetry-semantic-conventions==0.51b0  # when updating, also update in pyproject.toml
+
+-e instrumentation-genai/opentelemetry-instrumentation-openai-v2

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt

@@ -0,0 +1,92 @@
+# Copyright The OpenTelemetry Authors
+#
+# 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.
+
+
+# ********************************
+# WARNING: NOT HERMETIC !!!!!!!!!!
+# ********************************
+#
+# This "requirements.txt" is installed in conjuction
+# with multiple other dependencies in the top-level "tox.ini"
+# file. In particular, please see:
+#
+#   vertexai-recent-deps: {[testenv]test_deps}
+#   vertexai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt
+#
+# This provides additional dependencies, namely:
+#
+#   opentelemetry-api
+#   opentelemetry-sdk
+#   opentelemetry-semantic-conventions
+#
+# ... with a "dev" version based on the latest distribution.
+
+
+# This variant of the requirements aims to test the system using
+# the newest supported version of external depenendencies.
+
+annotated-types==0.7.0
+asgiref==3.8.1
+cachetools==5.5.0
+certifi==2024.8.30
+charset-normalizer==3.4.0
+Deprecated==1.2.15
+docstring_parser==0.16
+exceptiongroup==1.2.2
+google-api-core==2.23.0
+google-auth==2.36.0
+google-cloud-aiplatform==1.79.0
+google-cloud-bigquery==3.27.0
+google-cloud-core==2.4.1
+google-cloud-resource-manager==1.13.1
+google-cloud-storage==2.19.0
+google-crc32c==1.5.0
+google-resumable-media==2.7.2
+googleapis-common-protos==1.66.0
+grpc-google-iam-v1==0.13.1
+grpcio==1.68.1
+grpcio-status==1.68.1
+idna==3.10
+importlib_metadata==8.5.0
+iniconfig==2.0.0
+multidict==6.1.0
+packaging==24.2
+pluggy==1.5.0
+propcache==0.2.0
+proto-plus==1.25.0
+protobuf==5.29.1
+pyasn1==0.6.1
+pyasn1_modules==0.4.1
+pydantic==2.10.3
+pydantic_core==2.27.1
+pytest==7.4.4
+pytest-asyncio==0.21.0
+pytest-vcr==1.0.2
+python-dateutil==2.9.0.post0
+PyYAML==6.0.2
+requests==2.32.3
+rsa==4.9
+shapely==2.0.6
+six==1.17.0
+tomli==2.2.1
+typing_extensions==4.12.2
+urllib3==1.26.20
+vcrpy==6.0.2
+wrapt==1.17.0
+yarl==1.15.2
+zipp==3.20.2
+# test with the latest version of opentelemetry-api, sdk, and semantic conventions
+
+-e opentelemetry-instrumentation
+-e instrumentation-genai/opentelemetry-instrumentation-vertexai[instruments]

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

@@ -1,3 +1,20 @@
+# Copyright The OpenTelemetry Authors
+#
+# 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.
+
+# This variant of the requirements aims to test the system using
+# the oldest supported version of external depenendencies.
+
 annotated-types==0.7.0
 cachetools==5.5.0
 certifi==2024.8.30

tox.ini

@@ -9,14 +9,14 @@ envlist =
     ; for specifying supported Python versions per package.
 
     ; instrumentation-openai
-    py3{8,9,10,11,12,13}-test-instrumentation-openai-v2-{0,1}
-    pypy3-test-instrumentation-openai-v2-{0,1}
+    py3{8,9,10,11,12,13}-test-instrumentation-openai-v2-{old-deps,recent-deps}
+    pypy3-test-instrumentation-openai-v2-{old-deps,recent-deps}
     lint-instrumentation-openai-v2
 
     ; instrumentation-vertexai
-    py3{8,9,10,11,12,13}-test-instrumentation-vertexai-{0,1}
+    py3{8,9,10,11,12,13}-test-instrumentation-vertexai-{old-deps,recent-deps}
     # Disabling pypy3 as shapely does not have wheels and fails to compile
-    # pypy3-test-instrumentation-vertexai-{0,1}
+    # pypy3-test-instrumentation-vertexai-{old-deps,recent-deps}
     lint-instrumentation-vertexai
 
     ; opentelemetry-resource-detector-container
@@ -435,16 +435,16 @@ deps =
 
   # packages that are released individually should provide a test-requirements.txt with the lowest version of OTel API
   # and SDK supported to test we are honoring it
-  openai-0: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
+  openai-old-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt
   # and the latest version of OTel API and SDK
-  openai-1: {[testenv]test_deps}
-  openai-1: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt
-  lint-instrumentation-openai-v2: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
-
-  vertexai-0: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt
-  vertexai-1: {[testenv]test_deps}
-  vertexai-1: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt
-  lint-instrumentation-vertexai: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt
+  openai-recent-deps: {[testenv]test_deps}
+  openai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt
+  lint-instrumentation-openai-v2: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt
+
+  vertexai-old-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt
+  vertexai-recent-deps: {[testenv]test_deps}
+  vertexai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt
+  lint-instrumentation-vertexai: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt
 
   asgi: {[testenv]test_deps}
   asgi: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt