diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f9d6613214..50e6f2125d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751)) - bump mypy to 0.982 ([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776)) +- Fix ValueError message for PeriodicExportingMetricsReader + ([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769)) ## Version 1.23.0/0.44b0 (2024-02-23) diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml index 7966106566d..abe50f7b7f7 100644 --- a/exporter/opentelemetry-exporter-opencensus/pyproject.toml +++ b/exporter/opentelemetry-exporter-opencensus/pyproject.toml @@ -33,9 +33,6 @@ dependencies = [ "setuptools >= 16.0", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_traces_exporter] opencensus = "opentelemetry.exporter.opencensus.trace_exporter:OpenCensusSpanExporter" diff --git a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt new file mode 100644 index 00000000000..8a6345c7e22 --- /dev/null +++ b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt @@ -0,0 +1,23 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +grpcio==1.62.0 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +opencensus-proto==0.1.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-benchmark==4.0.0 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-opencensus diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml index cf1749b910a..8043bfbcf9a 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml @@ -27,9 +27,6 @@ dependencies = [ "opentelemetry-proto == 1.24.0.dev", ] -[project.optional-dependencies] -test = [] - [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common" diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt new file mode 100644 index 00000000000..60f3dcd2ea7 --- /dev/null +++ b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt @@ -0,0 +1,19 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==23.2 +pluggy==1.4.0 +protobuf==4.25.3 +py==1.11.0 +py-cpuinfo==9.0.0 +pytest==7.1.3 +pytest-benchmark==4.0.0 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-proto +-e exporter/opentelemetry-exporter-otlp-proto-common diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml index 95a613f6ef1..77a3bcb95b8 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml @@ -33,11 +33,6 @@ dependencies = [ "requests ~= 2.7", ] -[project.optional-dependencies] -test = [ - "responses >= 0.22.0, < 0.25", -] - [project.entry-points.opentelemetry_traces_exporter] otlp_proto_http = "opentelemetry.exporter.otlp.proto.http.trace_exporter:OTLPSpanExporter" diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt new file mode 100644 index 00000000000..0faf2626687 --- /dev/null +++ b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt @@ -0,0 +1,31 @@ +asgiref==3.7.2 +attrs==23.2.0 +certifi==2024.2.2 +charset-normalizer==3.3.2 +Deprecated==1.2.14 +flaky==3.7.0 +googleapis-common-protos==1.62.0 +idna==3.6 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==23.2 +pluggy==1.4.0 +protobuf==3.19.6 +py==1.11.0 +py-cpuinfo==9.0.0 +pytest==7.1.3 +pytest-benchmark==4.0.0 +PyYAML==6.0.1 +requests==2.31.0 +responses==0.24.1 +tomli==2.0.1 +typing_extensions==4.10.0 +urllib3==2.2.1 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e exporter/opentelemetry-exporter-otlp-proto-common +-e opentelemetry-proto +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-otlp-proto-http diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt new file mode 100644 index 00000000000..d38b38f1c40 --- /dev/null +++ b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt @@ -0,0 +1,31 @@ +asgiref==3.7.2 +attrs==23.2.0 +certifi==2024.2.2 +charset-normalizer==3.3.2 +Deprecated==1.2.14 +flaky==3.7.0 +googleapis-common-protos==1.62.0 +idna==3.6 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==23.2 +pluggy==1.4.0 +protobuf==4.25.3 +py==1.11.0 +py-cpuinfo==9.0.0 +pytest==7.1.3 +pytest-benchmark==4.0.0 +PyYAML==6.0.1 +requests==2.31.0 +responses==0.24.1 +tomli==2.0.1 +typing_extensions==4.10.0 +urllib3==2.2.1 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e exporter/opentelemetry-exporter-otlp-proto-common +-e opentelemetry-proto +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-otlp-proto-http diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml index 0f086924ecb..3117ee6afbb 100644 --- a/exporter/opentelemetry-exporter-prometheus/pyproject.toml +++ b/exporter/opentelemetry-exporter-prometheus/pyproject.toml @@ -30,9 +30,6 @@ dependencies = [ "prometheus_client >= 0.5.0, < 1.0.0", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_metrics_exporter] prometheus = "opentelemetry.exporter.prometheus:_AutoPrometheusMetricReader" diff --git a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt new file mode 100644 index 00000000000..2b3dd0f9f04 --- /dev/null +++ b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt @@ -0,0 +1,21 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==23.2 +pluggy==1.4.0 +prometheus_client==0.20.0 +py==1.11.0 +py-cpuinfo==9.0.0 +pytest==7.1.3 +pytest-benchmark==4.0.0 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-prometheus diff --git a/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml index 6072def4bb7..8d18ed5f568 100644 --- a/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml @@ -30,9 +30,6 @@ dependencies = [ "requests ~= 2.7", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_traces_exporter] zipkin_json = "opentelemetry.exporter.zipkin.json:ZipkinExporter" diff --git a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt new file mode 100644 index 00000000000..0625946182a --- /dev/null +++ b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt @@ -0,0 +1,25 @@ +asgiref==3.7.2 +attrs==23.2.0 +certifi==2024.2.2 +charset-normalizer==3.3.2 +Deprecated==1.2.14 +flaky==3.7.0 +idna==3.6 +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 +requests==2.31.0 +tomli==2.0.1 +typing_extensions==4.10.0 +urllib3==2.2.1 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-zipkin-json diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml index e89d42d2335..25e0c95877d 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml @@ -32,9 +32,6 @@ dependencies = [ "requests ~= 2.7", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_traces_exporter] zipkin_proto = "opentelemetry.exporter.zipkin.proto.http:ZipkinExporter" diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt new file mode 100644 index 00000000000..acfa95ff2a0 --- /dev/null +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt @@ -0,0 +1,27 @@ +asgiref==3.7.2 +attrs==23.2.0 +certifi==2024.2.2 +charset-normalizer==3.3.2 +Deprecated==1.2.14 +flaky==3.7.0 +idna==3.6 +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-benchmark==4.0.0 +requests==2.31.0 +tomli==2.0.1 +typing_extensions==4.10.0 +urllib3==2.2.1 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e exporter/opentelemetry-exporter-zipkin-json +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-zipkin-proto-http diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml index 29d219e6193..cd9dc258b34 100644 --- a/opentelemetry-api/pyproject.toml +++ b/opentelemetry-api/pyproject.toml @@ -33,9 +33,6 @@ dynamic = [ "version", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_context] contextvars_context = "opentelemetry.context.contextvars_context:ContextVarsRuntimeContext" diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt new file mode 100644 index 00000000000..273750cb010 --- /dev/null +++ b/opentelemetry-api/test-requirements.txt @@ -0,0 +1,17 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api diff --git a/opentelemetry-proto/pyproject.toml b/opentelemetry-proto/pyproject.toml index 6118e4e86c1..4a5ae1de5e0 100644 --- a/opentelemetry-proto/pyproject.toml +++ b/opentelemetry-proto/pyproject.toml @@ -27,9 +27,6 @@ dependencies = [ "protobuf>=3.19, < 5.0", ] -[project.optional-dependencies] -test = [] - [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto" diff --git a/opentelemetry-proto/test-requirements.txt b/opentelemetry-proto/test-requirements.txt new file mode 100644 index 00000000000..4908ed5baaf --- /dev/null +++ b/opentelemetry-proto/test-requirements.txt @@ -0,0 +1,17 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-proto diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py index e7099562eb8..14546636a94 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py @@ -496,7 +496,7 @@ def __init__( elif self._export_interval_millis <= 0: raise ValueError( f"interval value {self._export_interval_millis} is invalid \ - and needs to be larger than zero and lower than infinity." + and needs to be larger than zero." ) def _at_fork_reinit(self): diff --git a/opentelemetry-semantic-conventions/pyproject.toml b/opentelemetry-semantic-conventions/pyproject.toml index d1fe5a3286a..290c54b3704 100644 --- a/opentelemetry-semantic-conventions/pyproject.toml +++ b/opentelemetry-semantic-conventions/pyproject.toml @@ -24,9 +24,6 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] -[project.optional-dependencies] -test = [] - [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-semantic-conventions" diff --git a/opentelemetry-semantic-conventions/test-requirements.txt b/opentelemetry-semantic-conventions/test-requirements.txt new file mode 100644 index 00000000000..84629406b07 --- /dev/null +++ b/opentelemetry-semantic-conventions/test-requirements.txt @@ -0,0 +1,17 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-semantic-conventions diff --git a/propagator/opentelemetry-propagator-b3/pyproject.toml b/propagator/opentelemetry-propagator-b3/pyproject.toml index 9e17f4c8d3e..736006e74e4 100644 --- a/propagator/opentelemetry-propagator-b3/pyproject.toml +++ b/propagator/opentelemetry-propagator-b3/pyproject.toml @@ -29,9 +29,6 @@ dependencies = [ "opentelemetry-api ~= 1.3", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_propagator] b3 = "opentelemetry.propagators.b3:B3SingleFormat" b3multi = "opentelemetry.propagators.b3:B3MultiFormat" diff --git a/propagator/opentelemetry-propagator-b3/test-requirements.txt b/propagator/opentelemetry-propagator-b3/test-requirements.txt new file mode 100644 index 00000000000..366dfca0d89 --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/test-requirements.txt @@ -0,0 +1,18 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e propagator/opentelemetry-propagator-b3 diff --git a/propagator/opentelemetry-propagator-jaeger/pyproject.toml b/propagator/opentelemetry-propagator-jaeger/pyproject.toml index 105f7088614..b716925f439 100644 --- a/propagator/opentelemetry-propagator-jaeger/pyproject.toml +++ b/propagator/opentelemetry-propagator-jaeger/pyproject.toml @@ -28,9 +28,6 @@ dependencies = [ "opentelemetry-api ~= 1.3", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_propagator] jaeger = "opentelemetry.propagators.jaeger:JaegerPropagator" diff --git a/propagator/opentelemetry-propagator-jaeger/test-requirements.txt b/propagator/opentelemetry-propagator-jaeger/test-requirements.txt new file mode 100644 index 00000000000..ed7338bfbc2 --- /dev/null +++ b/propagator/opentelemetry-propagator-jaeger/test-requirements.txt @@ -0,0 +1,18 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e propagator/opentelemetry-propagator-jaeger diff --git a/shim/opentelemetry-opencensus-shim/pyproject.toml b/shim/opentelemetry-opencensus-shim/pyproject.toml index 404444922a3..be92937faed 100644 --- a/shim/opentelemetry-opencensus-shim/pyproject.toml +++ b/shim/opentelemetry-opencensus-shim/pyproject.toml @@ -32,12 +32,6 @@ dependencies = [ ] [project.optional-dependencies] -test = [ - "opentelemetry-test-utils == 0.45b0.dev", - "opencensus == 0.11.1", - # Temporary fix for https://github.com/census-instrumentation/opencensus-python/issues/1219 - "six == 1.16.0", -] [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/shim/opentelemetry-opencensus-shim" diff --git a/shim/opentelemetry-opencensus-shim/test-requirements.txt b/shim/opentelemetry-opencensus-shim/test-requirements.txt new file mode 100644 index 00000000000..68008fb500e --- /dev/null +++ b/shim/opentelemetry-opencensus-shim/test-requirements.txt @@ -0,0 +1,36 @@ +asgiref==3.7.2 +attrs==23.2.0 +cachetools==5.3.3 +certifi==2024.2.2 +charset-normalizer==3.3.2 +Deprecated==1.2.14 +flaky==3.7.0 +google-api-core==2.17.1 +google-auth==2.28.1 +googleapis-common-protos==1.62.0 +grpcio==1.62.0 +idna==3.6 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +opencensus==0.11.1 +opencensus-context==0.1.3 +opencensus-proto==0.1.0 +packaging==23.2 +pluggy==1.4.0 +protobuf==3.20.3 +py==1.11.0 +py-cpuinfo==9.0.0 +pyasn1==0.5.1 +pyasn1-modules==0.3.0 +pytest==7.1.3 +pytest-benchmark==4.0.0 +requests==2.31.0 +rsa==4.9 +six==1.16.0 +tomli==2.0.1 +typing_extensions==4.10.0 +urllib3==2.2.1 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e shim/opentelemetry-opencensus-shim diff --git a/shim/opentelemetry-opentracing-shim/pyproject.toml b/shim/opentelemetry-opentracing-shim/pyproject.toml index 0a2057ecfd0..79507939f4c 100644 --- a/shim/opentelemetry-opentracing-shim/pyproject.toml +++ b/shim/opentelemetry-opentracing-shim/pyproject.toml @@ -30,12 +30,6 @@ dependencies = [ "opentracing ~= 2.0", ] -[project.optional-dependencies] -test = [ - "opentelemetry-test-utils == 0.45b0.dev", - "opentracing >= 2.2.0, <3", -] - [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/shim/opentelemetry-opentracing-shim" diff --git a/shim/opentelemetry-opentracing-shim/test-requirements.txt b/shim/opentelemetry-opentracing-shim/test-requirements.txt new file mode 100644 index 00000000000..37a2afbf99f --- /dev/null +++ b/shim/opentelemetry-opentracing-shim/test-requirements.txt @@ -0,0 +1,19 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +opentracing==2.4.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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e shim/opentelemetry-opentracing-shim diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml index b6a39e492cd..6978ba5e22c 100644 --- a/tests/opentelemetry-test-utils/pyproject.toml +++ b/tests/opentelemetry-test-utils/pyproject.toml @@ -28,9 +28,6 @@ dependencies = [ "opentelemetry-sdk == 1.24.0.dev", ] -[project.optional-dependencies] -test = [] - [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python/tests/opentelemetry-test-utils" diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt new file mode 100644 index 00000000000..19b6fb58cb0 --- /dev/null +++ b/tests/opentelemetry-test-utils/test-requirements.txt @@ -0,0 +1,20 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-api +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e tests/opentelemetry-test-utils diff --git a/tox.ini b/tox.ini index 3d688944eba..3f4c9434c0f 100644 --- a/tox.ini +++ b/tox.ini @@ -100,13 +100,16 @@ commands_pre = ; Install without -e to test the actual installation py3{8,9,10,11}: python -m pip install -U pip setuptools wheel + api: pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt sdk: pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt + semantic-conventions: pip install -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt + test-utils: pip install -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt ; Install common packages for all the tests. These are not needed in all the ; cases but it saves a lot of boilerplate in this file. opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/opentelemetry-test-utils - protobuf: pip install {toxinidir}/opentelemetry-proto + protobuf: pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt getting-started: pip install -r {toxinidir}/docs/getting_started/tests/requirements.txt getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http @@ -115,10 +118,9 @@ commands_pre = getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation-flask&subdirectory=instrumentation/opentelemetry-instrumentation-flask - opencensus: pip install {toxinidir}/exporter/opentelemetry-exporter-opencensus + exporter-opencensus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt - exporter-otlp-proto-common: pip install {toxinidir}/opentelemetry-proto - exporter-otlp-proto-common: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common + exporter-otlp-proto-common: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt exporter-otlp-combined: pip install {toxinidir}/opentelemetry-proto exporter-otlp-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common @@ -130,30 +132,26 @@ commands_pre = exporter-otlp-proto-grpc: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common exporter-otlp-proto-grpc: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc - exporter-otlp-proto-http: pip install {toxinidir}/opentelemetry-proto - exporter-otlp-proto-http: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common - exporter-otlp-proto-http: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http[test] + proto3-opentelemetry-exporter-otlp-proto-http: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt + proto4-opentelemetry-exporter-otlp-proto-http: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt - opentracing-shim: pip install {toxinidir}/opentelemetry-sdk - opentracing-shim: pip install {toxinidir}/shim/opentelemetry-opentracing-shim + opentracing-shim: pip install -r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements.txt - opencensus-shim: pip install {toxinidir}/opentelemetry-sdk - opencensus-shim: pip install {toxinidir}/shim/opentelemetry-opencensus-shim[test] + opencensus-shim: pip install -r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements.txt - exporter-prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus + exporter-prometheus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements.txt exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin - exporter-zipkin-proto-http: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json - exporter-zipkin-proto-http: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http + exporter-zipkin-proto-http: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt - exporter-zipkin-json: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json + exporter-zipkin-json: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt - b3: pip install {toxinidir}/propagator/opentelemetry-propagator-b3 + propagator-b3: pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements.txt - propagator-jaeger: pip install {toxinidir}/propagator/opentelemetry-propagator-jaeger + propagator-jaeger: pip install -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt ; In order to get a healthy coverage report, ; we have to install packages in editable mode. @@ -213,24 +211,25 @@ deps = -r dev-requirements.txt commands_pre = - python -m pip install -e {toxinidir}/opentelemetry-api[test] - python -m pip install -e {toxinidir}/opentelemetry-semantic-conventions[test] + pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt + pip install -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt python -m pip install -e {toxinidir}/opentelemetry-proto[test] - python -m pip install -e {toxinidir}/tests/opentelemetry-test-utils[test] - python -m pip install -e {toxinidir}/shim/opentelemetry-opentracing-shim[test] - python -m pip install -e {toxinidir}/shim/opentelemetry-opencensus-shim[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-opencensus[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common[test] + pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt + pip install -r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements.txt + pip install -r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements.txt + pip install -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt + pip install -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt + pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http[test] + pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-prometheus[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin-json[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http[test] + pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements.txt + pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt + pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin[test] - python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-b3[test] - python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-jaeger[test] + pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements.txt + pip install -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt # Pin protobuf version due to lint failing on v3.20.0 # https://github.com/protocolbuffers/protobuf/issues/9730 python -m pip install protobuf==3.19.4