Merge branch 'major/3.0' into ivana/major/clean-up-weird-client-options

Author: sentrivana

MIGRATION_GUIDE.md

@@ -122,6 +122,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - Dropped support for Pydantic AI below 1.76.
 - Dropped support for OpenAI Agents below 0.10.3.
 - Dropped support for MCP below 2.0.
+- Dropped support for Hugging Face Hub below 2.0.
 - Removed the `transaction_style` option from server integrations (DjangoIntegration, StarletteIntegration, FastApiIntegration, AioHttpIntegration, FlaskIntegration, PyramidIntegration, QuartIntegration, BottleIntegration, FalconIntegration, StarliteIntegration and LitestarIntegration).
 - Removed the RedisIntegration `max_data_size` option.
 - Removed the possibility to supply a specific client to the LaunchDarklyIntegration.
@@ -163,6 +164,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - The `trace_ignore_status_codes` option was removed.
 - `add_attachment` no longer accepts an `add_to_transactions` argument.
 - The `stream_gen_ai_spans` option was removed. All spans are streamed now.
+- The `data_collection` option is no longer accessible under `_experiments`. Use it as a top-level option instead.
 - The experimental `record_sql_params` option was removed. Use the `database_query_data` setting of `data_collection` instead.
 - The `record_params` option of `AsyncPGIntegration` and `AioMySQLIntegration` was removed. Use the `database_query_data` setting of `data_collection` instead.
 - The `include_local_variables` option was removed. Use `data_collection`'s `stack_frame_variables` as a drop-in replacement.

scripts/populate_tox/config.py

@@ -234,8 +234,7 @@
     "huggingface_hub": {
         "package": "huggingface_hub",
         "deps": {
-            "*": ["responses", "pytest-httpx"],
-            ">=2": ["httpx2-pytest"],
+            "*": ["httpx2-pytest"],
         },
     },
     "langchain-base": {

scripts/populate_tox/package_dependencies.jsonl

@@ -72,7 +72,6 @@ class CompressionAlgo(Enum):
             "transport_num_pools": Optional[int],
             "transport_http2": Optional[bool],
             "transport_async": Optional[bool],
-            "data_collection": Optional[DataCollectionUserOptions],
         },
         total=False,
     )

scripts/populate_tox/releases.jsonl

@@ -146,7 +146,7 @@ def iter_default_integrations(
     "httpx": (0, 16, 0),
     "httpx2": (2, 0, 0),
     "huey": (2, 0),
-    "huggingface_hub": (0, 24, 7),
+    "huggingface_hub": (2, 0, 0),
     "langchain": (0, 1, 0),
     "langgraph": (0, 6, 6),
     "launchdarkly": (9, 8, 0),

sentry_sdk/consts.py

@@ -630,25 +630,25 @@ def serialize_frame(
             frame, tb_lineno, max_value_length
         )
 
-        dc_stack_frame_vars_config = data_collection["stack_frame_variables"]
+    dc_stack_frame_vars_config = data_collection["stack_frame_variables"]
 
-        if isinstance(dc_stack_frame_vars_config, bool):
-            if dc_stack_frame_vars_config:
-                rv["vars"] = serialize(
-                    dict(frame.f_locals), is_vars=True, custom_repr=custom_repr
-                )
-        else:
-            local_variables_to_send = _apply_key_value_collection_filtering(
-                items=dict(frame.f_locals),
-                behaviour=dc_stack_frame_vars_config,
+    if isinstance(dc_stack_frame_vars_config, bool):
+        if dc_stack_frame_vars_config:
+            rv["vars"] = serialize(
+                dict(frame.f_locals), is_vars=True, custom_repr=custom_repr
             )
+    else:
+        local_variables_to_send = _apply_key_value_collection_filtering(
+            items=dict(frame.f_locals),
+            behaviour=dc_stack_frame_vars_config,
+        )
 
-            if local_variables_to_send:
-                serialized_variables = serialize(
-                    local_variables_to_send, is_vars=True, custom_repr=custom_repr
-                )
+        if local_variables_to_send:
+            serialized_variables = serialize(
+                local_variables_to_send, is_vars=True, custom_repr=custom_repr
+            )
 
-                rv["vars"] = serialized_variables
+            rv["vars"] = serialized_variables
 
     return rv