Merge branch 'main' into fix-asgi-middleware

Author: xrmx

.github/workflows/core_contrib_test_0.yml

@@ -19,8 +19,8 @@ env:
 
 jobs:
 
-  py38-test-instrumentation-openai-v2-0:
-    name: instrumentation-openai-v2-0 
+  py38-test-instrumentation-openai-v2-oldest:
+    name: instrumentation-openai-v2-oldest 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -39,10 +39,10 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra
+        run: tox -e py38-test-instrumentation-openai-v2-oldest -- -ra
 
-  py38-test-instrumentation-openai-v2-1:
-    name: instrumentation-openai-v2-1 
+  py38-test-instrumentation-openai-v2-latest:
+    name: instrumentation-openai-v2-latest 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -61,10 +61,10 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
+        run: tox -e py38-test-instrumentation-openai-v2-latest -- -ra
 
-  py38-test-instrumentation-vertexai-0:
-    name: instrumentation-vertexai-0 
+  py38-test-instrumentation-vertexai-oldest:
+    name: instrumentation-vertexai-oldest 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -83,10 +83,10 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-vertexai-0 -- -ra
+        run: tox -e py38-test-instrumentation-vertexai-oldest -- -ra
 
-  py38-test-instrumentation-vertexai-1:
-    name: instrumentation-vertexai-1 
+  py38-test-instrumentation-vertexai-latest:
+    name: instrumentation-vertexai-latest 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -105,7 +105,7 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-vertexai-1 -- -ra
+        run: tox -e py38-test-instrumentation-vertexai-latest -- -ra
 
   py38-test-resource-detector-container:
     name: resource-detector-container 
@@ -877,8 +877,8 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-requests -- -ra
 
-  py38-test-instrumentation-starlette:
-    name: instrumentation-starlette 
+  py38-test-instrumentation-starlette-oldest:
+    name: instrumentation-starlette-oldest 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -897,7 +897,29 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-starlette -- -ra
+        run: tox -e py38-test-instrumentation-starlette-oldest -- -ra
+
+  py38-test-instrumentation-starlette-latest:
+    name: instrumentation-starlette-latest 
+    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-starlette-latest -- -ra
 
   py38-test-instrumentation-jinja2:
     name: instrumentation-jinja2 

.github/workflows/fossa.yml

@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

.github/workflows/lint_0.yml

@@ -52,6 +52,24 @@ jobs:
       - name: Run tests
         run: tox -e lint-instrumentation-vertexai
 
+  lint-instrumentation-google-genai:
+    name: instrumentation-google-genai
+    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-google-genai
+
   lint-resource-detector-container:
     name: resource-detector-container
     runs-on: ubuntu-latest

.github/workflows/package-prepare-patch-release.yml

@@ -9,8 +9,12 @@ on:
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
         - opentelemetry-instrumentation-openai-v2
+        - opentelemetry-instrumentation-vertexai
+        - opentelemetry-instrumentation-google-genai
         description: 'Package to be released'
         required: true
+run-name: "[Package][${{ inputs.package }}] Prepare patch release"
+
 jobs:
   prepare-patch-release:
     runs-on: ubuntu-latest

.github/workflows/package-prepare-release.yml

@@ -9,9 +9,12 @@ on:
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
         - opentelemetry-instrumentation-openai-v2
+        - opentelemetry-instrumentation-vertexai
+        - opentelemetry-instrumentation-google-genai
         description: 'Package to be released'
         required: true
 
+run-name: "[Package][${{ inputs.package }}] Prepare release"
 jobs:
   prereqs:
     runs-on: ubuntu-latest

.github/workflows/package-release.yml

@@ -9,8 +9,11 @@ on:
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
         - opentelemetry-instrumentation-openai-v2
+        - opentelemetry-instrumentation-vertexai
+        - opentelemetry-instrumentation-google-genai
         description: 'Package to be released'
         required: true
+run-name: "[Package][${{ inputs.package }}] Release"
 jobs:
   release:
     runs-on: ubuntu-latest