Skip to content

Commit ce2de1f

Browse files
authored
Remove [test] package from falcon instrumentation (#2313)
Fixes #2200
1 parent 5f68e97 commit ce2de1f

File tree

5 files changed

+76
-14
lines changed

5 files changed

+76
-14
lines changed

instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ dependencies = [
3636
instruments = [
3737
"falcon >= 1.4.1, < 3.1.2",
3838
]
39-
test = [
40-
"opentelemetry-instrumentation-falcon[instruments]",
41-
"opentelemetry-test-utils == 0.45b0.dev",
42-
]
4339

4440
[project.entry-points.opentelemetry_instrumentor]
4541
falcon = "opentelemetry.instrumentation.falcon:FalconInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
falcon==1.4.1
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
python-mimeparse==1.6.0
14+
six==1.16.0
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e opentelemetry-instrumentation
20+
-e instrumentation/opentelemetry-instrumentation-wsgi
21+
-e util/opentelemetry-util-http
22+
-e instrumentation/opentelemetry-instrumentation-falcon
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
falcon==2.0.0
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.10.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-wsgi
19+
-e util/opentelemetry-util-http
20+
-e instrumentation/opentelemetry-instrumentation-falcon
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
falcon==3.1.1
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.10.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-wsgi
19+
-e util/opentelemetry-util-http
20+
-e instrumentation/opentelemetry-instrumentation-falcon

tox.ini

+14-10
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,14 @@ envlist =
8282

8383
; opentelemetry-instrumentation-falcon
8484
; py310 does not work with falcon 1
85-
py3{8,9}-test-instrumentation-falcon-1
86-
py3{8,9,10,11}-test-instrumentation-falcon-{2,3}
87-
pypy3-test-instrumentation-falcon-{1,2,3}
85+
; The numbers at the end of the environment names
86+
; below mean these dependencies are being used:
87+
; 0: falcon ==1.4.1
88+
; 1: falcon >=2.0.0,<3.0.0
89+
; 2: falcon >=3.0.0,<4.0.0
90+
py3{8,9}-test-instrumentation-falcon-0
91+
py3{8,9,10,11}-test-instrumentation-falcon-{1,2}
92+
pypy3-test-instrumentation-falcon-{0,1,2}
8893

8994
; opentelemetry-instrumentation-fastapi
9095
py3{8,9,10,11}-test-instrumentation-fastapi
@@ -284,9 +289,6 @@ deps =
284289
; elasticsearch-7: elasticsearch>=7.0,<8.0
285290
; elasticsearch-8: elasticsearch-dsl>=8.0,<9.0
286291
; elasticsearch-8: elasticsearch>=8.0,<9.0
287-
falcon-1: falcon ==1.4.1
288-
falcon-2: falcon >=2.0.0,<3.0.0
289-
falcon-3: falcon >=3.0.0,<4.0.0
290292
grpc: pytest-asyncio
291293
sqlalchemy-11: sqlalchemy>=1.1,<1.2
292294
sqlalchemy-14: aiosqlite
@@ -343,8 +345,8 @@ commands_pre =
343345

344346
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
345347

346-
falcon-{1,2,3},pyramid,tornado,starlette,fastapi,aiohttp,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
347-
wsgi,falcon-{1,2,3},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
348+
pyramid,tornado,starlette,fastapi,aiohttp,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
349+
wsgi,pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
348350
starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
349351

350352
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
@@ -356,7 +358,9 @@ commands_pre =
356358

357359
boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
358360

359-
falcon-{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
361+
falcon-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
362+
falcon-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
363+
falcon-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
360364

361365
flask-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt
362366
flask-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt
@@ -558,7 +562,7 @@ commands_pre =
558562
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
559563
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
560564
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
561-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
565+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
562566
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
563567
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
564568
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]

0 commit comments

Comments
 (0)