use otel-sdk instead

Author: sentrivana

scripts/populate_tox/README.md

@@ -158,21 +158,6 @@ be expressed like so:
 }
 ```
 
-### `prereleases`
-
-By default, we ignore all prereleases but the newest one. Some packages only have
-prereleases though. When `prereleases` is set to `True`, we will consider
-prereleases just like we do normal releases and they will not be filtered out.
-
-```python
-"common": {
-    # opentelemetry-distro is only available in beta
-    "package": "opentelemetry-distro",
-    "prereleases": True,
-    ...
-}
-```
-
 ### `test_on_all_python_versions`
 
 By default, the script will cherry-pick a few Python versions to test each

scripts/populate_tox/config.py

@@ -30,8 +30,7 @@
         "package": "clickhouse-driver",
     },
     "common": {
-        "package": "opentelemetry-distro",
-        "prereleases": True,
+        "package": "opentelemetry-sdk",
         "test_on_all_python_versions": True,
         "deps": {
             "*": ["pytest", "pytest-asyncio"],

scripts/populate_tox/populate_tox.py

@@ -146,11 +146,7 @@ def _prefilter_releases(
 
     include_versions = None
     if TEST_SUITE_CONFIG[integration].get("include") is not None:
-        include_versions = SpecifierSet(
-            TEST_SUITE_CONFIG[integration]["include"], prereleases=True
-        )
-
-    accept_prereleases = TEST_SUITE_CONFIG[integration].get("prereleases") or False
+        include_versions = SpecifierSet(TEST_SUITE_CONFIG[integration]["include"])
 
     filtered_releases = []
     last_prerelease = None
@@ -183,7 +179,7 @@ def _prefilter_releases(
         if include_versions is not None and version not in include_versions:
             continue
 
-        if not accept_prereleases and version.is_prerelease:
+        if version.is_prerelease:
             if last_prerelease is None or version > last_prerelease:
                 last_prerelease = version
             continue

setup.py

@@ -41,7 +41,7 @@ def get_file_text(file_name):
     install_requires=[
         "urllib3>=1.26.11",
         "certifi",
-        "opentelemetry-distro>=0.35b0",  # XXX check lower bound
+        "opentelemetry-sdk",
     ],
     extras_require={
         "aiohttp": ["aiohttp>=3.5"],

tox.ini

@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-04-17T09:53:39.706505+00:00
+# Last generated: 2025-04-17T11:27:24.266930+00:00
 
 [tox]
 requires =
@@ -138,10 +138,10 @@ envlist =
     # integration tests there.
 
     # ~~~ Common ~~~
-    {py3.7,py3.8}-common-v0.17b0
-    {py3.7,py3.8}-common-v0.28b1
-    {py3.7,py3.8}-common-v0.42b0
-    {py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-common-v0.53b1
+    {py3.7}-common-v0.1a0
+    {py3.7,py3.8,py3.9}-common-v0.17b0
+    {py3.7,py3.8,py3.9}-common-v1.0.0rc1
+    {py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-common-v1.32.1
 
 
     # ~~~ AI ~~~
@@ -493,10 +493,10 @@ deps =
     # integration tests there.
 
     # ~~~ Common ~~~
-    common-v0.17b0: opentelemetry-distro==0.17b0
-    common-v0.28b1: opentelemetry-distro==0.28b1
-    common-v0.42b0: opentelemetry-distro==0.42b0
-    common-v0.53b1: opentelemetry-distro==0.53b1
+    common-v0.1a0: opentelemetry-sdk==0.1a0
+    common-v0.17b0: opentelemetry-sdk==0.17b0
+    common-v1.0.0rc1: opentelemetry-sdk==1.0.0rc1
+    common-v1.32.1: opentelemetry-sdk==1.32.1
     common: pytest
     common: pytest-asyncio
     py3.7-common: pytest<7.0.0