Remove [test] package from aiohttp-server instrumentation

Fixes open-telemetry#2184
ocelotl · Feb 16, 2024 · edf7aed · edf7aed
1 parent 2518a4a
commit edf7aed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
@@ -35,10 +35,6 @@ dependencies = [
 instruments = [
  "aiohttp ~= 3.0",
 ]
-test = [
- "opentelemetry-instrumentation-aiohttp-client[instruments]",
- "http-server-mock"
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiohttp-client = "opentelemetry.instrumentation.aiohttp_client:AioHttpClientInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -0,0 +1,5 @@
+-e ../../../opentelemetry-instrumentation
+-e ../../../util/opentelemetry-util-http
+aiohttp==3.9.3
+http-server-mock==1.7
+-e ../../../instrumentation/opentelemetry-instrumentation-aiohttp-client
diff --git a/tox.ini b/tox.ini
@@ -386,7 +386,7 @@ 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,starlette,fastapi,aiohttp-client,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]
 
@@ -455,7 +455,7 @@ commands_pre =
 
  aiohttp-client: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
 
- aiohttp-server: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
+ aiohttp-server: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
 
  aiopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
 
@@ -557,7 +557,7 @@ commands_pre =
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
- python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
+ python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid[test]