From 73826d12c446aff0eb64328402345e307f883cee Mon Sep 17 00:00:00 2001 From: Siim Kallas Date: Fri, 10 Nov 2023 18:20:16 +0200 Subject: [PATCH 1/2] fix: timeout period when acquiring grpc exporter lock on shutdown --- .../src/opentelemetry/exporter/otlp/proto/grpc/exporter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py index dd169ff239..67188d04a4 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py @@ -322,7 +322,7 @@ def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None: logger.warning("Exporter already shutdown, ignoring call") return # wait for the last export if any - self._export_lock.acquire(timeout=timeout_millis) + self._export_lock.acquire(timeout=timeout_millis / 1e3) self._shutdown = True self._export_lock.release() From 89a8d5cbcd1cb1064a4be80368cd602aaff4e868 Mon Sep 17 00:00:00 2001 From: Siim Kallas Date: Fri, 10 Nov 2023 18:31:46 +0200 Subject: [PATCH 2/2] chore: update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db8b1b26d9..fa1ad66ccf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +- Fix OTLPExporterMixin shutdown timeout period + ([#3524](https://github.com/open-telemetry/opentelemetry-python/pull/3524)) + ## Version 1.21.0/0.42b0 (2023-11-01) - Fix `SumAggregation`