Remove print statements and changes from shutdown branch

Author: DylanRussell

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

@@ -132,27 +132,17 @@ def worker(self):
             # https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#batching-processor.
             # Shutdown will interrupt this sleep. Emit will interrupt this sleep only if the queue is bigger then threshold.
             sleep_interrupted = self._worker_awaken.wait(self._schedule_delay)
-            print(
-                "In worker loop:{}, {}, {}".format(
-                    sleep_interrupted,
-                    self._schedule_delay,
-                    self._schedule_delay_millis,
-                )
-            )
             if self._shutdown:
-                print("Shutdown is set...")
                 break
             self._export(
                 BatchExportStrategy.EXPORT_WHILE_BATCH_EXCEEDS_THRESHOLD
                 if sleep_interrupted
                 else BatchExportStrategy.EXPORT_AT_LEAST_ONE_BATCH
             )
             self._worker_awaken.clear()
-        print("last export bach...")
         self._export(BatchExportStrategy.EXPORT_ALL)
 
     def _export(self, batch_strategy: BatchExportStrategy) -> None:
-        print("export started...:{}".format(batch_strategy))
         with self._export_lock:
             iteration = 0
             # We could see concurrent export calls from worker and force_flush. We call _should_export_batch
@@ -161,7 +151,6 @@ def _export(self, batch_strategy: BatchExportStrategy) -> None:
                 iteration += 1
                 token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
                 try:
-                    print("SIZE: {}".format(len(self._queue)))
                     self._exporter.export(
                         [
                             # Oldest records are at the back, so pop from there.
@@ -174,7 +163,6 @@ def _export(self, batch_strategy: BatchExportStrategy) -> None:
                             )
                         ]
                     )
-                    print("export succeded??")
                 except Exception:  # pylint: disable=broad-exception-caught
                     self._logger.exception(
                         "Exception while exporting %s.", self._exporting
@@ -194,32 +182,16 @@ def emit(self, data: Telemetry) -> None:
         if len(self._queue) >= self._max_export_batch_size:
             self._worker_awaken.set()
 
-    # LoggerProvider calls shutdown without arguments currently, so the default is used.
-    def shutdown(self, timeout_millis=30000):
+    def shutdown(self):
         if self._shutdown:
             return
         # Prevents emit and force_flush from further calling export.
         self._shutdown = True
-        # Interrupts sleep in the worker if it's sleeping.
+        # Interrupts sleep in the worker, if it's sleeping.
         self._worker_awaken.set()
-        # Wait a tiny bit for the worker thread to wake and call export for a final time.
-        time.sleep(0.1)
-        # We will force shutdown after 30 seconds.
-        for _ in range(10):
-            # If export is not being called, we can shutdown.
-            if not self._export_lock.locked():
-                break
-            time.sleep(timeout_millis / 1000 / 10)
-        # We want to shutdown immediately because we already waited 30 seconds. 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
-        else:
-            self._exporter.shutdown()
-        # Worker thread should be finished at this point and return instantly.
+        # Main worker loop should exit after one final export call with flush all strategy.
         self._worker_thread.join()
+        self._exporter.shutdown()
 
     # 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

@@ -208,33 +208,3 @@ def test_record_processor_is_garbage_collected(
 
         # Then the reference to the processor should no longer exist
         assert weak_ref() is None
-
-    def test_shutdown_waits_30sec_before_cancelling_export(
-        self, batch_processor_class, telemetry, caplog
-    ):
-        resp = Response()
-        resp.status_code = 200
-
-        def export_side_effect(*args, **kwargs):
-            time.sleep(5)
-            return resp
-
-        if type(BASIC_SPAN) is type(telemetry):
-            exporter = OTLPSpanExporter()
-        else:
-            exporter = OTLPLogExporter()
-
-        with patch.object(Session, "post") as mock_post:
-            mock_post.side_effect = export_side_effect
-            processor = batch_processor_class(
-                exporter,
-                max_queue_size=200,
-                max_export_batch_size=10,
-                schedule_delay_millis=30000,
-            )
-            print("emitting..")
-            processor._batch_processor.emit(telemetry)
-            print("shutting down..")
-            processor.shutdown(timeout_millis=4000)
-            print("finished shutting down..")
-        print(caplog.record_tuples)