Merge branch 'open-telemetry:main' into fix/1477

open-telemetry · Feb 2, 2025 · 5cb5d9d · 5cb5d9d
2 parents a367cd0 + 65a2713
commit 5cb5d9d
Show file tree

Hide file tree

Showing 80 changed files with 6,485 additions and 592 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
@@ -349,8 +349,8 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-aws-lambda -- -ra
 
-  py38-test-instrumentation-botocore:
-    name: instrumentation-botocore 
+  py38-test-instrumentation-botocore-0:
+    name: instrumentation-botocore-0 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -369,7 +369,29 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-botocore -- -ra
+        run: tox -e py38-test-instrumentation-botocore-0 -- -ra
+
+  py38-test-instrumentation-botocore-1:
+    name: instrumentation-botocore-1 
+    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-botocore-1 -- -ra
 
   py38-test-instrumentation-boto3sqs:
     name: instrumentation-boto3sqs 
@@ -1053,6 +1075,28 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-psycopg2 -- -ra
 
+  py38-test-instrumentation-psycopg2-binary:
+    name: instrumentation-psycopg2-binary 
+    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-psycopg2-binary -- -ra
+
   py38-test-instrumentation-psycopg:
     name: instrumentation-psycopg 
     runs-on: ubuntu-latest
@@ -1229,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