Skip to content

Commit acce749

Browse files
authored
Merge branch 'main' into fix-3308
2 parents 7be5095 + db52193 commit acce749

File tree

72 files changed

+6266
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+6266
-729
lines changed

.github/workflows/core_contrib_test_0.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -877,8 +877,8 @@ jobs:
877877
- name: Run tests
878878
run: tox -e py38-test-instrumentation-requests -- -ra
879879

880-
py38-test-instrumentation-starlette:
881-
name: instrumentation-starlette
880+
py38-test-instrumentation-starlette-oldest:
881+
name: instrumentation-starlette-oldest
882882
runs-on: ubuntu-latest
883883
steps:
884884
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -897,7 +897,29 @@ jobs:
897897
run: pip install tox-uv
898898

899899
- name: Run tests
900-
run: tox -e py38-test-instrumentation-starlette -- -ra
900+
run: tox -e py38-test-instrumentation-starlette-oldest -- -ra
901+
902+
py38-test-instrumentation-starlette-latest:
903+
name: instrumentation-starlette-latest
904+
runs-on: ubuntu-latest
905+
steps:
906+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
907+
uses: actions/checkout@v4
908+
with:
909+
repository: open-telemetry/opentelemetry-python-contrib
910+
ref: ${{ env.CONTRIB_REPO_SHA }}
911+
912+
- name: Set up Python 3.8
913+
uses: actions/setup-python@v5
914+
with:
915+
python-version: "3.8"
916+
architecture: "x64"
917+
918+
- name: Install tox
919+
run: pip install tox-uv
920+
921+
- name: Run tests
922+
run: tox -e py38-test-instrumentation-starlette-latest -- -ra
901923

902924
py38-test-instrumentation-jinja2:
903925
name: instrumentation-jinja2

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516
run-name: "[Package][${{ inputs.package }}] Prepare patch release"

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516

.github/workflows/package-release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516
run-name: "[Package][${{ inputs.package }}] Release"

0 commit comments

Comments
 (0)