Remove [test] package from tornado instrumentation

Fixes #2223
open-telemetry · Feb 28, 2024 · 574e9dc · 574e9dc
1 parent 1c21715
commit 574e9dc
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml
@@ -33,11 +33,6 @@ dependencies = [
 instruments = [
   "tornado >= 5.1.1",
 ]
-test = [
-  "opentelemetry-instrumentation-tornado[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "http-server-mock"
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 tornado = "opentelemetry.instrumentation.tornado:TornadoInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
@@ -0,0 +1,32 @@
+asgiref==3.7.2
+attrs==23.2.0
+blinker==1.7.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+click==8.1.7
+Deprecated==1.2.14
+Flask==3.0.2
+http_server_mock==1.7
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+itsdangerous==2.1.2
+Jinja2==3.1.3
+MarkupSafe==2.1.5
+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
+tomli==2.0.1
+tornado==6.4
+typing_extensions==4.9.0
+urllib3==2.2.1
+Werkzeug==3.0.1
+wrapt==1.16.0
+zipp==3.17.0
+-e ../../../opentelemetry-instrumentation
+-e ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-tornado
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py b/instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py
@@ -528,7 +528,7 @@ def index():
 
 
 class TestTornadoInstrumentationWithXHeaders(TornadoTest):
-    def get_httpserver_options(self):
+    def get_httpserver_options(self):  # pylint: disable=no-self-use
         return {"xheaders": True}
 
     def test_xheaders(self):

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,starlette,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]
 
@@ -443,7 +443,7 @@ commands_pre =
 
   system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
 
-  tornado: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado[test]
+  tornado: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
 
   tortoiseorm: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
 
@@ -571,7 +571,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test]