Skip to content

Commit 574e9dc

Browse files
committed
Remove [test] package from tornado instrumentation
Fixes open-telemetry#2223
1 parent 1c21715 commit 574e9dc

File tree

4 files changed

+36
-9
lines changed

4 files changed

+36
-9
lines changed

Diff for: instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ dependencies = [
3333
instruments = [
3434
"tornado >= 5.1.1",
3535
]
36-
test = [
37-
"opentelemetry-instrumentation-tornado[instruments]",
38-
"opentelemetry-test-utils == 0.45b0.dev",
39-
"http-server-mock"
40-
]
4136

4237
[project.entry-points.opentelemetry_instrumentor]
4338
tornado = "opentelemetry.instrumentation.tornado:TornadoInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
blinker==1.7.0
4+
certifi==2024.2.2
5+
charset-normalizer==3.3.2
6+
click==8.1.7
7+
Deprecated==1.2.14
8+
Flask==3.0.2
9+
http_server_mock==1.7
10+
idna==3.6
11+
importlib-metadata==6.11.0
12+
iniconfig==2.0.0
13+
itsdangerous==2.1.2
14+
Jinja2==3.1.3
15+
MarkupSafe==2.1.5
16+
packaging==23.2
17+
pluggy==1.4.0
18+
py==1.11.0
19+
py-cpuinfo==9.0.0
20+
pytest==7.1.3
21+
pytest-benchmark==4.0.0
22+
requests==2.31.0
23+
tomli==2.0.1
24+
tornado==6.4
25+
typing_extensions==4.9.0
26+
urllib3==2.2.1
27+
Werkzeug==3.0.1
28+
wrapt==1.16.0
29+
zipp==3.17.0
30+
-e ../../../opentelemetry-instrumentation
31+
-e ../../../util/opentelemetry-util-http
32+
-e ../../../instrumentation/opentelemetry-instrumentation-tornado

Diff for: instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ def index():
528528

529529

530530
class TestTornadoInstrumentationWithXHeaders(TornadoTest):
531-
def get_httpserver_options(self):
531+
def get_httpserver_options(self): # pylint: disable=no-self-use
532532
return {"xheaders": True}
533533

534534
def test_xheaders(self):

Diff for: tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ commands_pre =
386386

387387
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
388388

389-
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
389+
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
390390
wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
391391
asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
392392

@@ -443,7 +443,7 @@ commands_pre =
443443

444444
system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
445445

446-
tornado: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado[test]
446+
tornado: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
447447

448448
tortoiseorm: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
449449

@@ -571,7 +571,7 @@ commands_pre =
571571
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
572572
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
573573
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
574-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado[test]
574+
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado
575575
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
576576
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test]
577577
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test]

0 commit comments

Comments
 (0)