Merge branch 'master' into ivana/set-global-attrs-on-global-scope

sentrivana · sentrivana · commit 06bc98273d52 · 2025-12-19T10:20:01.000+01:00
diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
@@ -34,7 +34,6 @@
         "deps": {
             "*": ["async-timeout", "pytest-asyncio", "fakeredis>=2.2.0,<2.8"],
             "<=0.23": ["pydantic<2"],
-            "py3.7": ["pydantic<1.10.25"],
         },
         "num_versions": 2,
     },
@@ -134,7 +133,6 @@
             # deprecated argument.
             "<0.110.1": ["httpx<0.28.0"],
             "py3.6": ["aiocontextvars"],
-            "py3.7": ["pydantic<1.10.25"],
         },
     },
     "flask": {
diff --git a/scripts/populate_tox/package_dependencies.jsonl b/scripts/populate_tox/package_dependencies.jsonl
diff --git a/scripts/populate_tox/releases.jsonl b/scripts/populate_tox/releases.jsonl
diff --git a/tests/test_attributes.py b/tests/test_attributes.py
@@ -117,3 +117,41 @@ def test_remove_attribute(sentry_init, capture_envelopes):
     (metric,) = metrics
 
     assert "some.attribute" not in metric["attributes"]
+
+
+def test_scope_attributes_preserialized(sentry_init, capture_envelopes):
+    def before_send_metric(metric, _):
+        # Scope attrs show up serialized in before_send
+        assert isinstance(metric["attributes"]["instance"], str)
+        assert isinstance(metric["attributes"]["dictionary"], str)
+
+        return metric
+
+    sentry_init(before_send_metric=before_send_metric)
+
+    envelopes = capture_envelopes()
+
+    class Cat:
+        pass
+
+    instance = Cat()
+    dictionary = {"color": "tortoiseshell"}
+
+    with sentry_sdk.new_scope() as scope:
+        scope.set_attribute("instance", instance)
+        scope.set_attribute("dictionary", dictionary)
+
+        # Scope attrs are stored preserialized
+        assert isinstance(scope._attributes["instance"], str)
+        assert isinstance(scope._attributes["dictionary"], str)
+
+        sentry_sdk.metrics.count("test", 1)
+
+    sentry_sdk.get_client().flush()
+
+    metrics = envelopes_to_metrics(envelopes)
+    (metric,) = metrics
+
+    # Attrs originally from the scope are serialized when sent
+    assert isinstance(metric["attributes"]["instance"], str)
+    assert isinstance(metric["attributes"]["dictionary"], str)
diff --git a/tests/test_logs.py b/tests/test_logs.py
@@ -597,3 +597,40 @@ def test_log_attributes_override_scope_attributes(sentry_init, capture_envelopes
 
     assert log["attributes"]["durable.attribute"] == "value1"
     assert log["attributes"]["temp.attribute"] == "value2"
+
+
+@minimum_python_37
+def test_attributes_preserialized_in_before_send(sentry_init, capture_envelopes):
+    """We don't surface references to objects in attributes."""
+
+    def before_send_log(log, _):
+        assert isinstance(log["attributes"]["instance"], str)
+        assert isinstance(log["attributes"]["dictionary"], str)
+
+        return log
+
+    sentry_init(enable_logs=True, before_send_log=before_send_log)
+
+    envelopes = capture_envelopes()
+
+    class Cat:
+        pass
+
+    instance = Cat()
+    dictionary = {"color": "tortoiseshell"}
+
+    sentry_sdk.logger.warning(
+        "Hello world!",
+        attributes={
+            "instance": instance,
+            "dictionary": dictionary,
+        },
+    )
+
+    get_client().flush()
+
+    logs = envelopes_to_logs(envelopes)
+    (log,) = logs
+
+    assert isinstance(log["attributes"]["instance"], str)
+    assert isinstance(log["attributes"]["dictionary"], str)
diff --git a/tests/test_metrics.py b/tests/test_metrics.py
@@ -335,3 +335,40 @@ def test_metric_attributes_override_scope_attributes(sentry_init, capture_envelo
 
     assert metric["attributes"]["durable.attribute"] == "value1"
     assert metric["attributes"]["temp.attribute"] == "value2"
+
+
+def test_attributes_preserialized_in_before_send(sentry_init, capture_envelopes):
+    """We don't surface references to objects in attributes."""
+
+    def before_send_metric(metric, _):
+        assert isinstance(metric["attributes"]["instance"], str)
+        assert isinstance(metric["attributes"]["dictionary"], str)
+
+        return metric
+
+    sentry_init(before_send_metric=before_send_metric)
+
+    envelopes = capture_envelopes()
+
+    class Cat:
+        pass
+
+    instance = Cat()
+    dictionary = {"color": "tortoiseshell"}
+
+    sentry_sdk.metrics.count(
+        "test.counter",
+        1,
+        attributes={
+            "instance": instance,
+            "dictionary": dictionary,
+        },
+    )
+
+    get_client().flush()
+
+    metrics = envelopes_to_metrics(envelopes)
+    (metric,) = metrics
+
+    assert isinstance(metric["attributes"]["instance"], str)
+    assert isinstance(metric["attributes"]["dictionary"], str)
diff --git a/tox.ini b/tox.ini
@@ -71,12 +71,12 @@ envlist =
     {py3.10,py3.11,py3.12}-openai_agents-v0.0.19
     {py3.10,py3.12,py3.13}-openai_agents-v0.2.11
     {py3.10,py3.12,py3.13}-openai_agents-v0.4.2
-    {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.6.3
+    {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.6.4
 
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.0.18
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.12.0
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.24.0
-    {py3.10,py3.12,py3.13}-pydantic_ai-v1.35.0
+    {py3.10,py3.12,py3.13}-pydantic_ai-v1.36.0
 
 
     # ~~~ AI Workflow ~~~
@@ -101,7 +101,7 @@ envlist =
     {py3.9,py3.10,py3.11}-cohere-v5.4.0
     {py3.9,py3.11,py3.12}-cohere-v5.10.0
     {py3.9,py3.11,py3.12}-cohere-v5.15.0
-    {py3.9,py3.11,py3.12}-cohere-v5.20.0
+    {py3.9,py3.11,py3.12}-cohere-v5.20.1
 
     {py3.9,py3.12,py3.13}-google_genai-v1.29.0
     {py3.9,py3.12,py3.13}-google_genai-v1.38.0
@@ -119,18 +119,18 @@ envlist =
 
     {py3.8,py3.11,py3.12}-openai-base-v1.0.1
     {py3.8,py3.12,py3.13}-openai-base-v1.109.1
-    {py3.9,py3.13,py3.14,py3.14t}-openai-base-v2.13.0
+    {py3.9,py3.13,py3.14,py3.14t}-openai-base-v2.14.0
 
     {py3.8,py3.11,py3.12}-openai-notiktoken-v1.0.1
     {py3.8,py3.12,py3.13}-openai-notiktoken-v1.109.1
-    {py3.9,py3.13,py3.14,py3.14t}-openai-notiktoken-v2.13.0
+    {py3.9,py3.13,py3.14,py3.14t}-openai-notiktoken-v2.14.0
 
 
     # ~~~ Cloud ~~~
     {py3.6,py3.7}-boto3-v1.12.49
     {py3.6,py3.9,py3.10}-boto3-v1.21.46
     {py3.7,py3.11,py3.12}-boto3-v1.33.13
-    {py3.9,py3.13,py3.14,py3.14t}-boto3-v1.42.12
+    {py3.9,py3.13,py3.14,py3.14t}-boto3-v1.42.13
 
     {py3.6,py3.7,py3.8}-chalice-v1.16.0
     {py3.9,py3.12,py3.13}-chalice-v1.32.0
@@ -396,13 +396,13 @@ deps =
     openai_agents-v0.0.19: openai-agents==0.0.19
     openai_agents-v0.2.11: openai-agents==0.2.11
     openai_agents-v0.4.2: openai-agents==0.4.2
-    openai_agents-v0.6.3: openai-agents==0.6.3
+    openai_agents-v0.6.4: openai-agents==0.6.4
     openai_agents: pytest-asyncio
 
     pydantic_ai-v1.0.18: pydantic-ai==1.0.18
     pydantic_ai-v1.12.0: pydantic-ai==1.12.0
     pydantic_ai-v1.24.0: pydantic-ai==1.24.0
-    pydantic_ai-v1.35.0: pydantic-ai==1.35.0
+    pydantic_ai-v1.36.0: pydantic-ai==1.36.0
     pydantic_ai: pytest-asyncio
 
 
@@ -444,7 +444,7 @@ deps =
     cohere-v5.4.0: cohere==5.4.0
     cohere-v5.10.0: cohere==5.10.0
     cohere-v5.15.0: cohere==5.15.0
-    cohere-v5.20.0: cohere==5.20.0
+    cohere-v5.20.1: cohere==5.20.1
 
     google_genai-v1.29.0: google-genai==1.29.0
     google_genai-v1.38.0: google-genai==1.38.0
@@ -465,14 +465,14 @@ deps =
 
     openai-base-v1.0.1: openai==1.0.1
     openai-base-v1.109.1: openai==1.109.1
-    openai-base-v2.13.0: openai==2.13.0
+    openai-base-v2.14.0: openai==2.14.0
     openai-base: pytest-asyncio
     openai-base: tiktoken
     openai-base-v1.0.1: httpx<0.28
 
     openai-notiktoken-v1.0.1: openai==1.0.1
     openai-notiktoken-v1.109.1: openai==1.109.1
-    openai-notiktoken-v2.13.0: openai==2.13.0
+    openai-notiktoken-v2.14.0: openai==2.14.0
     openai-notiktoken: pytest-asyncio
     openai-notiktoken-v1.0.1: httpx<0.28
 
@@ -481,7 +481,7 @@ deps =
     boto3-v1.12.49: boto3==1.12.49
     boto3-v1.21.46: boto3==1.21.46
     boto3-v1.33.13: boto3==1.33.13
-    boto3-v1.42.12: boto3==1.42.12
+    boto3-v1.42.13: boto3==1.42.13
     {py3.7,py3.8}-boto3: urllib3<2.0.0
 
     chalice-v1.16.0: chalice==1.16.0
@@ -594,7 +594,6 @@ deps =
     arq: pytest-asyncio
     arq: fakeredis>=2.2.0,<2.8
     arq-v0.23: pydantic<2
-    {py3.7}-arq: pydantic<1.10.25
 
     beam-v2.14.0: apache-beam==2.14.0
     beam-v2.70.0: apache-beam==2.70.0
@@ -696,7 +695,6 @@ deps =
     fastapi-v0.94.1: httpx<0.28.0
     fastapi-v0.109.2: httpx<0.28.0
     {py3.6}-fastapi: aiocontextvars
-    {py3.7}-fastapi: pydantic<1.10.25
 
 
     # ~~~ Web 2 ~~~
