Skip to content

Commit 7c2be23

Browse files
DylanRussellDylanRussell
committed
Merge branch 'main' into add_err_log
2 parents 50d964a + 4531513 commit 7c2be23

File tree

51 files changed

+3001
-453
lines changed

Some content is hidden

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

51 files changed

+3001
-453
lines changed

‎.github/component_owners.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
components:
22

3+
instrumentation/opentelemetry-instrumentation-aiohttp-client:
4+
- herin049
5+
36
instrumentation/opentelemetry-instrumentation-aiokafka:
47
- dimastbk
58

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,36 @@ jobs:
12231223
- name: Run tests
12241224
run: tox -e py39-test-instrumentation-flask-2 -- -ra
12251225

1226+
py39-test-instrumentation-flask-3:
1227+
name: instrumentation-flask-3
1228+
runs-on: ubuntu-latest
1229+
timeout-minutes: 30
1230+
steps:
1231+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1232+
uses: actions/checkout@v4
1233+
with:
1234+
repository: open-telemetry/opentelemetry-python-contrib
1235+
ref: ${{ env.CONTRIB_REPO_SHA }}
1236+
1237+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
1238+
uses: actions/checkout@v4
1239+
with:
1240+
repository: open-telemetry/opentelemetry-python
1241+
ref: ${{ env.CORE_REPO_SHA }}
1242+
path: opentelemetry-python
1243+
1244+
- name: Set up Python 3.9
1245+
uses: actions/setup-python@v5
1246+
with:
1247+
python-version: "3.9"
1248+
architecture: "x64"
1249+
1250+
- name: Install tox
1251+
run: pip install tox-uv
1252+
1253+
- name: Run tests
1254+
run: tox -e py39-test-instrumentation-flask-3 -- -ra
1255+
12261256
py39-test-instrumentation-urllib:
12271257
name: instrumentation-urllib
12281258
runs-on: ubuntu-latest

‎.github/workflows/test_0.yml‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -4079,6 +4079,25 @@ jobs:
40794079
- name: Run tests
40804080
run: tox -e py39-test-instrumentation-flask-2 -- -ra
40814081

4082+
py39-test-instrumentation-flask-3_ubuntu-latest:
4083+
name: instrumentation-flask-3 3.9 Ubuntu
4084+
runs-on: ubuntu-latest
4085+
timeout-minutes: 30
4086+
steps:
4087+
- name: Checkout repo @ SHA - ${{ github.sha }}
4088+
uses: actions/checkout@v4
4089+
4090+
- name: Set up Python 3.9
4091+
uses: actions/setup-python@v5
4092+
with:
4093+
python-version: "3.9"
4094+
4095+
- name: Install tox
4096+
run: pip install tox-uv
4097+
4098+
- name: Run tests
4099+
run: tox -e py39-test-instrumentation-flask-3 -- -ra
4100+
40824101
py310-test-instrumentation-flask-0_ubuntu-latest:
40834102
name: instrumentation-flask-0 3.10 Ubuntu
40844103
runs-on: ubuntu-latest
@@ -4136,6 +4155,25 @@ jobs:
41364155
- name: Run tests
41374156
run: tox -e py310-test-instrumentation-flask-2 -- -ra
41384157

4158+
py310-test-instrumentation-flask-3_ubuntu-latest:
4159+
name: instrumentation-flask-3 3.10 Ubuntu
4160+
runs-on: ubuntu-latest
4161+
timeout-minutes: 30
4162+
steps:
4163+
- name: Checkout repo @ SHA - ${{ github.sha }}
4164+
uses: actions/checkout@v4
4165+
4166+
- name: Set up Python 3.10
4167+
uses: actions/setup-python@v5
4168+
with:
4169+
python-version: "3.10"
4170+
4171+
- name: Install tox
4172+
run: pip install tox-uv
4173+
4174+
- name: Run tests
4175+
run: tox -e py310-test-instrumentation-flask-3 -- -ra
4176+
41394177
py311-test-instrumentation-flask-0_ubuntu-latest:
41404178
name: instrumentation-flask-0 3.11 Ubuntu
41414179
runs-on: ubuntu-latest
@@ -4193,6 +4231,25 @@ jobs:
41934231
- name: Run tests
41944232
run: tox -e py311-test-instrumentation-flask-2 -- -ra
41954233

4234+
py311-test-instrumentation-flask-3_ubuntu-latest:
4235+
name: instrumentation-flask-3 3.11 Ubuntu
4236+
runs-on: ubuntu-latest
4237+
timeout-minutes: 30
4238+
steps:
4239+
- name: Checkout repo @ SHA - ${{ github.sha }}
4240+
uses: actions/checkout@v4
4241+
4242+
- name: Set up Python 3.11
4243+
uses: actions/setup-python@v5
4244+
with:
4245+
python-version: "3.11"
4246+
4247+
- name: Install tox
4248+
run: pip install tox-uv
4249+
4250+
- name: Run tests
4251+
run: tox -e py311-test-instrumentation-flask-3 -- -ra
4252+
41964253
py312-test-instrumentation-flask-0_ubuntu-latest:
41974254
name: instrumentation-flask-0 3.12 Ubuntu
41984255
runs-on: ubuntu-latest
@@ -4250,6 +4307,25 @@ jobs:
42504307
- name: Run tests
42514308
run: tox -e py312-test-instrumentation-flask-2 -- -ra
42524309

