Skip to content

Commit 61db4ec

Browse files
xrmxxrmx
authored
Merge branch 'main' into 3486-tornado-server-duration2
2 parents 97b99a3 + c6b14fc commit 61db4ec

File tree

42 files changed

+3250
-2630
lines changed

Some content is hidden

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

42 files changed

+3250
-2630
lines changed

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,6 +2453,36 @@ jobs:
24532453
- name: Run tests
24542454
run: tox -e py39-test-util-http -- -ra
24552455

2456+
py39-test-util-genai:
2457+
name: util-genai
2458+
runs-on: ubuntu-latest
2459+
timeout-minutes: 30
2460+
steps:
2461+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
2462+
uses: actions/checkout@v4
2463+
with:
2464+
repository: open-telemetry/opentelemetry-python-contrib
2465+
ref: ${{ env.CONTRIB_REPO_SHA }}
2466+
2467+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
2468+
uses: actions/checkout@v4
2469+
with:
2470+
repository: open-telemetry/opentelemetry-python
2471+
ref: ${{ env.CORE_REPO_SHA }}
2472+
path: opentelemetry-python
2473+
2474+
- name: Set up Python 3.9
2475+
uses: actions/setup-python@v5
2476+
with:
2477+
python-version: "3.9"
2478+
architecture: "x64"
2479+
2480+
- name: Install tox
2481+
run: pip install tox-uv
2482+
2483+
- name: Run tests
2484+
run: tox -e py39-test-util-genai -- -ra
2485+
24562486
py39-test-propagator-aws-xray-0:
24572487
name: propagator-aws-xray-0
24582488
runs-on: ubuntu-latest

‎.github/workflows/lint_0.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,25 @@ jobs:
10761076
- name: Run tests
10771077
run: tox -e lint-util-http
10781078

1079+
lint-util-genai:
1080+
name: util-genai
1081+
runs-on: ubuntu-latest
1082+
timeout-minutes: 30
1083+
steps:
1084+
- name: Checkout repo @ SHA - ${{ github.sha }}
1085+
uses: actions/checkout@v4
1086+
1087+
- name: Set up Python 3.13
1088+
uses: actions/setup-python@v5
1089+
with:
1090+
python-version: "3.13"
1091+
1092+
- name: Install tox
1093+
run: pip install tox-uv
1094+
1095+
- name: Run tests
1096+
run: tox -e lint-util-genai
1097+
10791098
lint-propagator-aws-xray:
10801099
name: propagator-aws-xray
10811100
runs-on: ubuntu-latest

‎.github/workflows/test_1.yml‎

Lines changed: 114 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -3964,6 +3964,120 @@ jobs:
39643964
- name: Run tests
39653965
run: tox -e pypy3-test-util-http -- -ra
39663966

