Test packages that are released individually with lowest versions the…

…y support (open-telemetry#2961)
lmolkova · Nov 7, 2024 · aa8271a · aa8271a
1 parent 110b95c
commit aa8271a
Show file tree

Hide file tree

Showing 16 changed files with 1,669 additions and 1,146 deletions.
diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation ~= 0.48b0",
-  "opentelemetry-semantic-conventions ~= 0.48b0"
+  "opentelemetry-api ~= 1.28",
+  "opentelemetry-instrumentation ~= 0.49b0",
+  "opentelemetry-semantic-conventions ~= 0.49b0"
 ]
 
 [project.optional-dependencies]

diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
@@ -0,0 +1,13 @@
+openai==1.26.0
+pydantic==2.8.2
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+packaging==24.0
+pytest==7.4.4
+pytest-vcr==1.0.2
+wrapt==1.16.0
+opentelemetry-api==1.28  # when updating, also update in pyproject.toml
+opentelemetry-sdk==1.28  # when updating, also update in pyproject.toml
+opentelemetry-semantic-conventions==0.49b0  # when updating, also update in pyproject.toml
+
+-e instrumentation-genai/opentelemetry-instrumentation-openai-v2
diff --git a/...mentation-openai-v2/test-requirements.txt → ...ntation-openai-v2/test-requirements-1.txt b/...mentation-openai-v2/test-requirements.txt → ...ntation-openai-v2/test-requirements-1.txt
@@ -6,6 +6,7 @@ packaging==24.0
 pytest==7.4.4
 pytest-vcr==1.0.2
 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/propagator/opentelemetry-propagator-aws-xray/CHANGELOG.md b/propagator/opentelemetry-propagator-aws-xray/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Update `opentelemetry-api` version to 1.16
