fix: timeout period when acquiring grpc exporter lock on shutdown (open-telemetry#3524)

seemk · web-flow · commit 36aaa84d1728 · 2023-11-16T19:54:01.000Z
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/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()
 
