Merge branch 'open-telemetry:main' into rbtz/expHistToJson

rbtz-openai · web-flow · commit fa9c696a7651 · 2024-03-18T19:51:53.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/shim/opentelemetry-opencensus-shim/pyproject.toml b/shim/opentelemetry-opencensus-shim/pyproject.toml
diff --git a/shim/opentelemetry-opencensus-shim/test-requirements.txt b/shim/opentelemetry-opencensus-shim/test-requirements.txt
diff --git a/shim/opentelemetry-opentracing-shim/pyproject.toml b/shim/opentelemetry-opentracing-shim/pyproject.toml
diff --git a/shim/opentelemetry-opentracing-shim/test-requirements.txt b/shim/opentelemetry-opentracing-shim/test-requirements.txt
diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml
diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,6 @@ dependencies = [`
`33`	`33`	`"setuptools >= 16.0",`
`34`	`34`	`]`
`35`	`35`
`36`		`-[project.optional-dependencies]`
`37`		`-test = []`
`38`		`-`
`39`	`36`	`[project.entry-points.opentelemetry_traces_exporter]`
`40`	`37`	`opencensus = "opentelemetry.exporter.opencensus.trace_exporter:OpenCensusSpanExporter"`
`41`	`38`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,6 @@ dependencies = [`
`27`	`27`	`"opentelemetry-proto == 1.24.0.dev",`
`28`	`28`	`]`
`29`	`29`
`30`		`-[project.optional-dependencies]`
`31`		`-test = []`
`32`		`-`
`33`	`30`	`[project.urls]`
`34`	`31`	`Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common"`
`35`	`32`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,6 @@ dependencies = [`
`30`	`30`	`"prometheus_client >= 0.5.0, < 1.0.0",`
`31`	`31`	`]`
`32`	`32`
`33`		`-[project.optional-dependencies]`
`34`		`-test = []`
`35`		`-`
`36`	`33`	`[project.entry-points.opentelemetry_metrics_exporter]`
`37`	`34`	`prometheus = "opentelemetry.exporter.prometheus:_AutoPrometheusMetricReader"`
`38`	`35`