4310+
py312-test-instrumentation-flask-3_ubuntu-latest:
4311+
name: instrumentation-flask-3 3.12 Ubuntu
4312+
runs-on: ubuntu-latest
4313+
timeout-minutes: 30
4314+
steps:
4315+
- name: Checkout repo @ SHA - ${{ github.sha }}
4316+
uses: actions/checkout@v4
4317+
4318+
- name: Set up Python 3.12
4319+
uses: actions/setup-python@v5
4320+
with:
4321+
python-version: "3.12"
4322+
4323+
- name: Install tox
4324+
run: pip install tox-uv
4325+
4326+
- name: Run tests
4327+
run: tox -e py312-test-instrumentation-flask-3 -- -ra
4328+
42534329
py313-test-instrumentation-flask-0_ubuntu-latest:
42544330
name: instrumentation-flask-0 3.13 Ubuntu
42554331
runs-on: ubuntu-latest
@@ -4307,6 +4383,25 @@ jobs:
43074383
- name: Run tests
43084384
run: tox -e py313-test-instrumentation-flask-2 -- -ra
43094385

4386+
py313-test-instrumentation-flask-3_ubuntu-latest:
4387+
name: instrumentation-flask-3 3.13 Ubuntu
4388+
runs-on: ubuntu-latest
4389+
timeout-minutes: 30
4390+
steps:
4391+
- name: Checkout repo @ SHA - ${{ github.sha }}
4392+
uses: actions/checkout@v4
4393+
4394+
- name: Set up Python 3.13
4395+
uses: actions/setup-python@v5
4396+
with:
4397+
python-version: "3.13"
4398+
4399+
- name: Install tox
4400+
run: pip install tox-uv
4401+
4402+
- name: Run tests
4403+
run: tox -e py313-test-instrumentation-flask-3 -- -ra
4404+
43104405
pypy3-test-instrumentation-flask-0_ubuntu-latest:
43114406
name: instrumentation-flask-0 pypy-3.9 Ubuntu
43124407
runs-on: ubuntu-latest
@@ -4686,98 +4781,3 @@ jobs:
46864781

46874782
- name: Run tests
46884783
run: tox -e pypy3-test-instrumentation-urllib3-1 -- -ra
4689-
4690-
py39-test-instrumentation-requests_ubuntu-latest:
4691-
name: instrumentation-requests 3.9 Ubuntu
4692-
runs-on: ubuntu-latest
4693-
timeout-minutes: 30
4694-
steps:
4695-
- name: Checkout repo @ SHA - ${{ github.sha }}
4696-
uses: actions/checkout@v4
4697-
4698-
- name: Set up Python 3.9
4699-
uses: actions/setup-python@v5
4700-
with:
4701-
python-version: "3.9"
4702-
4703-
- name: Install tox
4704-
run: pip install tox-uv
4705-
4706-
- name: Run tests
4707-
run: tox -e py39-test-instrumentation-requests -- -ra
4708-
4709-
py310-test-instrumentation-requests_ubuntu-latest:
4710-
name: instrumentation-requests 3.10 Ubuntu
4711-
runs-on: ubuntu-latest
4712-
timeout-minutes: 30
4713-
steps:
4714-
- name: Checkout repo @ SHA - ${{ github.sha }}
4715-
uses: actions/checkout@v4
4716-
4717-
- name: Set up Python 3.10
4718-
uses: actions/setup-python@v5
4719-
with:
4720-
python-version: "3.10"
4721-
4722-
- name: Install tox
4723-
run: pip install tox-uv
4724-
4725-
- name: Run tests
4726-
run: tox -e py310-test-instrumentation-requests -- -ra
4727-
4728-
py311-test-instrumentation-requests_ubuntu-latest:
4729-
name: instrumentation-requests 3.11 Ubuntu
4730-
runs-on: ubuntu-latest
4731-
timeout-minutes: 30
4732-
steps:
4733-
- name: Checkout repo @ SHA - ${{ github.sha }}
4734-
uses: actions/checkout@v4
4735-
4736-
- name: Set up Python 3.11
4737-
uses: actions/setup-python@v5
4738-
with:
4739-
python-version: "3.11"
4740-
4741-
- name: Install tox
4742-
run: pip install tox-uv
4743-
4744-
- name: Run tests
4745-
run: tox -e py311-test-instrumentation-requests -- -ra
4746-
4747-
py312-test-instrumentation-requests_ubuntu-latest:
4748-
name: instrumentation-requests 3.12 Ubuntu
4749-
runs-on: ubuntu-latest
4750-
timeout-minutes: 30
4751-
steps:
4752-
- name: Checkout repo @ SHA - ${{ github.sha }}
4753-
uses: actions/checkout@v4
4754-
4755-
- name: Set up Python 3.12
4756-
uses: actions/setup-python@v5
4757-
with:
4758-
python-version: "3.12"
4759-
4760-
- name: Install tox
4761-
run: pip install tox-uv
4762-
4763-
- name: Run tests
4764-
run: tox -e py312-test-instrumentation-requests -- -ra
4765-
4766-
py313-test-instrumentation-requests_ubuntu-latest:
4767-
name: instrumentation-requests 3.13 Ubuntu
4768-
runs-on: ubuntu-latest
4769-
timeout-minutes: 30
4770-
steps:
4771-
- name: Checkout repo @ SHA - ${{ github.sha }}
4772-
uses: actions/checkout@v4
4773-
4774-
- name: Set up Python 3.13
4775-
uses: actions/setup-python@v5
4776-
with:
4777-
python-version: "3.13"
4778-
4779-
- name: Install tox
4780-
run: pip install tox-uv
4781-
4782-
- name: Run tests
4783-
run: tox -e py313-test-instrumentation-requests -- -ra

0 commit comments

Comments
 (0)