Merge branch 'main' into openai-v2-hook-and-fixes

Author: lmolkova

.github/workflows/core_contrib_test_0.yml

@@ -957,36 +957,6 @@ jobs:
       - name: Run tests
         run: tox -e py39-test-instrumentation-dbapi-wrapt2 -- -ra
 
-  py39-test-instrumentation-boto:
-    name: instrumentation-boto 
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
-        uses: actions/checkout@v4
-        with:
-          repository: open-telemetry/opentelemetry-python-contrib
-          ref: ${{ env.CONTRIB_REPO_SHA }}
-
-      - name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
-        uses: actions/checkout@v4
-        with:
-          repository: open-telemetry/opentelemetry-python
-          ref: ${{ env.CORE_REPO_SHA }}
-          path: opentelemetry-python
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-          architecture: "x64"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-boto -- -ra
-
   py39-test-instrumentation-asyncclick:
     name: instrumentation-asyncclick 
     runs-on: ubuntu-latest

.github/workflows/generate_required_checks.py

@@ -0,0 +1,42 @@
+"""
+This script builds a text file with the list of required checks based on
+the tox environments. Similarly to the system we are using to build the
+github workflows.
+The output is in the format than can be cut-and-pasted into the python-contrib
+terraform configuration in the admin repository.
+"""
+
+from pathlib import Path
+
+from generate_workflows_lib import (
+    get_lint_job_datas,
+    get_misc_job_datas,
+    get_test_job_datas,
+    get_tox_envs,
+)
+
+tox_ini_path = Path(__file__).parent.parent.parent.joinpath("tox.ini")
+
+
+def get_gh_contexts_from_jobs(job_datas):
+    def get_job_name(job):
+        if isinstance(job, str):
+            return job
+        return job["ui_name"]
+
+    return [
+        f"""      {{ context = "{get_job_name(job)}" }},\n"""
+        for job in job_datas
+    ]
+
+
+jobs = sorted(
+    get_gh_contexts_from_jobs(get_lint_job_datas(get_tox_envs(tox_ini_path)))
+    + get_gh_contexts_from_jobs(
+        get_test_job_datas(get_tox_envs(tox_ini_path), ["ubuntu-latest"])
+    )
+    + get_gh_contexts_from_jobs(get_misc_job_datas(get_tox_envs(tox_ini_path)))
+)
+with open("opentelemetry-admin-jobs.txt", "w") as f:
+    for job in jobs:
+        f.write(job)

.github/workflows/lint_0.yml

@@ -393,25 +393,6 @@ jobs:
       - name: Run tests
         run: tox -e lint-instrumentation-dbapi
 
-  lint-instrumentation-boto:
-    name: instrumentation-boto
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.14
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.14"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e lint-instrumentation-boto
-
   lint-instrumentation-asyncclick:
     name: instrumentation-asyncclick
     runs-on: ubuntu-latest

.github/workflows/test_0.yml

@@ -4079,63 +4079,6 @@ jobs:
       - name: Run tests
         run: tox -e pypy3-test-instrumentation-dbapi-wrapt2 -- -ra
 
-  py39-test-instrumentation-boto_ubuntu-latest:
-    name: instrumentation-boto 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-boto -- -ra
-
-  py310-test-instrumentation-boto_ubuntu-latest:
-    name: instrumentation-boto 3.10 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py310-test-instrumentation-boto -- -ra
-
-  py311-test-instrumentation-boto_ubuntu-latest:
-    name: instrumentation-boto 3.11 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py311-test-instrumentation-boto -- -ra
-
   py39-test-instrumentation-asyncclick_ubuntu-latest:
     name: instrumentation-asyncclick 3.9 Ubuntu
     runs-on: ubuntu-latest
@@ -4781,3 +4724,60 @@ jobs:
 
       - name: Run tests
         run: tox -e pypy3-test-instrumentation-elasticsearch-1 -- -ra
+
+  pypy3-test-instrumentation-elasticsearch-2_ubuntu-latest:
+    name: instrumentation-elasticsearch-2 pypy-3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python pypy-3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "pypy-3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e pypy3-test-instrumentation-elasticsearch-2 -- -ra
+
+  py39-test-instrumentation-falcon-0_ubuntu-latest:
+    name: instrumentation-falcon-0 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-falcon-0 -- -ra
+
+  py39-test-instrumentation-falcon-1_ubuntu-latest:
+    name: instrumentation-falcon-1 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-falcon-1 -- -ra

.github/workflows/test_1.yml

@@ -32,63 +32,6 @@ env:
 
 jobs:
 
-  pypy3-test-instrumentation-elasticsearch-2_ubuntu-latest:
-    name: instrumentation-elasticsearch-2 pypy-3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python pypy-3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "pypy-3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e pypy3-test-instrumentation-elasticsearch-2 -- -ra
-
-  py39-test-instrumentation-falcon-0_ubuntu-latest:
-    name: instrumentation-falcon-0 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-falcon-0 -- -ra
-
-  py39-test-instrumentation-falcon-1_ubuntu-latest:
-    name: instrumentation-falcon-1 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-falcon-1 -- -ra
-
   py39-test-instrumentation-falcon-2_ubuntu-latest:
     name: instrumentation-falcon-2 3.9 Ubuntu
     runs-on: ubuntu-latest
@@ -4781,3 +4724,60 @@ jobs:
 
       - name: Run tests
         run: tox -e py313-test-instrumentation-sqlite3 -- -ra
+
+  py314-test-instrumentation-sqlite3_ubuntu-latest:
+    name: instrumentation-sqlite3 3.14 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py314-test-instrumentation-sqlite3 -- -ra
+
+  pypy3-test-instrumentation-sqlite3_ubuntu-latest:
+    name: instrumentation-sqlite3 pypy-3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python pypy-3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "pypy-3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e pypy3-test-instrumentation-sqlite3 -- -ra
+
+  py39-test-instrumentation-wsgi_ubuntu-latest:
+    name: instrumentation-wsgi 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-wsgi -- -ra