Remove [test] package from starlette instrumentation

Fixes open-telemetry#2221
ocelotl · Mar 6, 2024 · fa4c8bc · fa4c8bc
1 parent 46a8c59
commit fa4c8bc
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml b/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml
@@ -35,12 +35,6 @@ dependencies = [
 instruments = [
   "starlette ~= 0.13.0",
 ]
-test = [
-  "opentelemetry-instrumentation-starlette[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "requests ~= 2.23", # needed for testclient
-  "httpx ~= 0.22", # needed for testclient
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 starlette = "opentelemetry.instrumentation.starlette:StarletteInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
@@ -0,0 +1,31 @@
+anyio==4.3.0
+asgiref==3.7.2
+attrs==23.2.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+Deprecated==1.2.14
+exceptiongroup==1.2.0
+h11==0.14.0
+httpcore==1.0.4
+httpx==0.27.0
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+requests==2.31.0
+sniffio==1.3.0
+starlette==0.13.8
+tomli==2.0.1
+typing_extensions==4.9.0
+urllib3==2.2.1
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-asgi
+-e instrumentation/opentelemetry-instrumentation-starlette
diff --git a/tox.ini b/tox.ini
@@ -333,9 +333,9 @@ commands_pre =
 
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
-  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
+  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
   wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
-  asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
+  asgi,django-{3,4},fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
 
   asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
 
@@ -388,7 +388,7 @@ commands_pre =
 
   requests: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-requests[test]
 
-  starlette: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
+  starlette: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
 
   system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
 
@@ -540,7 +540,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]