diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml index a8336e093f..cbe61bbf5e 100644 --- a/.github/workflows/core_contrib_test_0.yml +++ b/.github/workflows/core_contrib_test_0.yml @@ -19,8 +19,8 @@ env: jobs: - py38-test-instrumentation-openai-v2-0: - name: instrumentation-openai-v2-0 + py38-test-instrumentation-openai-v2-oldest: + name: instrumentation-openai-v2-oldest runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -39,10 +39,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py38-test-instrumentation-openai-v2-oldest -- -ra - py38-test-instrumentation-openai-v2-1: - name: instrumentation-openai-v2-1 + py38-test-instrumentation-openai-v2-latest: + name: instrumentation-openai-v2-latest runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -61,10 +61,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py38-test-instrumentation-openai-v2-latest -- -ra - py38-test-instrumentation-vertexai-0: - name: instrumentation-vertexai-0 + py38-test-instrumentation-vertexai-oldest: + name: instrumentation-vertexai-oldest runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -83,10 +83,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-vertexai-0 -- -ra + run: tox -e py38-test-instrumentation-vertexai-oldest -- -ra - py38-test-instrumentation-vertexai-1: - name: instrumentation-vertexai-1 + py38-test-instrumentation-vertexai-latest: + name: instrumentation-vertexai-latest runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -105,7 +105,7 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-vertexai-1 -- -ra + run: tox -e py38-test-instrumentation-vertexai-latest -- -ra py38-test-resource-detector-container: name: resource-detector-container diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index b43a46b94f..9ef80687bc 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -16,8 +16,8 @@ env: jobs: - py38-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 3.8 Ubuntu + py38-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest 3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -32,10 +32,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py38-test-instrumentation-openai-v2-oldest -- -ra - py38-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 3.8 Ubuntu + py38-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest 3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -50,10 +50,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py38-test-instrumentation-openai-v2-latest -- -ra - py39-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 3.9 Ubuntu + py39-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest 3.9 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -68,10 +68,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py39-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py39-test-instrumentation-openai-v2-oldest -- -ra - py39-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 3.9 Ubuntu + py39-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest 3.9 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -86,10 +86,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py39-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py39-test-instrumentation-openai-v2-latest -- -ra - py310-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 3.10 Ubuntu + py310-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest 3.10 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -104,10 +104,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py310-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py310-test-instrumentation-openai-v2-oldest -- -ra - py310-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 3.10 Ubuntu + py310-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest 3.10 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -122,10 +122,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py310-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py310-test-instrumentation-openai-v2-latest -- -ra - py311-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 3.11 Ubuntu + py311-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest 3.11 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -140,10 +140,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py311-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py311-test-instrumentation-openai-v2-oldest -- -ra - py311-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 3.11 Ubuntu + py311-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest 3.11 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -158,10 +158,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py311-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py311-test-instrumentation-openai-v2-latest -- -ra - py312-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 3.12 Ubuntu + py312-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest 3.12 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -176,10 +176,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py312-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py312-test-instrumentation-openai-v2-oldest -- -ra - py312-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 3.12 Ubuntu + py312-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest 3.12 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -194,10 +194,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py312-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py312-test-instrumentation-openai-v2-latest -- -ra - py313-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 3.13 Ubuntu + py313-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest 3.13 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -212,10 +212,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py313-test-instrumentation-openai-v2-0 -- -ra + run: tox -e py313-test-instrumentation-openai-v2-oldest -- -ra - py313-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 3.13 Ubuntu + py313-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest 3.13 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -230,10 +230,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py313-test-instrumentation-openai-v2-1 -- -ra + run: tox -e py313-test-instrumentation-openai-v2-latest -- -ra - pypy3-test-instrumentation-openai-v2-0_ubuntu-latest: - name: instrumentation-openai-v2-0 pypy-3.8 Ubuntu + pypy3-test-instrumentation-openai-v2-oldest_ubuntu-latest: + name: instrumentation-openai-v2-oldest pypy-3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -248,10 +248,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e pypy3-test-instrumentation-openai-v2-0 -- -ra + run: tox -e pypy3-test-instrumentation-openai-v2-oldest -- -ra - pypy3-test-instrumentation-openai-v2-1_ubuntu-latest: - name: instrumentation-openai-v2-1 pypy-3.8 Ubuntu + pypy3-test-instrumentation-openai-v2-latest_ubuntu-latest: + name: instrumentation-openai-v2-latest pypy-3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -266,10 +266,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e pypy3-test-instrumentation-openai-v2-1 -- -ra + run: tox -e pypy3-test-instrumentation-openai-v2-latest -- -ra - py38-test-instrumentation-vertexai-0_ubuntu-latest: - name: instrumentation-vertexai-0 3.8 Ubuntu + py38-test-instrumentation-vertexai-oldest_ubuntu-latest: + name: instrumentation-vertexai-oldest 3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -284,10 +284,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-vertexai-0 -- -ra + run: tox -e py38-test-instrumentation-vertexai-oldest -- -ra - py38-test-instrumentation-vertexai-1_ubuntu-latest: - name: instrumentation-vertexai-1 3.8 Ubuntu + py38-test-instrumentation-vertexai-latest_ubuntu-latest: + name: instrumentation-vertexai-latest 3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -302,10 +302,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py38-test-instrumentation-vertexai-1 -- -ra + run: tox -e py38-test-instrumentation-vertexai-latest -- -ra - py39-test-instrumentation-vertexai-0_ubuntu-latest: - name: instrumentation-vertexai-0 3.9 Ubuntu + py39-test-instrumentation-vertexai-oldest_ubuntu-latest: + name: instrumentation-vertexai-oldest 3.9 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -320,10 +320,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py39-test-instrumentation-vertexai-0 -- -ra + run: tox -e py39-test-instrumentation-vertexai-oldest -- -ra - py39-test-instrumentation-vertexai-1_ubuntu-latest: - name: instrumentation-vertexai-1 3.9 Ubuntu + py39-test-instrumentation-vertexai-latest_ubuntu-latest: + name: instrumentation-vertexai-latest 3.9 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -338,10 +338,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py39-test-instrumentation-vertexai-1 -- -ra + run: tox -e py39-test-instrumentation-vertexai-latest -- -ra - py310-test-instrumentation-vertexai-0_ubuntu-latest: - name: instrumentation-vertexai-0 3.10 Ubuntu + py310-test-instrumentation-vertexai-oldest_ubuntu-latest: + name: instrumentation-vertexai-oldest 3.10 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -356,10 +356,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py310-test-instrumentation-vertexai-0 -- -ra + run: tox -e py310-test-instrumentation-vertexai-oldest -- -ra - py310-test-instrumentation-vertexai-1_ubuntu-latest: - name: instrumentation-vertexai-1 3.10 Ubuntu + py310-test-instrumentation-vertexai-latest_ubuntu-latest: + name: instrumentation-vertexai-latest 3.10 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -374,10 +374,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py310-test-instrumentation-vertexai-1 -- -ra + run: tox -e py310-test-instrumentation-vertexai-latest -- -ra - py311-test-instrumentation-vertexai-0_ubuntu-latest: - name: instrumentation-vertexai-0 3.11 Ubuntu + py311-test-instrumentation-vertexai-oldest_ubuntu-latest: + name: instrumentation-vertexai-oldest 3.11 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -392,10 +392,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py311-test-instrumentation-vertexai-0 -- -ra + run: tox -e py311-test-instrumentation-vertexai-oldest -- -ra - py311-test-instrumentation-vertexai-1_ubuntu-latest: - name: instrumentation-vertexai-1 3.11 Ubuntu + py311-test-instrumentation-vertexai-latest_ubuntu-latest: + name: instrumentation-vertexai-latest 3.11 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -410,10 +410,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py311-test-instrumentation-vertexai-1 -- -ra + run: tox -e py311-test-instrumentation-vertexai-latest -- -ra - py312-test-instrumentation-vertexai-0_ubuntu-latest: - name: instrumentation-vertexai-0 3.12 Ubuntu + py312-test-instrumentation-vertexai-oldest_ubuntu-latest: + name: instrumentation-vertexai-oldest 3.12 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -428,10 +428,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py312-test-instrumentation-vertexai-0 -- -ra + run: tox -e py312-test-instrumentation-vertexai-oldest -- -ra - py312-test-instrumentation-vertexai-1_ubuntu-latest: - name: instrumentation-vertexai-1 3.12 Ubuntu + py312-test-instrumentation-vertexai-latest_ubuntu-latest: + name: instrumentation-vertexai-latest 3.12 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -446,10 +446,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py312-test-instrumentation-vertexai-1 -- -ra + run: tox -e py312-test-instrumentation-vertexai-latest -- -ra - py313-test-instrumentation-vertexai-0_ubuntu-latest: - name: instrumentation-vertexai-0 3.13 Ubuntu + py313-test-instrumentation-vertexai-oldest_ubuntu-latest: + name: instrumentation-vertexai-oldest 3.13 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -464,10 +464,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py313-test-instrumentation-vertexai-0 -- -ra + run: tox -e py313-test-instrumentation-vertexai-oldest -- -ra - py313-test-instrumentation-vertexai-1_ubuntu-latest: - name: instrumentation-vertexai-1 3.13 Ubuntu + py313-test-instrumentation-vertexai-latest_ubuntu-latest: + name: instrumentation-vertexai-latest 3.13 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -482,7 +482,7 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py313-test-instrumentation-vertexai-1 -- -ra + run: tox -e py313-test-instrumentation-vertexai-latest -- -ra py38-test-resource-detector-container_ubuntu-latest: name: resource-detector-container 3.8 Ubuntu diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt deleted file mode 100644 index 4e88239d1c..0000000000 --- a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt +++ /dev/null @@ -1,16 +0,0 @@ -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 diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt deleted file mode 100644 index 6725ed7b66..0000000000 --- a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.latest.txt new file mode 100644 index 0000000000..abed97360f --- /dev/null +++ b/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 conjunction +# with multiple other dependencies in the top-level "tox.ini" +# file. In particular, please see: +# +# openai-latest: {[testenv]test_deps} +# openai-latest: -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 dependencies. + +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 diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt new file mode 100644 index 0000000000..6b46a6eaa4 --- /dev/null +++ b/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 dependencies. + +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 diff --git a/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt b/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt deleted file mode 100644 index 96ee7fd47e..0000000000 --- a/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt +++ /dev/null @@ -1,54 +0,0 @@ -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] diff --git a/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt new file mode 100644 index 0000000000..76f3c77070 --- /dev/null +++ b/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 conjunction +# with multiple other dependencies in the top-level "tox.ini" +# file. In particular, please see: +# +# vertexai-latest: {[testenv]test_deps} +# vertexai-latest: -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 dependencies. + +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] diff --git a/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt b/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt similarity index 63% rename from instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt rename to instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt index 340ad3ac5f..ab633081d9 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt +++ b/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 dependencies. + annotated-types==0.7.0 cachetools==5.5.0 certifi==2024.8.30 diff --git a/tox.ini b/tox.ini index c12cf0a681..25f8b81b39 100644 --- a/tox.ini +++ b/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-{oldest,latest} + pypy3-test-instrumentation-openai-v2-{oldest,latest} 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-{oldest,latest} # Disabling pypy3 as shapely does not have wheels and fails to compile - # pypy3-test-instrumentation-vertexai-{0,1} + # pypy3-test-instrumentation-vertexai-{oldest,latest} 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-oldest: -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-latest: {[testenv]test_deps} + openai-latest: -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-oldest: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt + vertexai-latest: {[testenv]test_deps} + vertexai-latest: -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