Merge branch 'main' into vertex-1-serverattr

open-telemetry · Jan 28, 2025 · 3a8db5d · 3a8db5d
2 parents 152fb20 + dd68241
commit 3a8db5d
Show file tree

Hide file tree

Showing 38 changed files with 2,199 additions and 169 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -61,6 +61,9 @@ components:
   instrumentation/opentelemetry-instrumentation-psycopg:
     - federicobond
 
+  instrumentation/opentelemetry-instrumentation-pymssql:
+    - guillaumep
+
   instrumentation/opentelemetry-instrumentation-aiokafka:
     - dimastbk
 

diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml
@@ -1273,6 +1273,28 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-pymysql -- -ra
 
+  py38-test-instrumentation-pymssql:
+    name: instrumentation-pymssql 
+    runs-on: ubuntu-latest
+    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: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+          architecture: "x64"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-pymssql -- -ra
+
   py38-test-instrumentation-pyramid:
     name: instrumentation-pyramid 
     runs-on: ubuntu-latest

diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml
@@ -664,6 +664,24 @@ jobs:
       - name: Run tests
         run: tox -e lint-instrumentation-pymysql
 
+  lint-instrumentation-pymssql:
+    name: instrumentation-pymssql
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e lint-instrumentation-pymssql
+
   lint-instrumentation-pyramid:
     name: instrumentation-pyramid
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
@@ -2338,6 +2338,114 @@ jobs:
       - name: Run tests
         run: tox -e pypy3-test-instrumentation-pymysql -- -ra
 
+  py38-test-instrumentation-pymssql_ubuntu-latest:
+    name: instrumentation-pymssql 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-uv
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-pymssql -- -ra
+
+  py39-test-instrumentation-pymssql_ubuntu-latest:
+    name: instrumentation-pymssql 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-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-pymssql -- -ra
+
+  py310-test-instrumentation-pymssql_ubuntu-latest:
+    name: instrumentation-pymssql 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-uv
+
+      - name: Run tests
+        run: tox -e py310-test-instrumentation-pymssql -- -ra
+
+  py311-test-instrumentation-pymssql_ubuntu-latest:
+    name: instrumentation-pymssql 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-uv
+
+      - name: Run tests
+        run: tox -e py311-test-instrumentation-pymssql -- -ra
+
+  py312-test-instrumentation-pymssql_ubuntu-latest:
+    name: instrumentation-pymssql 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-uv
+
+      - name: Run tests
+        run: tox -e py312-test-instrumentation-pymssql -- -ra
+
+  py313-test-instrumentation-pymssql_ubuntu-latest:
+    name: instrumentation-pymssql 3.13 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py313-test-instrumentation-pymssql -- -ra
+
   py38-test-instrumentation-pyramid_ubuntu-latest:
     name: instrumentation-pyramid 3.8 Ubuntu
     runs-on: ubuntu-latest
@@ -4407,111 +4515,3 @@ jobs:
 
       - name: Run tests
         run: tox -e py311-test-instrumentation-httpx-1 -- -ra
-
-  py312-test-instrumentation-httpx-0_ubuntu-latest:
-    name: instrumentation-httpx-0 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-uv
-
-      - name: Run tests
-        run: tox -e py312-test-instrumentation-httpx-0 -- -ra
-
-  py312-test-instrumentation-httpx-1_ubuntu-latest:
-    name: instrumentation-httpx-1 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-uv
-
-      - name: Run tests
-        run: tox -e py312-test-instrumentation-httpx-1 -- -ra
-
-  py313-test-instrumentation-httpx-1_ubuntu-latest:
-    name: instrumentation-httpx-1 3.13 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py313-test-instrumentation-httpx-1 -- -ra
-
-  pypy3-test-instrumentation-httpx-0_ubuntu-latest:
-    name: instrumentation-httpx-0 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-uv
-
-      - name: Run tests
-        run: tox -e pypy3-test-instrumentation-httpx-0 -- -ra
-
-  pypy3-test-instrumentation-httpx-1_ubuntu-latest:
-    name: instrumentation-httpx-1 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-uv
-
-      - name: Run tests
-        run: tox -e pypy3-test-instrumentation-httpx-1 -- -ra
-
-  py38-test-util-http_ubuntu-latest:
-    name: util-http 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-uv
-
-      - name: Run tests
-        run: tox -e py38-test-util-http -- -ra