add tests to CI

Signed-off-by: emdneto <[email protected]>
tammy-baylis-swi · Nov 7, 2024 · ada27a5 · ada27a5
1 parent fdada04
commit ada27a5
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 2 deletions.
diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
@@ -1492,6 +1492,24 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra
 
+  py38-test-instrumentation-sqlalchemy-2_ubuntu-latest:
+    name: instrumentation-sqlalchemy-2 3.8 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+
+      - name: Install tox
+        run: pip install tox
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-sqlalchemy-2 -- -ra
+
   py39-test-instrumentation-sqlalchemy-1_ubuntu-latest:
     name: instrumentation-sqlalchemy-1 3.9 Ubuntu
     runs-on: ubuntu-latest
@@ -1510,6 +1528,24 @@ jobs:
       - name: Run tests
         run: tox -e py39-test-instrumentation-sqlalchemy-1 -- -ra
 
+  py39-test-instrumentation-sqlalchemy-2_ubuntu-latest:
+    name: instrumentation-sqlalchemy-2 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    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
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-sqlalchemy-2 -- -ra
+
   py310-test-instrumentation-sqlalchemy-1_ubuntu-latest:
     name: instrumentation-sqlalchemy-1 3.10 Ubuntu
     runs-on: ubuntu-latest
@@ -1528,6 +1564,24 @@ jobs:
       - name: Run tests
         run: tox -e py310-test-instrumentation-sqlalchemy-1 -- -ra
 
+  py310-test-instrumentation-sqlalchemy-2_ubuntu-latest:
+    name: instrumentation-sqlalchemy-2 3.10 Ubuntu
+    runs-on: ubuntu-latest
+    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
+
+      - name: Run tests
+        run: tox -e py310-test-instrumentation-sqlalchemy-2 -- -ra
+
   py311-test-instrumentation-sqlalchemy-1_ubuntu-latest:
     name: instrumentation-sqlalchemy-1 3.11 Ubuntu
     runs-on: ubuntu-latest
@@ -1546,6 +1600,24 @@ jobs:
       - name: Run tests
         run: tox -e py311-test-instrumentation-sqlalchemy-1 -- -ra
 
+  py311-test-instrumentation-sqlalchemy-2_ubuntu-latest:
+    name: instrumentation-sqlalchemy-2 3.11 Ubuntu
+    runs-on: ubuntu-latest
+    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
+
+      - name: Run tests
+        run: tox -e py311-test-instrumentation-sqlalchemy-2 -- -ra
+
   py312-test-instrumentation-sqlalchemy-1_ubuntu-latest:
     name: instrumentation-sqlalchemy-1 3.12 Ubuntu
     runs-on: ubuntu-latest
@@ -1564,6 +1636,24 @@ jobs:
       - name: Run tests
         run: tox -e py312-test-instrumentation-sqlalchemy-1 -- -ra
 
+  py312-test-instrumentation-sqlalchemy-2_ubuntu-latest:
+    name: instrumentation-sqlalchemy-2 3.12 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install tox
+        run: pip install tox
+
+      - name: Run tests
+        run: tox -e py312-test-instrumentation-sqlalchemy-2 -- -ra
+
   pypy3-test-instrumentation-sqlalchemy-0_ubuntu-latest:
     name: instrumentation-sqlalchemy-0 pypy-3.8 Ubuntu
     runs-on: ubuntu-latest
@@ -1600,6 +1690,24 @@ jobs:
       - name: Run tests
         run: tox -e pypy3-test-instrumentation-sqlalchemy-1 -- -ra
 
+  pypy3-test-instrumentation-sqlalchemy-2_ubuntu-latest:
+    name: instrumentation-sqlalchemy-2 pypy-3.8 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python pypy-3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "pypy-3.8"
+
+      - name: Install tox
+        run: pip install tox
+
+      - name: Run tests
+        run: tox -e pypy3-test-instrumentation-sqlalchemy-2 -- -ra
+
   py38-test-instrumentation-redis_ubuntu-latest:
     name: instrumentation-redis 3.8 Ubuntu
     runs-on: ubuntu-latest

diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-2.txt
@@ -0,0 +1,13 @@
+aiosqlite==0.20.0
+asgiref==3.8.1
+Deprecated==1.2.14
+greenlet==3.1.1
+iniconfig==2.0.0
+packaging==24.1
+pluggy==1.5.0
+pytest==7.4.4
+SQLAlchemy==2.0.36
+typing_extensions==4.12.2
+wrapt==1.16.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-sqlalchemy
diff --git a/tox.ini b/tox.ini
@@ -263,8 +263,8 @@ envlist =
     ; below mean these dependencies are being used:
     ; 0: sqlalchemy>=1.1,<1.2
     ; 1: sqlalchemy~=1.4 aiosqlite
-    py3{8,9,10,11,12}-test-instrumentation-sqlalchemy-{1}
-    pypy3-test-instrumentation-sqlalchemy-{0,1}
+    py3{8,9,10,11,12}-test-instrumentation-sqlalchemy-{1,2}
+    pypy3-test-instrumentation-sqlalchemy-{0,1,2}
     lint-instrumentation-sqlalchemy
 
     ; opentelemetry-instrumentation-redis
@@ -746,6 +746,7 @@ commands_pre =
   sqlalchemy: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
   sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
+  sqlalchemy-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-2.txt
   lint-instrumentation-sqlalchemy: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
 
   elasticsearch: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api