From 26e381f89b1c8d015ca513821d421a1aca4ba3f5 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sat, 17 Feb 2024 13:05:03 -0600 Subject: [PATCH] Remove [test] package from boto instrumentation Fixes #2191 --- .../pyproject.toml | 6 -- .../test-requirements.txt | 71 +++++++++++++++++++ tox.ini | 6 +- 3 files changed, 74 insertions(+), 9 deletions(-) create mode 100644 instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt diff --git a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml index 307a96e5aa..dd4dd690e8 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml @@ -33,12 +33,6 @@ dependencies = [ instruments = [ "boto~=2.0", ] -test = [ - "opentelemetry-instrumentation-boto[instruments]", - "markupsafe==2.0.1", - "moto~=2.0", - "opentelemetry-test-utils == 0.45b0.dev", -] [project.entry-points.opentelemetry_instrumentor] boto = "opentelemetry.instrumentation.boto:BotoInstrumentor" diff --git a/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt new file mode 100644 index 0000000000..92c356ebe1 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt @@ -0,0 +1,71 @@ +annotated-types==0.6.0 +asgiref==3.7.2 +attrs==23.2.0 +aws-sam-translator==1.85.0 +aws-xray-sdk==2.12.1 +boto==2.49.0 +boto3==1.34.44 +botocore==1.34.44 +certifi==2024.2.2 +cffi==1.16.0 +cfn-lint==0.85.2 +charset-normalizer==3.3.2 +cryptography==42.0.3 +Deprecated==1.2.14 +docker==7.0.0 +ecdsa==0.18.0 +graphql-core==3.2.3 +idna==3.6 +importlib-metadata==6.11.0 +importlib-resources==6.1.1 +iniconfig==2.0.0 +Jinja2==3.1.3 +jmespath==1.0.1 +jschema-to-python==1.2.3 +jsondiff==2.0.0 +jsonpatch==1.33 +jsonpickle==3.0.2 +jsonpointer==2.4 +jsonschema==4.21.1 +jsonschema-specifications==2023.12.1 +junit-xml==1.9 +MarkupSafe==2.1.5 +moto==2.3.2 +mpmath==1.3.0 +networkx==3.1 +packaging==23.2 +pbr==6.0.0 +pkgutil_resolve_name==1.3.10 +pluggy==1.4.0 +py==1.11.0 +py-cpuinfo==9.0.0 +pyasn1==0.5.1 +pycparser==2.21 +pydantic==2.6.1 +pydantic_core==2.16.2 +pytest==7.1.3 +pytest-benchmark==4.0.0 +python-dateutil==2.8.2 +python-jose==3.3.0 +pytz==2024.1 +PyYAML==6.0.1 +referencing==0.33.0 +regex==2023.12.25 +requests==2.31.0 +responses==0.25.0 +rpds-py==0.18.0 +rsa==4.9 +s3transfer==0.10.0 +sarif-om==1.0.4 +six==1.16.0 +sshpubkeys==3.3.1 +sympy==1.12 +tomli==2.0.1 +typing_extensions==4.9.0 +urllib3==1.26.18 +Werkzeug==3.0.1 +wrapt==1.16.0 +xmltodict==0.13.0 +zipp==3.17.0 +-e opentelemetry-instrumentation +-e instrumentation/opentelemetry-instrumentation-boto diff --git a/tox.ini b/tox.ini index 7b7b2a0710..2ab131223d 100644 --- a/tox.ini +++ b/tox.ini @@ -341,8 +341,8 @@ commands_pre = aws-lambda: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda[test] - boto: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test] - boto: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test] + botocore: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test] + boto: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test] @@ -543,7 +543,7 @@ commands_pre = 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] - python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test] + pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]