Remove [test] package for django instrumentation (#2311)

Fixes #2198
This commit is contained in:
Diego Hurtado
2024-03-14 18:54:12 -06:00
committed by GitHub
parent d948f21ad3
commit 5f68e9701b
6 changed files with 112 additions and 15 deletions

View File

@ -38,10 +38,6 @@ asgi = [
instruments = [
"django >= 1.10",
]
test = [
"opentelemetry-instrumentation-django[instruments]",
"opentelemetry-test-utils == 0.45b0.dev",
]
[project.entry-points.opentelemetry_instrumentor]
django = "opentelemetry.instrumentation.django:DjangoInstrumentor"

View File

@ -0,0 +1,22 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
Django==2.2.28
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
pytz==2024.1
sqlparse==0.4.4
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-wsgi
-e util/opentelemetry-util-http
-e instrumentation/opentelemetry-instrumentation-django

View File

@ -0,0 +1,23 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
Django==3.2.24
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
pytz==2024.1
sqlparse==0.4.4
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-wsgi
-e instrumentation/opentelemetry-instrumentation-asgi
-e util/opentelemetry-util-http
-e instrumentation/opentelemetry-instrumentation-django

View File

@ -0,0 +1,23 @@
asgiref==3.7.2
attrs==23.2.0
backports.zoneinfo==0.2.1
Deprecated==1.2.14
Django==4.2.10
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
sqlparse==0.4.4
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-wsgi
-e instrumentation/opentelemetry-instrumentation-asgi
-e util/opentelemetry-util-http
-e instrumentation/opentelemetry-instrumentation-django

View File

@ -0,0 +1,22 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
Django==4.2.10
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
sqlparse==0.4.4
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-wsgi
-e instrumentation/opentelemetry-instrumentation-asgi
-e util/opentelemetry-util-http
-e instrumentation/opentelemetry-instrumentation-django

33
tox.ini
View File

@ -52,10 +52,18 @@ envlist =
; Only officially supported Python versions are tested for each Django
; major release. Updated list can be found at:
; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: django~=2.0
; 1: django~=3.0
; 2: django>=4.0b1,<5.0 backports.zoneinfo==0.2.1
; 3: django>=4.0b1,<5.0
py3{8,9}-test-instrumentation-django-0
py3{8,9}-test-instrumentation-django-1
py3{8,9}-test-instrumentation-django-2
py3{8,9,10,11}-test-instrumentation-django-3
py3{8,9,10,11}-test-instrumentation-django-4
pypy3-test-instrumentation-django-{2,3}
py3{10,11}-test-instrumentation-django-1
py3{10,11}-test-instrumentation-django-3
pypy3-test-instrumentation-django-{0,1}
; opentelemetry-instrumentation-dbapi
py3{8,9,10,11}-test-instrumentation-dbapi
@ -265,9 +273,6 @@ deps =
test: pytest-benchmark
coverage: pytest
coverage: pytest-cov
django-2: django~=2.0
django-3: django~=3.0
django-4: django>=4.0b1,<5.0
elasticsearch-2: elasticsearch-dsl>=2.0,<3.0
elasticsearch-2: elasticsearch>=2.0,<3.0
elasticsearch-5: elasticsearch-dsl>=5.0,<6.0
@ -338,9 +343,9 @@ commands_pre =
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
falcon-{1,2,3},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
wsgi,falcon-{1,2,3},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
falcon-{1,2,3},pyramid,tornado,starlette,fastapi,aiohttp,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
wsgi,falcon-{1,2,3},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
@ -367,7 +372,13 @@ commands_pre =
dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
django-{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
py3{8,9}-test-instrumentation-django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
py3{8,9}-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
py3{8,9}-test-instrumentation-django-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt
py3{10,11}-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
py3{10,11}-test-instrumentation-django-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
pypy3-test-instrumentation-django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
pypy3-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]
@ -544,7 +555,7 @@ commands_pre =
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
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]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]