+  ([#2961](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2961))
+
 ## Version 1.0.2 (2024-08-05)
 
 See [common CHANGELOG](../../CHANGELOG.md) for the changes in this and prior versions.

diff --git a/propagator/opentelemetry-propagator-aws-xray/pyproject.toml b/propagator/opentelemetry-propagator-aws-xray/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.12",
+  "opentelemetry-api ~= 1.16",
 ]
 
 [project.entry-points.opentelemetry_propagator]

diff --git a/propagator/opentelemetry-propagator-aws-xray/test-requirements-0.txt b/propagator/opentelemetry-propagator-aws-xray/test-requirements-0.txt
@@ -0,0 +1,21 @@
+asgiref==3.8.1
+certifi==2024.7.4
+charset-normalizer==3.3.2
+Deprecated==1.2.14
+idna==3.7
+iniconfig==2.0.0
+packaging==24.0
+pluggy==1.5.0
+py-cpuinfo==9.0.0
+pytest==7.4.4
+pytest-benchmark==4.0.0
+requests==2.32.3
+tomli==2.0.1
+typing_extensions==4.12.2
+urllib3==2.2.2
+wrapt==1.16.0
+zipp==3.19.2
+opentelemetry-api==1.16  # when updating, also update in pyproject.toml
+opentelemetry-sdk==1.16  # when updating, also update in pyproject.toml
+
+-e propagator/opentelemetry-propagator-aws-xray
diff --git a/...propagator-aws-xray/test-requirements.txt → ...opagator-aws-xray/test-requirements-1.txt b/...propagator-aws-xray/test-requirements.txt → ...opagator-aws-xray/test-requirements-1.txt
@@ -15,4 +15,6 @@ typing_extensions==4.12.2
 urllib3==2.2.2
 wrapt==1.16.0
 zipp==3.19.2
+# test with the latest version of opentelemetry-api, sdk, and semantic conventions
+
 -e propagator/opentelemetry-propagator-aws-xray
diff --git a/resource/opentelemetry-resource-detector-azure/CHANGELOG.md b/resource/opentelemetry-resource-detector-azure/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Ensure consistently use of suppress_instrumentation utils
   ([#2590](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2590))
+- Update `opentelemetry-instrumentation` version to 0.44b0
+  ([#2961](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2961))
 
 ## Version 0.1.5 (2024-05-16)
 

diff --git a/resource/opentelemetry-resource-detector-azure/pyproject.toml b/resource/opentelemetry-resource-detector-azure/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-sdk ~= 1.21",
-  "opentelemetry-instrumentation ~= 0.43b0",
+  "opentelemetry-instrumentation ~= 0.44b0",
 ]
 
 [project.entry-points.opentelemetry_resource_detector]

diff --git a/resource/opentelemetry-resource-detector-azure/test-requirements-0.txt b/resource/opentelemetry-resource-detector-azure/test-requirements-0.txt
@@ -0,0 +1,15 @@
+asgiref==3.8.1
+Deprecated==1.2.14
+iniconfig==2.0.0
+packaging==24.0
+pluggy==1.5.0
+py-cpuinfo==9.0.0
+pytest==7.4.4
+typing_extensions==4.12.2
+wrapt==1.16.0
+zipp==3.19.2
+opentelemetry-api==1.21  # when updating, also update in pyproject.toml
+opentelemetry-sdk==1.21  # when updating, also update in pyproject.toml
+opentelemetry-instrumentation==0.44b0  # when updating, also update in pyproject.toml
+
+-e resource/opentelemetry-resource-detector-azure
diff --git a/...urce-detector-azure/test-requirements.txt → ...ce-detector-azure/test-requirements-1.txt b/...urce-detector-azure/test-requirements.txt → ...ce-detector-azure/test-requirements-1.txt
@@ -8,5 +8,7 @@ pytest==7.4.4
 typing_extensions==4.12.2
 wrapt==1.16.0
 zipp==3.19.2
+# test with the latest version of opentelemetry-api, sdk, and semantic conventions
+
 -e opentelemetry-instrumentation
 -e resource/opentelemetry-resource-detector-azure
diff --git a/...y-sdk-extension-aws/test-requirements.txt → ...sdk-extension-aws/test-requirements-0.txt b/...y-sdk-extension-aws/test-requirements.txt → ...sdk-extension-aws/test-requirements-0.txt
@@ -10,4 +10,6 @@ tomli==2.0.1
 typing_extensions==4.12.2
 wrapt==1.16.0
 zipp==3.19.2
+opentelemetry-sdk==1.12  # when updating, also update in pyproject.toml
+
 -e sdk-extension/opentelemetry-sdk-extension-aws
diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements-1.txt b/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements-1.txt
@@ -0,0 +1,15 @@
+asgiref==3.8.1
+Deprecated==1.2.14
+iniconfig==2.0.0
+packaging==24.0
+pluggy==1.5.0
+py-cpuinfo==9.0.0
+pytest==7.4.4
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.12.2
+wrapt==1.16.0
+zipp==3.19.2
+# test with the latest version of opentelemetry-api, sdk, and semantic conventions
+
+-e sdk-extension/opentelemetry-sdk-extension-aws
diff --git a/tox.ini b/tox.ini
@@ -7,8 +7,8 @@ envlist =
     ; for specifying supported Python versions per package.
 
     ; instrumentation-openai
-    py3{8,9,10,11,12}-test-instrumentation-openai-v2
-    pypy3-test-instrumentation-openai-v2
+    py3{8,9,10,11,12}-test-instrumentation-openai-v2-{0,1}
+    pypy3-test-instrumentation-openai-v2-{0,1}
     lint-instrumentation-openai-v2
 
     ; opentelemetry-resource-detector-container
@@ -17,13 +17,13 @@ envlist =
     lint-resource-detector-container
 
     ; opentelemetry-resource-detector-azure
-    py3{8,9,10,11,12}-test-resource-detector-azure
-    pypy3-test-resource-detector-azure
+    py3{8,9,10,11,12}-test-resource-detector-azure-{0,1}
+    pypy3-test-resource-detector-azure-{0,1}
     lint-resource-detector-azure
 
     ; opentelemetry-sdk-extension-aws
-    py3{8,9,10,11,12}-test-sdk-extension-aws
-    pypy3-test-sdk-extension-aws
+    py3{8,9,10,11,12}-test-sdk-extension-aws-{0,1}
+    pypy3-test-sdk-extension-aws-{0,1}
     lint-sdk-extension-aws
     benchmark-sdk-extension-aws
 
@@ -317,8 +317,8 @@ envlist =
     lint-util-http
 
     ; opentelemetry-propagator-aws-xray
-    py3{8,9,10,11,12}-test-propagator-aws-xray
-    pypy3-test-propagator-aws-xray
+    py3{8,9,10,11,12}-test-propagator-aws-xray-{0,1}
+    pypy3-test-propagator-aws-xray-{0,1}
     lint-propagator-aws-xray
     benchmark-propagator-aws-xray
 
@@ -410,11 +410,16 @@ commands_pre =
   opentelemetry-instrumentation: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   opentelemetry-instrumentation: pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
 
-  openai: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  openai: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  openai: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  openai: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  openai: pip install -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements.txt
+  # 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: pip install -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
+  # and the latest version of OTel API and SDK
+  openai-1: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  openai-1: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  openai-1: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  openai-1: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  openai-1: pip install -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-1.txt
+  lint-instrumentation-openai-v2: pip install -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
 
   distro: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
   distro: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
@@ -468,11 +473,6 @@ commands_pre =
   kafka-pythonng: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
   kafka-pythonng: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements-ng.txt
 
-  openai: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  openai: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  openai: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  openai: pip install -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements.txt
-
   confluent-kafka: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
   confluent-kafka: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
   confluent-kafka: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
@@ -771,11 +771,16 @@ commands_pre =
   httpx-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
   lint-instrumentation-httpx: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
 
-  sdk-extension-aws: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  sdk-extension-aws: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  sdk-extension-aws: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  sdk-extension-aws: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
+  # 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
+  sdk-extension-aws-0: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements-0.txt
+  # and the latest version of OTel API and SDK
+  sdk-extension-aws-1: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  sdk-extension-aws-1: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  sdk-extension-aws-1: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  sdk-extension-aws-1: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  sdk-extension-aws-1: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements-1.txt
+  lint-sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements-0.txt
   benchmark-sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/benchmark-requirements.txt
 
   resource-detector-container: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
@@ -784,23 +789,33 @@ commands_pre =
   resource-detector-container: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
 
-  resource-detector-azure: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  resource-detector-azure: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  resource-detector-azure: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  resource-detector-azure: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  resource-detector-azure: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-azure/test-requirements.txt
+  # 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
+  resource-detector-azure-0: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-azure/test-requirements-0.txt
+  # and the latest version of OTel API and SDK
+  resource-detector-azure-1: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  resource-detector-azure-1: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  resource-detector-azure-1: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  resource-detector-azure-1: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  resource-detector-azure-1: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-azure/test-requirements-1.txt
+  lint-resource-detector-azure: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-azure/test-requirements-0.txt
 
   propagator-ot-trace: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
   propagator-ot-trace: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
   propagator-ot-trace: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
   propagator-ot-trace: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   propagator-ot-trace: pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
 
-  propagator-aws-xray: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  propagator-aws-xray: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  propagator-aws-xray: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  propagator-aws-xray: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
+  # 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
+  propagator-aws-xray-0: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements-0.txt
+  # and the latest version of OTel API and SDK
+  propagator-aws-xray-1: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  propagator-aws-xray-1: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  propagator-aws-xray-1: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  propagator-aws-xray-1: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  propagator-aws-xray-1: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements-1.txt
+  lint-propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements-0.txt
   benchmark-propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/benchmark-requirements.txt
 
   processor-baggage: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api