Merge branch 'main' into logging-handler-exc-info-str

jourdanrodrigues · web-flow · commit 020af24266b7 · 2025-07-29T14:23:32.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,11 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 - Fix logic to deal with `LoggingHandler.exc_info` occasionally being a string ([#4699](https://github.com/open-telemetry/opentelemetry-python/pull/4699))
+
+## Version 1.36.0/0.57b0 (2025-07-29)
+
 - Add missing Prometheus exporter documentation
   ([#4485](https://github.com/open-telemetry/opentelemetry-python/pull/4485))
 - Overwrite logging.config.fileConfig and logging.config.dictConfig to ensure
 the OTLP `LogHandler` remains attached to the root logger. Fix a bug that
 can cause a deadlock to occur over `logging._lock` in some cases ([#4636](https://github.com/open-telemetry/opentelemetry-python/pull/4636)).
+- otlp-http-exporter: set default value for param `timeout_sec` in `_export` method
+  ([#4691](https://github.com/open-telemetry/opentelemetry-python/pull/4691))
 
 - Update OTLP gRPC/HTTP exporters: calling shutdown will now interrupt exporters that are sleeping
   before a retry attempt, and cause them to return failure immediately.
@@ -40,7 +45,7 @@ can cause a deadlock to occur over `logging._lock` in some cases ([#4636](https:
 - Update logger level to NOTSET in logs example
   ([#4637](https://github.com/open-telemetry/opentelemetry-python/pull/4637))
 - Logging API accepts optional `context`; deprecates `trace_id`, `span_id`, `trace_flags`.
-  ([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597)) and 
+  ([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597)) and
   ([#4668](https://github.com/open-telemetry/opentelemetry-python/pull/4668))
 - sdk: use context instead of trace_id,span_id for initializing LogRecord
   ([#4653](https://github.com/open-telemetry/opentelemetry-python/pull/4653))
diff --git a/eachdist.ini b/eachdist.ini
@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.36.0.dev
+version=1.37.0.dev
 
 packages=
     opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.57b0.dev
+version=0.58b0.dev
 
 packages=
     opentelemetry-opentracing-shim
diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
   "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
   "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opencensus-proto >= 0.1.0, < 1.0.0",
-  "opentelemetry-api >= 1.36.0.dev",
+  "opentelemetry-api >= 1.37.0.dev",
   "opentelemetry-sdk >= 1.15",
   "protobuf ~= 3.13",
   "setuptools >= 16.0",
diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.57b0.dev"
+__version__ = "0.58b0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "opentelemetry-proto == 1.36.0.dev",
+  "opentelemetry-proto == 1.37.0.dev",
 ]
 
 [project.urls]
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
@@ -30,9 +30,9 @@ dependencies = [
   "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
   "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.36.0.dev",
-  "opentelemetry-sdk ~= 1.36.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.36.0.dev",
+  "opentelemetry-proto == 1.37.0.dev",
+  "opentelemetry-sdk ~= 1.37.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.37.0.dev",
   "typing-extensions >= 4.6.0",
 ]
 
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml
@@ -28,9 +28,9 @@ classifiers = [
 dependencies = [
   "googleapis-common-protos ~= 1.52",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.36.0.dev",
-  "opentelemetry-sdk ~= 1.36.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.36.0.dev",
+  "opentelemetry-proto == 1.37.0.dev",
+  "opentelemetry-sdk ~= 1.37.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.37.0.dev",
   "requests ~= 2.7",
   "typing-extensions >= 4.5.0",
 ]
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_log_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_log_exporter/__init__.py
@@ -126,7 +126,9 @@ def __init__(
             )
         self._shutdown = False
 
-    def _export(self, serialized_data: bytes, timeout_sec: float):
+    def _export(
+        self, serialized_data: bytes, timeout_sec: Optional[float] = None
+    ):
         data = serialized_data
         if self._compression == Compression.Gzip:
             gzip_data = BytesIO()
@@ -136,6 +138,9 @@ def _export(self, serialized_data: bytes, timeout_sec: float):
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
 
+        if timeout_sec is None:
+            timeout_sec = self._timeout
+
         # By default, keep-alive is enabled in Session's request
         # headers. Backends may choose to close the connection
         # while a post happens which causes an unhandled
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py
@@ -172,7 +172,9 @@ def __init__(
         )
         self._shutdown = False
 
-    def _export(self, serialized_data: bytes, timeout_sec: float):
+    def _export(
+        self, serialized_data: bytes, timeout_sec: Optional[float] = None
+    ):
         data = serialized_data
         if self._compression == Compression.Gzip:
             gzip_data = BytesIO()
@@ -182,6 +184,9 @@ def _export(self, serialized_data: bytes, timeout_sec: float):
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
 
+        if timeout_sec is None:
+            timeout_sec = self._timeout
+
         # By default, keep-alive is enabled in Session's request
         # headers. Backends may choose to close the connection
         # while a post happens which causes an unhandled
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py
@@ -124,7 +124,9 @@ def __init__(
             )
         self._shutdown = False
 
-    def _export(self, serialized_data: bytes, timeout_sec: float):
+    def _export(
+        self, serialized_data: bytes, timeout_sec: Optional[float] = None
+    ):
         data = serialized_data
         if self._compression == Compression.Gzip:
             gzip_data = BytesIO()
@@ -134,6 +136,9 @@ def _export(self, serialized_data: bytes, timeout_sec: float):
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
 
+        if timeout_sec is None:
+            timeout_sec = self._timeout
+
         # By default, keep-alive is enabled in Session's request
         # headers. Backends may choose to close the connection
         # while a post happens which causes an unhandled
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml
@@ -27,8 +27,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-otlp-proto-grpc == 1.36.0.dev",
-  "opentelemetry-exporter-otlp-proto-http == 1.36.0.dev",
+  "opentelemetry-exporter-otlp-proto-grpc == 1.37.0.dev",
+  "opentelemetry-exporter-otlp-proto-http == 1.37.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]
diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml
@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   # DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
-  "opentelemetry-sdk ~= 1.36.0.dev",
+  "opentelemetry-sdk ~= 1.37.0.dev",
   "prometheus_client >= 0.5.0, < 1.0.0",
 ]
 
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.57b0.dev"
+__version__ = "0.58b0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml
@@ -28,7 +28,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.3",
-  "opentelemetry-exporter-zipkin-json == 1.36.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.37.0.dev",
   "opentelemetry-sdk ~= 1.11",
   "protobuf ~= 3.12",
   "requests ~= 2.7",
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml
@@ -27,8 +27,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-zipkin-json == 1.36.0.dev",
-  "opentelemetry-exporter-zipkin-proto-http == 1.36.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.37.0.dev",
+  "opentelemetry-exporter-zipkin-proto-http == 1.37.0.dev",
 ]
 
 [project.entry-points.opentelemetry_traces_exporter]
diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/opentelemetry-api/src/opentelemetry/version/__init__.py b/opentelemetry-api/src/opentelemetry/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py b/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-api == 1.36.0.dev",
-  "opentelemetry-semantic-conventions == 0.57b0.dev",
+  "opentelemetry-api == 1.37.0.dev",
+  "opentelemetry-semantic-conventions == 0.58b0.dev",
   "typing-extensions >= 4.5.0",
 ]
 
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py b/opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
@@ -22,7 +22,7 @@
 from typing import Optional, Sequence
 from unittest.mock import Mock
 
-from flaky import flaky
+import pytest
 
 from opentelemetry.sdk.metrics import Counter, MetricsTimeoutError
 from opentelemetry.sdk.metrics._internal import _Counter
@@ -194,7 +194,7 @@ def test_ticker_value_exception_on_negative(self):
             export_interval_millis=-100,
         )
 
-    @flaky(max_runs=3, min_passes=1)
+    @pytest.mark.flaky(max_runs=3, min_passes=1)
     def test_ticker_collects_metrics(self):
         exporter = FakeMetricsExporter()
 
diff --git a/opentelemetry-semantic-conventions/pyproject.toml b/opentelemetry-semantic-conventions/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "opentelemetry-api == 1.36.0.dev",
+  "opentelemetry-api == 1.37.0.dev",
   "typing-extensions >= 4.5.0",
 ]
 
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.57b0.dev"
+__version__ = "0.58b0.dev"
diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.36.0.dev"
+__version__ = "1.37.0.dev"
diff --git a/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py b/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.57b0.dev"
+__version__ = "0.58b0.dev"
diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.57b0.dev"
+__version__ = "0.58b0.dev"
diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "asgiref ~= 3.0",
-  "opentelemetry-api == 1.36.0.dev",
-  "opentelemetry-sdk == 1.36.0.dev",
+  "opentelemetry-api == 1.37.0.dev",
+  "opentelemetry-sdk == 1.37.0.dev",
 ]
 
 [project.urls]
diff --git a/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py
@@ -1 +1 @@
-__version__ = "0.57b0.dev"
+__version__ = "0.58b0.dev"

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ classifiers = [`
`26`	`26`	`"Programming Language :: Python :: 3.13",`
`27`	`27`	`]`
`28`	`28`	`dependencies = [`
`29`		`- "opentelemetry-proto == 1.36.0.dev",`
	`29`	`+ "opentelemetry-proto == 1.37.0.dev",`
`30`	`30`	`]`
`31`	`31`
`32`	`32`	`[project.urls]`