Pass remaining timeout to shutdown

Author: DylanRussell

opentelemetry-sdk/src/opentelemetry/sdk/_shared_internal/__init__.py

@@ -15,6 +15,7 @@
 from __future__ import annotations
 
 import collections
+import time
 import enum
 import inspect
 import logging
@@ -185,20 +186,26 @@ def emit(self, data: Telemetry) -> None:
     def shutdown(self, timeout_millis: int = 30000):
         if self._shutdown:
             return
+        shutdown_should_end = time.time() + timeout_millis / 1000
         # Causes emit to reject telemetry and makes force_flush a no-op.
         self._shutdown = True
         # Interrupts sleep in the worker if it's sleeping.
         self._worker_awaken.set()
         self._worker_thread.join(timeout_millis / 1000)
         # Stops worker thread from calling export again if queue is still not empty.
         self._shutdown_timeout_exceeded = True
-        # We want to shutdown immediately because we already waited `timeout_millis`.
+        # We want to shutdown immediately only if we already waited `timeout_millis`.
+        # Otherwise we pass the remaining timeout to the exporter.
         # Some exporter's shutdown support a timeout param.
         if (
             "timeout_millis"
             in inspect.getfullargspec(self._exporter.shutdown).args
         ):
-            self._exporter.shutdown(timeout_millis=0)  # type: ignore
+            remaining_time = shutdown_should_end - time.time()
+            if remaining_time < 0:
+                self._exporter.shutdown(timeout_millis=0)  # type: ignore
+            else:
+                self._exporter.shutdown(timeout_millis=remaining_time * 1000) # type: ignore
         else:
             self._exporter.shutdown()
         # Worker thread **should** be finished at this point, because we called shutdown on the exporter,