do not json dump primitive types

Author: nagarajRPoojari

logfire/_internal/json_encoder.py

@@ -16,6 +16,8 @@
 from typing import Any, Callable
 from uuid import UUID
 
+from opentelemetry.util import types as otel_types
+
 from .utils import JsonValue, safe_repr
 
 NUMPY_DIMENSION_MAX_SIZE = 10
@@ -292,13 +294,17 @@ def to_json_value(o: Any, seen: set[int]) -> JsonValue:
     return safe_repr(o)
 
 
-def logfire_json_dumps(obj: Any) -> str:
+def logfire_json_dumps(obj: Any) -> otel_types.AttributeValue:
     try:
-        return json.dumps(obj, default=lambda o: to_json_value(o, set()), separators=(',', ':'))
+        return json.dumps(obj, separators=(',', ':'))
     except Exception:
-        # fallback to eagerly calling to_json_value to take care of object keys which are not strings
-        # see https://github.com/pydantic/platform/pull/2045
-        return json.dumps(to_json_value(obj, set()), separators=(',', ':'))
+        # fallback: eagerly transform the object via to_json_value to handle
+        # non-serializable types and non-string dictionary keys.
+        json_value = to_json_value(obj, set())
+        if isinstance(json_value, (int, float, str, bool)):
+            return json_value
+
+        return json.dumps(json_value, separators=(',', ':'))
 
 
 def is_sqlalchemy(obj: Any) -> bool:

tests/test_console_exporter.py

@@ -973,10 +973,10 @@ class MyIntEnum(int, enum.Enum):
         [
             'hi',
             IsStr(),
-            '│ d=datetime.datetime(2020, 12, 31, 12, 34, 56)',
+            "│ d='2020-12-31T12:34:56'",
             '│ x=None',
-            "│ v=Decimal('1.0')",
-            "│ e=MyEnum('abc')",
+            '│ v=Decimal(1.0)',
+            "│ e='abc'",
             "│ se=MyStrEnum('str_val')",
             '│ ie=MyIntEnum(1)',
         ]

tests/test_json_args.py

@@ -1345,7 +1345,7 @@ def __repr__(self):
                     'code.filepath': 'test_json_args.py',
                     'code.function': 'test_bad_getattr',
                     'code.lineno': 123,
-                    'a': '"A()"',
+                    'a': 'A()',
                     'logfire.json_schema': '{"type":"object","properties":{"a":{"type":"object","x-python-datatype":"unknown"}}}',
                 },
             }
@@ -1413,8 +1413,8 @@ class Bar(Mixin, MagicMock):
                     'code.filepath': 'test_json_args.py',
                     'code.function': 'test_mock',
                     'code.lineno': 123,
-                    'foo': '"Foo()"',
-                    'bar': '"Bar()"',
+                    'foo': 'Foo()',
+                    'bar': 'Bar()',
                     'mock': IsStr(regex=r'^"<Mock id=\'\d+\'>"'),
                     'magic_mock': IsStr(regex=r'^"<MagicMock id=\'\d+\'>"'),
                     'logfire.json_schema': '{"type":"object","properties":{"foo":{"type":"object","x-python-datatype":"unknown"},"bar":{"type":"object","x-python-datatype":"unknown"},"mock":{"type":"object","x-python-datatype":"unknown"},"magic_mock":{"type":"object","x-python-datatype":"unknown"}}}',