Skip to content

Commit 3aff468

Browse files
emdnetoemdneto
authored
Merge branch 'main' into kludex/fix-type-hints-on-opentelemetry-instrumentation
2 parents 75aa318 + 5488287 commit 3aff468

File tree

128 files changed

+5600
-2392
lines changed

Some content is hidden

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

128 files changed

+5600
-2392
lines changed

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,50 @@ jobs:
6363
- name: Run tests
6464
run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
6565

66+
py38-test-instrumentation-vertexai-0:
67+
name: instrumentation-vertexai-0
68+
runs-on: ubuntu-latest
69+
steps:
70+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
71+
uses: actions/checkout@v4
72+
with:
73+
repository: open-telemetry/opentelemetry-python-contrib
74+
ref: ${{ env.CONTRIB_REPO_SHA }}
75+
76+
- name: Set up Python 3.8
77+
uses: actions/setup-python@v5
78+
with:
79+
python-version: "3.8"
80+
architecture: "x64"
81+
82+
- name: Install tox
83+
run: pip install tox
84+
85+
- name: Run tests
86+
run: tox -e py38-test-instrumentation-vertexai-0 -- -ra
87+
88+
py38-test-instrumentation-vertexai-1:
89+
name: instrumentation-vertexai-1
90+
runs-on: ubuntu-latest
91+
steps:
92+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
93+
uses: actions/checkout@v4
94+
with:
95+
repository: open-telemetry/opentelemetry-python-contrib
96+
ref: ${{ env.CONTRIB_REPO_SHA }}
97+
98+
- name: Set up Python 3.8
99+
uses: actions/setup-python@v5
100+
with:
101+
python-version: "3.8"
102+
architecture: "x64"
103+
104+
- name: Install tox
105+
run: pip install tox
106+
107+
- name: Run tests
108+
run: tox -e py38-test-instrumentation-vertexai-1 -- -ra
109+
66110
py38-test-resource-detector-container:
67111
name: resource-detector-container
68112
runs-on: ubuntu-latest
@@ -613,6 +657,28 @@ jobs:
613657
- name: Run tests
614658
run: tox -e py38-test-instrumentation-falcon-2 -- -ra
615659

660+
py38-test-instrumentation-falcon-3:
661+
name: instrumentation-falcon-3
662+
runs-on: ubuntu-latest
663+
steps:
664+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
665+
uses: actions/checkout@v4
666+
with:
667+
repository: open-telemetry/opentelemetry-python-contrib
668+
ref: ${{ env.CONTRIB_REPO_SHA }}
669+
670+
- name: Set up Python 3.8
671+
uses: actions/setup-python@v5
672+
with:
673+
python-version: "3.8"
674+
architecture: "x64"
675+
676+
- name: Install tox
677+
run: pip install tox
678+
679+
- name: Run tests
680+
run: tox -e py38-test-instrumentation-falcon-3 -- -ra
681+
616682
py38-test-instrumentation-fastapi:
617683
name: instrumentation-fastapi
618684
runs-on: ubuntu-latest

‎.github/workflows/generate_workflows_lib/pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ classifiers = [
2222
"Programming Language :: Python :: 3.10",
2323
"Programming Language :: Python :: 3.11",
2424
"Programming Language :: Python :: 3.12",
25+
"Programming Language :: Python :: 3.13",
2526
"Typing :: Typed",
2627
]
2728
dependencies = ["Jinja2", "tox"]

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
5353
"py310": "3.10",
5454
"py311": "3.11",
5555
"py312": "3.12",
56+
"py313": "3.13",
5657
}
5758

5859
test_job_datas = []

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
2525
uses: actions/checkout@v4
2626

27-
- name: Set up Python 3.12
27+
- name: Set up Python 3.13
2828
uses: actions/setup-python@v5
2929
with:
30-
python-version: "3.12"
30+
python-version: "3.13"
3131

3232
- name: Install tox
3333
run: pip install tox

0 commit comments

Comments
 (0)