Merge branch 'log_batcher' of github.com:getsentry/sentry-python into log_batcher

Author: antonpirker

sentry_sdk/_log_batcher.py

@@ -1,11 +1,10 @@
-import json
 import os
 import random
 import threading
 from datetime import datetime, timezone
 from typing import Optional, List, Callable, TYPE_CHECKING, Any
 
-from sentry_sdk.utils import format_timestamp
+from sentry_sdk.utils import format_timestamp, safe_repr
 from sentry_sdk.envelope import Envelope
 
 if TYPE_CHECKING:
@@ -110,7 +109,7 @@ def format_attribute(key, val):
                 return {"key": key, "value": {"doubleValue": val}}
             if isinstance(val, str):
                 return {"key": key, "value": {"stringValue": val}}
-            return {"key": key, "value": {"stringValue": json.dumps(val)}}
+            return {"key": key, "value": {"stringValue": safe_repr(val)}}
 
         otel_log = {
             "severityText": log["severity_text"],

sentry_sdk/integrations/anthropic.py

@@ -184,8 +184,7 @@ def new_iterator():
                     input_tokens, output_tokens, content_blocks = _collect_ai_data(
                         event, input_tokens, output_tokens, content_blocks
                     )
-                    if event.type != "message_stop":
-                        yield event
+                    yield event
 
                 _add_ai_data_to_span(
                     span, integration, input_tokens, output_tokens, content_blocks
@@ -202,8 +201,7 @@ async def new_iterator_async():
                     input_tokens, output_tokens, content_blocks = _collect_ai_data(
                         event, input_tokens, output_tokens, content_blocks
                     )
-                    if event.type != "message_stop":
-                        yield event
+                    yield event
 
                 _add_ai_data_to_span(
                     span, integration, input_tokens, output_tokens, content_blocks

sentry_sdk/integrations/logging.py

@@ -365,7 +365,12 @@ def _capture_log_from_record(client, record):
             if isinstance(record.args, tuple):
                 for i, arg in enumerate(record.args):
                     attrs[f"sentry.message.parameters.{i}"] = (
-                        arg if isinstance(arg, str) else safe_repr(arg)
+                        arg
+                        if isinstance(arg, str)
+                        or isinstance(arg, float)
+                        or isinstance(arg, int)
+                        or isinstance(arg, bool)
+                        else safe_repr(arg)
                     )
         if record.lineno:
             attrs["code.line.number"] = record.lineno

sentry_sdk/logger.py

@@ -18,7 +18,10 @@ def _capture_log(severity_text, severity_number, template, **kwargs):
     if "attributes" in kwargs:
         attrs.update(kwargs.pop("attributes"))
     for k, v in kwargs.items():
-        attrs[f"sentry.message.parameters.{k}"] = (
+        attrs[f"sentry.message.parameters.{k}"] = v
+
+    attrs = {
+        k: (
             v
             if (
                 isinstance(v, str)
@@ -28,6 +31,8 @@ def _capture_log(severity_text, severity_number, template, **kwargs):
             )
             else safe_repr(v)
         )
+        for (k, v) in attrs.items()
+    }
 
     # noinspection PyProtectedMember
     client._capture_experimental_log(