fix: timeout period when acquiring grpc exporter lock on shutdown (op…

…en-telemetry#3524)
srikanthccv · Nov 16, 2023 · 36aaa84 · 36aaa84
1 parent 3d9de97
commit 36aaa84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## Version 1.21.0/0.42b0 (2023-11-07)
+- 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`
   ([#3390](https://github.com/open-telemetry/opentelemetry-python/pull/3390))

diff --git a/...telemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py b/...telemetry-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()