Fix merging

Author: DylanRussell

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

@@ -182,7 +182,7 @@ def emit(self, data: Telemetry) -> None:
         self._queue.appendleft(data)
         if len(self._queue) >= self._max_export_batch_size:
             self._worker_awaken.set()
-
+ 
     def shutdown(self, timeout_millis: int = 30000):
         if self._shutdown:
             return
@@ -209,8 +209,10 @@ def shutdown(self, timeout_millis: int = 30000):
             self._exporter.shutdown(timeout_millis=0)  # type: ignore
         else:
             self._exporter.shutdown()
-        # Worker thread should be finished at this point and return instantly.
-        self._worker_thread.join()
+        # Worker thread **should** be finished at this point, because we called shutdown on the exporter,
+        # and set shutdown_is_occuring to prevent further export calls. It's possible that a single export
+        # call is ongoing and the thread isn't finished. In this case we will return instead of waiting on
+        # the thread to finish.
 
     # TODO: Fix force flush so the timeout is used https://github.com/open-telemetry/opentelemetry-python/issues/4568.
     def force_flush(self, timeout_millis: Optional[int] = None) -> bool:

opentelemetry-sdk/tests/shared_internal/test_batch_processor.py

@@ -239,14 +239,15 @@ def test_shutdown_cancels_longrunning_export(self, batch_processor_class, teleme
 
     def test_shutdown_allows_1_export_to_finish(self, batch_processor_class, telemetry, caplog):
         # This exporter throws an exception if it's export sleep cannot finish.
+        dir(caplog)
         exporter = MockExporterForTesting(export_sleep=2)
         processor = batch_processor_class(
             exporter,
             max_queue_size=200,
             max_export_batch_size=1,
             schedule_delay_millis=30000,
         )
-        # Max export batch size is 1, so 3 emit calls requires 3 separate calls to Export to clear the queue.
+        # Max export batch size is 1, so 3 emit calls requires 3 separate calls (each block for 2 seconds) to Export to clear the queue.
         processor._batch_processor.emit(telemetry)
         processor._batch_processor.emit(telemetry)
         processor._batch_processor.emit(telemetry)