Skip to content

Commit 25e1c99

Browse files
committed
Remove [test] package from starlette instrumentation
Fixes open-telemetry#2221
1 parent 565e78d commit 25e1c99

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ dependencies = [
3535
instruments = [
3636
"starlette ~= 0.13.0",
3737
]
38-
test = [
39-
"opentelemetry-instrumentation-starlette[instruments]",
40-
"opentelemetry-test-utils == 0.45b0.dev",
41-
"requests ~= 2.23", # needed for testclient
42-
"httpx ~= 0.22", # needed for testclient
43-
]
4438

4539
[project.entry-points.opentelemetry_instrumentor]
4640
starlette = "opentelemetry.instrumentation.starlette:StarletteInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
anyio==4.3.0
2+
asgiref==3.7.2
3+
attrs==23.2.0
4+
certifi==2024.2.2
5+
charset-normalizer==3.3.2
6+
Deprecated==1.2.14
7+
exceptiongroup==1.2.0
8+
h11==0.14.0
9+
httpcore==1.0.4
10+
httpx==0.27.0
11+
idna==3.6
12+
importlib-metadata==6.11.0
13+
iniconfig==2.0.0
14+
packaging==23.2
15+
pluggy==1.4.0
16+
py==1.11.0
17+
py-cpuinfo==9.0.0
18+
pytest==7.1.3
19+
pytest-benchmark==4.0.0
20+
requests==2.31.0
21+
sniffio==1.3.0
22+
starlette==0.13.8
23+
tomli==2.0.1
24+
typing_extensions==4.9.0
25+
urllib3==2.2.1
26+
wrapt==1.16.0
27+
zipp==3.17.0
28+
-e opentelemetry-instrumentation
29+
-e instrumentation/opentelemetry-instrumentation-asgi
30+
-e util/opentelemetry-util-http
31+
-e instrumentation/opentelemetry-instrumentation-starlette

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@ commands_pre =
333333

334334
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
335335

336-
falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
336+
falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
337337
wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
338-
asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
338+
asgi,django-{3,4},fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
339339

340340
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
341341

@@ -388,7 +388,7 @@ commands_pre =
388388

389389
requests: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-requests[test]
390390

391-
starlette: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
391+
starlette: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
392392

393393
system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
394394

@@ -540,7 +540,7 @@ commands_pre =
540540
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
541541
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
542542
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
543-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
543+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
544544
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
545545
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
546546
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]

0 commit comments

Comments
 (0)