Only skip logging to console after updating span stack and indentation (#844)

Author: alexmojaki

logfire/_internal/exporters/console.py

@@ -89,10 +89,6 @@ def __init__(
     def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
         """Export the spans to the console."""
         for span in spans:
-            if span.attributes:  # pragma: no branch
-                log_level: int = span.attributes.get(ATTRIBUTES_LOG_LEVEL_NUM_KEY, _INFO_LEVEL)  # type: ignore
-                if log_level < self._min_log_level_num:
-                    continue
             self._log_span(span)
 
         return SpanExportResult.SUCCESS
@@ -102,18 +98,21 @@ def _log_span(self, span: ReadableSpan) -> None:
 
         In this simple case we just print the span if its type is not "span" - e.g. the message at the end of a span.
         """
-        if span.attributes:  # pragma: no branch
-            span_type = span.attributes.get(ATTRIBUTES_SPAN_TYPE_KEY, 'span')
-            # only print for "pending_span" (received at the start of a span) and "log" (spans with no duration)
-            if span_type == 'span' or span.attributes.get(DISABLE_CONSOLE_KEY):
-                return
-
         self._print_span(span)
 
     def _print_span(self, span: ReadableSpan, indent: int = 0):
         """Build up a summary of the span, including formatting for rich, then print it."""
         _msg, parts = self._span_text_parts(span, indent)
 
+        if span.attributes:  # pragma: no branch
+            span_type = span.attributes.get(ATTRIBUTES_SPAN_TYPE_KEY, 'span')
+            # only print for "pending_span" (received at the start of a span) and "log" (spans with no duration)
+            if span_type == 'span' or span.attributes.get(DISABLE_CONSOLE_KEY):
+                return
+            log_level: int = span.attributes.get(ATTRIBUTES_LOG_LEVEL_NUM_KEY, _INFO_LEVEL)  # type: ignore
+            if log_level < self._min_log_level_num:
+                return
+
         indent_str = (self._timestamp_indent + indent * 2) * ' '
         details_parts = self._details_parts(span, indent_str)
         if details_parts:
@@ -318,9 +317,6 @@ def _log_span(self, span: ReadableSpan) -> None:
                 self._indent_level.pop(span.context.span_id, None)
             return
 
-        if attributes.get(DISABLE_CONSOLE_KEY):  # pragma: no cover
-            return
-
         if span_type == 'pending_span':
             parent_id = _pending_span_parent(attributes)
             indent = self._indent_level.get(parent_id, 0) if parent_id else 0
@@ -372,9 +368,6 @@ def _log_span(self, span: ReadableSpan) -> None:
                     self._span_stack.pop()
             return
 
-        if attributes.get(DISABLE_CONSOLE_KEY):  # pragma: no cover
-            return
-
         self._print_span(span)
 
     def _span_text_parts(self, span: ReadableSpan, indent: int) -> tuple[str, TextParts]:

tests/test_console_exporter.py

@@ -3,6 +3,7 @@
 
 import io
 import sys
+from typing import Any
 
 import pytest
 from dirty_equals import IsStr
@@ -834,6 +835,25 @@ def test_console_exporter_invalid_text_no_color(capsys: pytest.CaptureFixture[st
     )
 
 
+def test_console_exporter_hidden_debug_span(capsys: pytest.CaptureFixture[str], config_kwargs: dict[str, Any]) -> None:
+    config_kwargs.update(console=None)
+    logfire.configure(**config_kwargs)
+
+    with logfire.span('1'):
+        # TODO this span doesn't show, but it still adds to the indentation level
+        with logfire.span('2', _level='debug'):
+            logfire.info('3')
+        logfire.info('4')
+
+    assert capsys.readouterr().out.splitlines() == snapshot(
+        [
+            '00:00:01.000 1',
+            '00:00:03.000     3',
+            '00:00:05.000   4',
+        ]
+    )
+
+
 def test_console_exporter_include_tags(capsys: pytest.CaptureFixture[str]) -> None:
     logfire.configure(
         send_to_logfire=False,