Skip to content

Commit c238af5

Browse files
smokesmoke
authored
fix: fastapi auto-instrumentation by removing fastapi-slim support (open-telemetry#2783)
1 parent fc1c8f0 commit c238af5

File tree

10 files changed

+134
-304
lines changed

10 files changed

+134
-304
lines changed

‎.github/workflows/test_0.yml‎

Lines changed: 126 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -2194,8 +2194,8 @@ jobs:
21942194
- name: Run tests
21952195
run: tox -e pypy3-test-instrumentation-falcon-2 -- -ra
21962196

2197-
py38-test-instrumentation-fastapi-main_ubuntu-latest:
2198-
name: instrumentation-fastapi-main 3.8 Ubuntu
2197+
py38-test-instrumentation-fastapi_ubuntu-latest:
2198+
name: instrumentation-fastapi 3.8 Ubuntu
21992199
runs-on: ubuntu-latest
22002200
steps:
22012201
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -2210,28 +2210,10 @@ jobs:
22102210
run: pip install tox
22112211

22122212
- name: Run tests
2213-
run: tox -e py38-test-instrumentation-fastapi-main -- -ra
2213+
run: tox -e py38-test-instrumentation-fastapi -- -ra
22142214

2215-
py38-test-instrumentation-fastapi-slim_ubuntu-latest:
2216-
name: instrumentation-fastapi-slim 3.8 Ubuntu
2217-
runs-on: ubuntu-latest
2218-
steps:
2219-
- name: Checkout repo @ SHA - ${{ github.sha }}
2220-
uses: actions/checkout@v4
2221-
2222-
- name: Set up Python 3.8
2223-
uses: actions/setup-python@v5
2224-
with:
2225-
python-version: "3.8"
2226-
2227-
- name: Install tox
2228-
run: pip install tox
2229-
2230-
- name: Run tests
2231-
run: tox -e py38-test-instrumentation-fastapi-slim -- -ra
2232-
2233-
py39-test-instrumentation-fastapi-main_ubuntu-latest:
2234-
name: instrumentation-fastapi-main 3.9 Ubuntu
2215+
py39-test-instrumentation-fastapi_ubuntu-latest:
2216+
name: instrumentation-fastapi 3.9 Ubuntu
22352217
runs-on: ubuntu-latest
22362218
steps:
22372219
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -2246,46 +2228,10 @@ jobs:
22462228
run: pip install tox
22472229

22482230
- name: Run tests
2249-
run: tox -e py39-test-instrumentation-fastapi-main -- -ra
2250-
2251-
py39-test-instrumentation-fastapi-slim_ubuntu-latest:
2252-
name: instrumentation-fastapi-slim 3.9 Ubuntu
2253-
runs-on: ubuntu-latest
2254-
steps:
2255-
- name: Checkout repo @ SHA - ${{ github.sha }}
2256-
uses: actions/checkout@v4
2257-
2258-
- name: Set up Python 3.9
2259-
uses: actions/setup-python@v5
2260-
with:
2261-
python-version: "3.9"
2262-
2263-
- name: Install tox
2264-
run: pip install tox
2265-
2266-
- name: Run tests
2267-
run: tox -e py39-test-instrumentation-fastapi-slim -- -ra
2268-
2269-
py310-test-instrumentation-fastapi-main_ubuntu-latest:
2270-
name: instrumentation-fastapi-main 3.10 Ubuntu
2271-
runs-on: ubuntu-latest
2272-
steps:
2273-
- name: Checkout repo @ SHA - ${{ github.sha }}
2274-
uses: actions/checkout@v4
2275-
2276-
- name: Set up Python 3.10
2277-
uses: actions/setup-python@v5
2278-
with:
2279-
python-version: "3.10"
2280-
2281-
- name: Install tox
2282-
run: pip install tox
2283-
2284-
- name: Run tests
2285-
run: tox -e py310-test-instrumentation-fastapi-main -- -ra
2231+
run: tox -e py39-test-instrumentation-fastapi -- -ra
22862232

2287-
py310-test-instrumentation-fastapi-slim_ubuntu-latest:
2288-
name: instrumentation-fastapi-slim 3.10 Ubuntu
2233+
py310-test-instrumentation-fastapi_ubuntu-latest:
2234+
name: instrumentation-fastapi 3.10 Ubuntu
22892235
runs-on: ubuntu-latest
22902236
steps:
22912237
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -2300,10 +2246,10 @@ jobs:
23002246
run: pip install tox
23012247

23022248
- name: Run tests
2303-
run: tox -e py310-test-instrumentation-fastapi-slim -- -ra
2249+
run: tox -e py310-test-instrumentation-fastapi -- -ra
23042250

2305-
py311-test-instrumentation-fastapi-main_ubuntu-latest:
2306-
name: instrumentation-fastapi-main 3.11 Ubuntu
2251+
py311-test-instrumentation-fastapi_ubuntu-latest:
2252+
name: instrumentation-fastapi 3.11 Ubuntu
23072253
runs-on: ubuntu-latest
23082254
steps:
23092255
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -2318,28 +2264,10 @@ jobs:
23182264
run: pip install tox
23192265

23202266
- name: Run tests
2321-
run: tox -e py311-test-instrumentation-fastapi-main -- -ra
2267+
run: tox -e py311-test-instrumentation-fastapi -- -ra
23222268

2323-
py311-test-instrumentation-fastapi-slim_ubuntu-latest:
2324-
name: instrumentation-fastapi-slim 3.11 Ubuntu
2325-
runs-on: ubuntu-latest
2326-
steps:
2327-
- name: Checkout repo @ SHA - ${{ github.sha }}
2328-
uses: actions/checkout@v4
2329-
2330-
- name: Set up Python 3.11
2331-
uses: actions/setup-python@v5
2332-
with:
2333-
python-version: "3.11"
2334-
2335-
- name: Install tox
2336-
run: pip install tox
2337-
2338-
- name: Run tests
2339-
run: tox -e py311-test-instrumentation-fastapi-slim -- -ra
2340-
2341-
py312-test-instrumentation-fastapi-main_ubuntu-latest:
2342-
name: instrumentation-fastapi-main 3.12 Ubuntu
2269+
py312-test-instrumentation-fastapi_ubuntu-latest:
2270+
name: instrumentation-fastapi 3.12 Ubuntu
23432271
runs-on: ubuntu-latest
23442272
steps:
23452273
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -2354,46 +2282,10 @@ jobs:
23542282
run: pip install tox
23552283

23562284
- name: Run tests
2357-
run: tox -e py312-test-instrumentation-fastapi-main -- -ra
2358-
2359-
py312-test-instrumentation-fastapi-slim_ubuntu-latest:
2360-
name: instrumentation-fastapi-slim 3.12 Ubuntu
2361-
runs-on: ubuntu-latest
2362-
steps:
2363-
- name: Checkout repo @ SHA - ${{ github.sha }}
2364-
uses: actions/checkout@v4
2365-
2366-
- name: Set up Python 3.12
2367-
uses: actions/setup-python@v5
2368-
with:
2369-
python-version: "3.12"
2370-
2371-
- name: Install tox
2372-
run: pip install tox
2373-
2374-
- name: Run tests
2375-
run: tox -e py312-test-instrumentation-fastapi-slim -- -ra
2376-
2377-
pypy3-test-instrumentation-fastapi-main_ubuntu-latest:
2378-
name: instrumentation-fastapi-main pypy-3.8 Ubuntu
2379-
runs-on: ubuntu-latest
2380-
steps:
2381-
- name: Checkout repo @ SHA - ${{ github.sha }}
2382-
uses: actions/checkout@v4
2383-
2384-
- name: Set up Python pypy-3.8
2385-
uses: actions/setup-python@v5
2386-
with:
2387-
python-version: "pypy-3.8"
2388-
2389-
- name: Install tox
2390-
run: pip install tox
2391-
2392-
- name: Run tests
2393-
run: tox -e pypy3-test-instrumentation-fastapi-main -- -ra
2285+
run: tox -e py312-test-instrumentation-fastapi -- -ra
23942286

2395-
pypy3-test-instrumentation-fastapi-slim_ubuntu-latest:
2396-
name: instrumentation-fastapi-slim pypy-3.8 Ubuntu
2287+
pypy3-test-instrumentation-fastapi_ubuntu-latest:
2288+
name: instrumentation-fastapi pypy-3.8 Ubuntu
23972289
runs-on: ubuntu-latest
23982290
steps:
23992291
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -2408,7 +2300,7 @@ jobs:
24082300
run: pip install tox
24092301

24102302
- name: Run tests
2411-
run: tox -e pypy3-test-instrumentation-fastapi-slim -- -ra
2303+
run: tox -e pypy3-test-instrumentation-fastapi -- -ra
24122304

24132305
py38-test-instrumentation-flask-0_ubuntu-latest:
24142306
name: instrumentation-flask-0 3.8 Ubuntu
@@ -4515,3 +4407,111 @@ jobs:
45154407

45164408
- name: Run tests
45174409
run: tox -e py311-test-instrumentation-pymemcache-2 -- -ra
4410+
4411+
py311-test-instrumentation-pymemcache-3_ubuntu-latest:
4412+
name: instrumentation-pymemcache-3 3.11 Ubuntu
4413+
runs-on: ubuntu-latest
4414+
steps:
4415+
- name: Checkout repo @ SHA - ${{ github.sha }}
4416+
uses: actions/checkout@v4
4417+
4418+
- name: Set up Python 3.11
4419+
uses: actions/setup-python@v5
4420+
with:
4421+
python-version: "3.11"
4422+
4423+
- name: Install tox
4424+
run: pip install tox
4425+
4426+
- name: Run tests
4427+
run: tox -e py311-test-instrumentation-pymemcache-3 -- -ra
4428+
4429+
py311-test-instrumentation-pymemcache-4_ubuntu-latest:
4430+
name: instrumentation-pymemcache-4 3.11 Ubuntu
4431+
runs-on: ubuntu-latest
4432+
steps:
4433+
- name: Checkout repo @ SHA - ${{ github.sha }}
4434+
uses: actions/checkout@v4
4435+
4436+
- name: Set up Python 3.11
4437+
uses: actions/setup-python@v5
4438+
with:
4439+
python-version: "3.11"
4440+
4441+
- name: Install tox
4442+
run: pip install tox
4443+
4444+
- name: Run tests
4445+
run: tox -e py311-test-instrumentation-pymemcache-4 -- -ra
4446+
4447+
py312-test-instrumentation-pymemcache-0_ubuntu-latest:
4448+
name: instrumentation-pymemcache-0 3.12 Ubuntu
4449+
runs-on: ubuntu-latest
4450+
steps:
4451+
- name: Checkout repo @ SHA - ${{ github.sha }}
4452+
uses: actions/checkout@v4
4453+
4454+
- name: Set up Python 3.12
4455+
uses: actions/setup-python@v5
4456+
with:
4457+
python-version: "3.12"
4458+
4459+
- name: Install tox
4460+
run: pip install tox
4461+
4462+
- name: Run tests
4463+
run: tox -e py312-test-instrumentation-pymemcache-0 -- -ra
4464+
4465+
py312-test-instrumentation-pymemcache-1_ubuntu-latest:
4466+
name: instrumentation-pymemcache-1 3.12 Ubuntu
4467+
runs-on: ubuntu-latest
4468+
steps:
4469+
- name: Checkout repo @ SHA - ${{ github.sha }}
4470+
uses: actions/checkout@v4
4471+
4472+
- name: Set up Python 3.12
4473+
uses: actions/setup-python@v5
4474+
with:
4475+
python-version: "3.12"
4476+
4477+
- name: Install tox
4478+
run: pip install tox
4479+
4480+
- name: Run tests
4481+
run: tox -e py312-test-instrumentation-pymemcache-1 -- -ra
4482+
4483+
py312-test-instrumentation-pymemcache-2_ubuntu-latest:
4484+
name: instrumentation-pymemcache-2 3.12 Ubuntu
4485+
runs-on: ubuntu-latest
4486+
steps:
4487+
- name: Checkout repo @ SHA - ${{ github.sha }}
4488+
uses: actions/checkout@v4
4489+
4490+
- name: Set up Python 3.12
4491+
uses: actions/setup-python@v5
4492+
with:
4493+
python-version: "3.12"
4494+
4495+
- name: Install tox
4496+
run: pip install tox
4497+
4498+
- name: Run tests
4499+
run: tox -e py312-test-instrumentation-pymemcache-2 -- -ra
4500+
4501+
py312-test-instrumentation-pymemcache-3_ubuntu-latest:
4502+
name: instrumentation-pymemcache-3 3.12 Ubuntu
4503+
runs-on: ubuntu-latest
4504+
steps:
4505+
- name: Checkout repo @ SHA - ${{ github.sha }}
4506+
uses: actions/checkout@v4
4507+
4508+
- name: Set up Python 3.12
4509+
uses: actions/setup-python@v5
4510+
with:
4511+
python-version: "3.12"
4512+
4513+
- name: Install tox
4514+
run: pip install tox
4515+
4516+
- name: Run tests
4517+
run: tox -e py312-test-instrumentation-pymemcache-3 -- -ra

0 commit comments

Comments
 (0)