3967+
py39-test-util-genai_ubuntu-latest:
3968+
name: util-genai 3.9 Ubuntu
3969+
runs-on: ubuntu-latest
3970+
timeout-minutes: 30
3971+
steps:
3972+
- name: Checkout repo @ SHA - ${{ github.sha }}
3973+
uses: actions/checkout@v4
3974+
3975+
- name: Set up Python 3.9
3976+
uses: actions/setup-python@v5
3977+
with:
3978+
python-version: "3.9"
3979+
3980+
- name: Install tox
3981+
run: pip install tox-uv
3982+
3983+
- name: Run tests
3984+
run: tox -e py39-test-util-genai -- -ra
3985+
3986+
py310-test-util-genai_ubuntu-latest:
3987+
name: util-genai 3.10 Ubuntu
3988+
runs-on: ubuntu-latest
3989+
timeout-minutes: 30
3990+
steps:
3991+
- name: Checkout repo @ SHA - ${{ github.sha }}
3992+
uses: actions/checkout@v4
3993+
3994+
- name: Set up Python 3.10
3995+
uses: actions/setup-python@v5
3996+
with:
3997+
python-version: "3.10"
3998+
3999+
- name: Install tox
4000+
run: pip install tox-uv
4001+
4002+
- name: Run tests
4003+
run: tox -e py310-test-util-genai -- -ra
4004+
4005+
py311-test-util-genai_ubuntu-latest:
4006+
name: util-genai 3.11 Ubuntu
4007+
runs-on: ubuntu-latest
4008+
timeout-minutes: 30
4009+
steps:
4010+
- name: Checkout repo @ SHA - ${{ github.sha }}
4011+
uses: actions/checkout@v4
4012+
4013+
- name: Set up Python 3.11
4014+
uses: actions/setup-python@v5
4015+
with:
4016+
python-version: "3.11"
4017+
4018+
- name: Install tox
4019+
run: pip install tox-uv
4020+
4021+
- name: Run tests
4022+
run: tox -e py311-test-util-genai -- -ra
4023+
4024+
py312-test-util-genai_ubuntu-latest:
4025+
name: util-genai 3.12 Ubuntu
4026+
runs-on: ubuntu-latest
4027+
timeout-minutes: 30
4028+
steps:
4029+
- name: Checkout repo @ SHA - ${{ github.sha }}
4030+
uses: actions/checkout@v4
4031+
4032+
- name: Set up Python 3.12
4033+
uses: actions/setup-python@v5
4034+
with:
4035+
python-version: "3.12"
4036+
4037+
- name: Install tox
4038+
run: pip install tox-uv
4039+
4040+
- name: Run tests
4041+
run: tox -e py312-test-util-genai -- -ra
4042+
4043+
py313-test-util-genai_ubuntu-latest:
4044+
name: util-genai 3.13 Ubuntu
4045+
runs-on: ubuntu-latest
4046+
timeout-minutes: 30
4047+
steps:
4048+
- name: Checkout repo @ SHA - ${{ github.sha }}
4049+
uses: actions/checkout@v4
4050+
4051+
- name: Set up Python 3.13
4052+
uses: actions/setup-python@v5
4053+
with:
4054+
python-version: "3.13"
4055+
4056+
- name: Install tox
4057+
run: pip install tox-uv
4058+
4059+
- name: Run tests
4060+
run: tox -e py313-test-util-genai -- -ra
4061+
4062+
pypy3-test-util-genai_ubuntu-latest:
4063+
name: util-genai pypy-3.9 Ubuntu
4064+
runs-on: ubuntu-latest
4065+
timeout-minutes: 30
4066+
steps:
4067+
- name: Checkout repo @ SHA - ${{ github.sha }}
4068+
uses: actions/checkout@v4
4069+
4070+
- name: Set up Python pypy-3.9
4071+
uses: actions/setup-python@v5
4072+
with:
4073+
python-version: "pypy-3.9"
4074+
4075+
- name: Install tox
4076+
run: pip install tox-uv
4077+
4078+
- name: Run tests
4079+
run: tox -e pypy3-test-util-genai -- -ra
4080+
39674081
py39-test-propagator-aws-xray-0_ubuntu-latest:
39684082
name: propagator-aws-xray-0 3.9 Ubuntu
39694083
runs-on: ubuntu-latest
@@ -4666,117 +4780,3 @@ jobs:
46664780

