Merge branch 'main' into kludex/types-urllib

open-telemetry · Jan 2, 2025 · 3a39918 · 3a39918
2 parents 585a254 + 3d5935f
commit 3a39918
Show file tree

Hide file tree

Showing 135 changed files with 5,640 additions and 2,414 deletions.
diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml
@@ -63,6 +63,50 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
 
+  py38-test-instrumentation-vertexai-0:
+    name: instrumentation-vertexai-0 
+    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
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-vertexai-0 -- -ra
+
+  py38-test-instrumentation-vertexai-1:
+    name: instrumentation-vertexai-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
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-vertexai-1 -- -ra
+
   py38-test-resource-detector-container:
     name: resource-detector-container 
     runs-on: ubuntu-latest
@@ -613,6 +657,28 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-falcon-2 -- -ra
 
+  py38-test-instrumentation-falcon-3:
+    name: instrumentation-falcon-3 
+    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
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-falcon-3 -- -ra
+
   py38-test-instrumentation-fastapi:
     name: instrumentation-fastapi 
     runs-on: ubuntu-latest

diff --git a/.github/workflows/generate_workflows_lib/pyproject.toml b/.github/workflows/generate_workflows_lib/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Typing :: Typed",
 ]
 dependencies = ["Jinja2", "tox"]

diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py
@@ -53,6 +53,7 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
         "py310": "3.10",
         "py311": "3.11",
         "py312": "3.12",
+        "py313": "3.13",
     }
 
     test_job_datas = []

diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2
@@ -24,10 +24,10 @@ jobs:
       - name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.12
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
 
       - name: Install tox
         run: pip install tox