From c4959fdd29e30c26c07d64f6f4ed039e0bdf9bbc Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sat, 24 Feb 2024 14:21:28 -0600 Subject: [PATCH] Remove [test] package from grpc instrumentation Fixes #2202 --- .../pyproject.toml | 6 ------ .../test-requirements.txt | 20 +++++++++++++++++++ tox.ini | 5 ++--- 3 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt diff --git a/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml b/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml index 8373feaa40..056592dd42 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml @@ -35,12 +35,6 @@ dependencies = [ instruments = [ "grpcio ~= 1.27", ] -test = [ - "opentelemetry-instrumentation-grpc[instruments]", - "opentelemetry-sdk ~= 1.12", - "opentelemetry-test-utils == 0.45b0.dev", - "protobuf ~= 3.13", -] [project.entry-points.opentelemetry_instrumentor] grpc_client = "opentelemetry.instrumentation.grpc:GrpcInstrumentorClient" diff --git a/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt new file mode 100644 index 0000000000..56d47af0df --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt @@ -0,0 +1,20 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +grpcio==1.62.0 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==23.2 +pluggy==1.4.0 +protobuf==3.20.3 +py==1.11.0 +py-cpuinfo==9.0.0 +pytest==7.1.3 +pytest-asyncio==0.23.5 +pytest-benchmark==4.0.0 +tomli==2.0.1 +typing_extensions==4.9.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-instrumentation +-e instrumentation/opentelemetry-instrumentation-grpc diff --git a/tox.ini b/tox.ini index 7b7b2a0710..fdda16336c 100644 --- a/tox.ini +++ b/tox.ini @@ -278,7 +278,6 @@ deps = flask-220: Werkzeug <3.0.0 flask-300: Flask >=3.0.0 flask-300: Werkzeug >=3.0.0 - grpc: pytest-asyncio sqlalchemy-11: sqlalchemy>=1.1,<1.2 sqlalchemy-14: aiosqlite sqlalchemy-14: sqlalchemy~=1.4 @@ -331,7 +330,7 @@ commands_pre = confluent-kafka: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test] - grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test] + grpc: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt 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 wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test] @@ -541,7 +540,7 @@ commands_pre = 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] - python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test] + pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]