46674781
- name: Run tests
46684782
run: tox -e py310-test-instrumentation-aio-pika-2 -- -ra
4669-
4670-
py310-test-instrumentation-aio-pika-3_ubuntu-latest:
4671-
name: instrumentation-aio-pika-3 3.10 Ubuntu
4672-
runs-on: ubuntu-latest
4673-
timeout-minutes: 30
4674-
steps:
4675-
- name: Checkout repo @ SHA - ${{ github.sha }}
4676-
uses: actions/checkout@v4
4677-
4678-
- name: Set up Python 3.10
4679-
uses: actions/setup-python@v5
4680-
with:
4681-
python-version: "3.10"
4682-
4683-
- name: Install tox
4684-
run: pip install tox-uv
4685-
4686-
- name: Run tests
4687-
run: tox -e py310-test-instrumentation-aio-pika-3 -- -ra
4688-
4689-
py311-test-instrumentation-aio-pika-0_ubuntu-latest:
4690-
name: instrumentation-aio-pika-0 3.11 Ubuntu
4691-
runs-on: ubuntu-latest
4692-
timeout-minutes: 30
4693-
steps:
4694-
- name: Checkout repo @ SHA - ${{ github.sha }}
4695-
uses: actions/checkout@v4
4696-
4697-
- name: Set up Python 3.11
4698-
uses: actions/setup-python@v5
4699-
with:
4700-
python-version: "3.11"
4701-
4702-
- name: Install tox
4703-
run: pip install tox-uv
4704-
4705-
- name: Run tests
4706-
run: tox -e py311-test-instrumentation-aio-pika-0 -- -ra
4707-
4708-
py311-test-instrumentation-aio-pika-1_ubuntu-latest:
4709-
name: instrumentation-aio-pika-1 3.11 Ubuntu
4710-
runs-on: ubuntu-latest
4711-
timeout-minutes: 30
4712-
steps:
4713-
- name: Checkout repo @ SHA - ${{ github.sha }}
4714-
uses: actions/checkout@v4
4715-
4716-
- name: Set up Python 3.11
4717-
uses: actions/setup-python@v5
4718-
with:
4719-
python-version: "3.11"
4720-
4721-
- name: Install tox
4722-
run: pip install tox-uv
4723-
4724-
- name: Run tests
4725-
run: tox -e py311-test-instrumentation-aio-pika-1 -- -ra
4726-
4727-
py311-test-instrumentation-aio-pika-2_ubuntu-latest:
4728-
name: instrumentation-aio-pika-2 3.11 Ubuntu
4729-
runs-on: ubuntu-latest
4730-
timeout-minutes: 30
4731-
steps:
4732-
- name: Checkout repo @ SHA - ${{ github.sha }}
4733-
uses: actions/checkout@v4
4734-
4735-
- name: Set up Python 3.11
4736-
uses: actions/setup-python@v5
4737-
with:
4738-
python-version: "3.11"
4739-
4740-
- name: Install tox
4741-
run: pip install tox-uv
4742-
4743-
- name: Run tests
4744-
run: tox -e py311-test-instrumentation-aio-pika-2 -- -ra
4745-
4746-
py311-test-instrumentation-aio-pika-3_ubuntu-latest:
4747-
name: instrumentation-aio-pika-3 3.11 Ubuntu
4748-
runs-on: ubuntu-latest
4749-
timeout-minutes: 30
4750-
steps:
4751-
- name: Checkout repo @ SHA - ${{ github.sha }}
4752-
uses: actions/checkout@v4
4753-
4754-
- name: Set up Python 3.11
4755-
uses: actions/setup-python@v5
4756-
with:
4757-
python-version: "3.11"
4758-
4759-
- name: Install tox
4760-
run: pip install tox-uv
4761-
4762-
- name: Run tests
4763-
run: tox -e py311-test-instrumentation-aio-pika-3 -- -ra
4764-
4765-
py312-test-instrumentation-aio-pika-0_ubuntu-latest:
4766-
name: instrumentation-aio-pika-0 3.12 Ubuntu
4767-
runs-on: ubuntu-latest
4768-
timeout-minutes: 30
4769-
steps:
4770-
- name: Checkout repo @ SHA - ${{ github.sha }}
4771-
uses: actions/checkout@v4
4772-
4773-
- name: Set up Python 3.12
4774-
uses: actions/setup-python@v5
4775-
with:
4776-
python-version: "3.12"
4777-
4778-
- name: Install tox
4779-
run: pip install tox-uv
4780-
4781-
- name: Run tests
4782-
run: tox -e py312-test-instrumentation-aio-pika-0 -- -ra

0 commit comments

Comments
 (0)