FIX-#6237: Log errors only from deepest modin layer

modin/logging/logger_decorator.py

@@ -132,8 +132,17 @@ def run_and_log(*args: Tuple, **kwargs: Dict) -> Any:
             logger_level(start_line)
             try:
                 result = obj(*args, **kwargs)
-            except BaseException:
-                get_logger("modin.logger.errors").exception(stop_line)
+            except BaseException as e:
+                # Only log the exception if a deeper layer of the modin stack has not
+                # already logged it.
+                if not hasattr(e, "_modin_logged"):
+                    # use stack_info=True so that even if we are a few layers deep in
+                    # modin, we log a stack trace that includes calls to higher layers
+                    # of modin
+                    get_logger("modin.logger.errors").exception(
+                        stop_line, stack_info=True
+                    )
+                    e._modin_logged = True  # type: ignore[attr-defined]
                 raise
             finally:
                 logger_level(stop_line)

modin/test/test_logging.py

@@ -82,7 +82,31 @@ def func(do_raise):
 
     assert "func" in get_log_messages()["info"][0]
     assert "START" in get_log_messages()["info"][0]
-    assert "STOP" in get_log_messages("modin.logger.errors")["exception"][0]
+    assert get_log_messages("modin.logger.errors")["exception"] == [
+        "STOP::PANDAS-API::func"
+    ]
+
+
+def test_function_decorator_on_outer_function_6237(monkeypatch, get_log_messages):
+    @modin.logging.enable_logging
+    def inner_func():
+        raise ValueError()
+
+    @modin.logging.enable_logging
+    def outer_func():
+        inner_func()
+
+    with monkeypatch.context() as ctx:
+        # NOTE: we cannot patch in the fixture as mockin logger.getLogger()
+        # without monkeypatch.context() breaks pytest
+        mock_get_logger(ctx)
+
+        with pytest.raises(ValueError):
+            outer_func()
+
+    assert get_log_messages("modin.logger.errors")["exception"] == [
+        "STOP::PANDAS-API::inner_func"
+    ]
 
 
 def test_class_decorator(monkeypatch, get_log_messages):