Merge branch 'potel-base' into srothh/complete-async-transport

Author: srothh

CHANGELOG.md

@@ -20,6 +20,48 @@ for your feedback. How was the migration? Is everything working as expected? Is
 [on GitHub](https://github.com/getsentry/sentry-python/discussions/3936) or
 [on Discord](https://discord.com/invite/Ww9hbqr).
 
+## 2.34.1
+
+### Various fixes & improvements
+
+- Fix: Make sure Span data in AI instrumentations is always a primitive data type (#4643) by @antonpirker
+- Fix: Typo in CHANGELOG.md (#4640) by @jgillard
+
+## 2.34.0
+
+### Various fixes & improvements
+
+- Considerably raise `DEFAULT_MAX_VALUE_LENGTH` (#4632) by @sentrivana
+
+  We have increased the string trimming limit considerably, allowing you to see more data
+  without it being truncated. Note that this might, in rare cases, result in issue regrouping,
+  for example if you're capturing message events with very long messages (longer than the
+  default 1024 characters/bytes).
+
+  If you want to adjust the limit, you can set a
+  [`max_value_length`](https://docs.sentry.io/platforms/python/configuration/options/#max_value_length)
+  in your `sentry_sdk.init()`.
+
+- `OpenAI` integration update (#4612) by @antonpirker
+
+  The `OpenAIIntegration` now supports [OpenAI Responses API](https://platform.openai.com/docs/api-reference/responses).
+
+  The data captured will also show up in the new [AI Agents Dashboard](https://docs.sentry.io/product/insights/agents/dashboard/).
+
+  This works out of the box, nothing to do on your side.
+
+- Expose `set_transaction_name` (#4634) by @sl0thentr0py
+- Fix(Celery): Latency should be in milliseconds, not seconds (#4637) by @sentrivana
+- Fix(Django): Treat `django.template.context.BasicContext` as sequence in serializer (#4621) by @sl0thentr0py
+- Fix(Huggingface): Fix `huggingface_hub` CI tests. (#4619) by @antonpirker
+- Fix: Ignore deliberate thread exception warnings (#4611) by @sl0thentr0py
+- Fix: Socket tests to not use example.com (#4627) by @sl0thentr0py
+- Fix: Threading run patch (#4610) by @sl0thentr0py
+- Tests: Simplify celery double patching test (#4626) by @sl0thentr0py
+- Tests: Remove remote example.com calls (#4622) by @sl0thentr0py
+- Tests: tox.ini update (#4635) by @sentrivana
+- Tests: Update tox (#4609) by @sentrivana
+
 ## 2.33.2
 
 ### Various fixes & improvements

MIGRATION_GUIDE.md

@@ -10,28 +10,41 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 
 ### Changed
 
+#### General
+
 - The SDK now supports Python 3.7 and higher.
-- The default of `traces_sample_rate` changed to `0`. Meaning: Incoming traces will be continued by default. For example, if your frontend sends a `sentry-trace/baggage` headers pair, your SDK will create Spans and send them to Sentry. (The default used to be `None` meaning by default no Spans where created, no matter what headers the frontend sent to your project.) See also: https://docs.sentry.io/platforms/python/configuration/options/#traces_sample_rate
 - Tag values on event dictionaries, which are passed to `before_send` and `before_send_transaction`, now are always `str` values. Previously, despite tag values being typed as `str`, they often had different values. Therefore, if you have configured any `before_send` and `before_send_transaction` functions which perform some logic based on tag values, you need to check and if needed update those functions to correctly handle `str` values.
+
+#### Error Capturing
+
+- We updated how we handle `ExceptionGroup`s. You will now get more data if `ExceptionGroup`s are appearing in chained exceptions. It could happen that after updating the SDK the grouping of issues change because of this. So eventually you will see the same exception in two Sentry issues (one from before the update, one from after the update).
+
+#### Tracing
+
+- The default of `traces_sample_rate` changed to `0`. Meaning: Incoming traces will be continued by default. For example, if your frontend sends a `sentry-trace/baggage` headers pair, your SDK will create Spans and send them to Sentry. (The default used to be `None` meaning by default no Spans where created, no matter what headers the frontend sent to your project.) See also: https://docs.sentry.io/platforms/python/configuration/options/#traces_sample_rate
 - `sentry_sdk.start_span` now only takes keyword arguments.
 - `sentry_sdk.start_transaction`/`sentry_sdk.start_span` no longer takes the following arguments: `span`, `parent_sampled`, `trace_id`, `span_id` or `parent_span_id`.
-- You can no longer change the sampled status of a span with `span.sampled = False` after starting it.
+- `sentry_sdk.continue_trace` no longer returns a `Transaction` and is now a context manager.
+- You can no longer change the sampled status of a span with `span.sampled = False` after starting it. The sampling decision needs to be either be made in the `traces_sampler`, or you need to pass an explicit `sampled` parameter to `start_span`.
 - The `Span()` constructor does not accept a `hub` parameter anymore.
-- The `sentry_sdk.Scope()` constructor no longer accepts a `client` parameter.
 - `Span.finish()` does not accept a `hub` parameter anymore.
-- `Span.finish()` no longer returns the `event_id` if the event is sent to sentry.
+- `Span.finish()` no longer returns the `event_id` if the event is sent to Sentry.
+- The `sampling_context` argument of `traces_sampler` now additionally contains all span attributes known at span start.
+- The `SentrySpanProcessor` and `SentryPropagator` are exported from `sentry_sdk.opentelemetry` instead of `sentry_sdk.integrations.opentelemetry`.
+
+#### Profiling
+
+- The `sampling_context` argument of `profiles_sampler` now additionally contains all span attributes known at span start.
 - The `Profile()` constructor does not accept a `hub` parameter anymore.
 - A `Profile` object does not have a `.hub` property anymore.
 - `MAX_PROFILE_DURATION_NS`, `PROFILE_MINIMUM_SAMPLES`, `Profile`, `Scheduler`, `ThreadScheduler`, `GeventScheduler`, `has_profiling_enabled`, `setup_profiler`, `teardown_profiler` are no longer accessible from `sentry_sdk.profiler`. They're still accessible from `sentry_sdk.profiler.transaction_profiler`.
 - `DEFAULT_SAMPLING_FREQUENCY`, `MAX_STACK_DEPTH`, `get_frame_name`, `extract_frame`, `extract_stack`, `frame_id` are no longer accessible from `sentry_sdk.profiler`. They're still accessible from `sentry_sdk.profiler.utils`.
-- `sentry_sdk.continue_trace` no longer returns a `Transaction` and is now a context manager.
-- Redis integration: In Redis pipeline spans there is no `span["data"]["redis.commands"]` that contains a dict `{"count": 3, "first_ten": ["cmd1", "cmd2", ...]}` but instead `span["data"]["redis.commands.count"]` (containing `3`) and `span["data"]["redis.commands.first_ten"]` (containing `["cmd1", "cmd2", ...]`).
-- clickhouse-driver integration: The query is now available under the `db.query.text` span attribute (only if `send_default_pii` is `True`).
-- `sentry_sdk.init` now returns `None` instead of a context manager.
-- The `sampling_context` argument of `traces_sampler` and `profiles_sampler` now additionally contains all span attributes known at span start.
-- We updated how we handle `ExceptionGroup`s. You will now get more data if ExceptionGroups are appearing in chained exceptions. It could happen that after updating the SDK the grouping of issues change because of this. So eventually you will see the same exception in two Sentry issues (one from before the update, one from after the update)
-- The integration for Python `logging` module does not send Sentry issues by default anymore when calling `logging.error()`, `logging.critical()` or `logging.exception()`. If you want to preserve the old behavior use `sentry_sdk.init(integrations=[LoggingIntegration(event_level="ERROR")])`.
-- The `SentrySpanProcessor` and `SentryPropagator` are exported from `sentry_sdk.opentelemetry` instead of `sentry_sdk.integrations.opentelemetry`.
+
+
+#### Integrations
+- Redis: In Redis pipeline spans there is no `span["data"]["redis.commands"]` that contains a dict `{"count": 3, "first_ten": ["cmd1", "cmd2", ...]}` but instead `span["data"]["redis.commands.count"]` (containing `3`) and `span["data"]["redis.commands.first_ten"]` (containing `["cmd1", "cmd2", ...]`).
+- clickhouse-driver: The query is now available under the `db.query.text` span attribute (only if `send_default_pii` is `True`).
+- Logging: By default, the SDK won't capture Sentry issues anymore when calling `logging.error()`, `logging.critical()` or `logging.exception()`. If you want to preserve the old behavior use `sentry_sdk.init(integrations=[LoggingIntegration(event_level="ERROR")])`.
 - The integration-specific content of the `sampling_context` argument of `traces_sampler` and `profiles_sampler` now looks different.
 
   - The Celery integration doesn't add the `celery_job` dictionary anymore. Instead, the individual keys are now available as:
@@ -136,54 +149,88 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
     | `gcp_event.query_string`          | `url.query`                    |
     | `gcp_event.headers`               | `http.request.header.{header}` |
 
+#### Internals
+
+- The `sentry_sdk.Scope()` constructor no longer accepts a `client` parameter.
+- `sentry_sdk.init` now returns `None` instead of a context manager.
+
 ### Removed
 
+#### General
+
 - Dropped support for Python 3.6.
+- `set_measurement` has been removed.
+- Setting `Scope.user` directly is no longer supported. Use `Scope.set_user()` instead.
+
+#### Tracing
+
 - The `enable_tracing` `init` option has been removed. Configure `traces_sample_rate` directly.
 - The `propagate_traces` `init` option has been removed. Use `trace_propagation_targets` instead.
 - The `custom_sampling_context` parameter of `start_transaction` has been removed. Use `attributes` instead to set key-value pairs of data that should be accessible in the traces sampler. Note that span attributes need to conform to the [OpenTelemetry specification](https://opentelemetry.io/docs/concepts/signals/traces/#attributes), meaning only certain types can be set as values.
-- `set_measurement` has been removed.
-- The PyMongo integration no longer sets tags. The data is still accessible via span attributes.
-- The PyMongo integration doesn't set `operation_ids` anymore. The individual IDs (`operation_id`, `request_id`, `session_id`) are now accessible as separate span attributes.
-- `sentry_sdk.metrics` and associated metrics APIs have been removed as Sentry no longer accepts metrics data in this form. See https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-to-Metrics
-- The experimental options `enable_metrics`, `before_emit_metric` and `metric_code_locations` have been removed.
 - When setting span status, the HTTP status code is no longer automatically added as a tag.
-- Class `Hub` has been removed.
-- Class `_ScopeManager` has been removed.
-- The context manager `auto_session_tracking()` has been removed. Use `track_session()` instead.
-- The context manager `auto_session_tracking_scope()` has been removed. Use `track_session()` instead.
-- Utility function `is_auto_session_tracking_enabled()` has been removed. There is no public replacement. There is a private `_is_auto_session_tracking_enabled()` (if you absolutely need this function) It accepts a `scope` parameter instead of the previously used `hub` parameter.
-- Utility function `is_auto_session_tracking_enabled_scope()` has been removed. There is no public replacement. There is a private `_is_auto_session_tracking_enabled()` (if you absolutely need this function).
-- Setting `scope.level` has been removed. Use `scope.set_level` instead.
-- `span.containing_transaction` has been removed. Use `span.root_span` instead.
-- `continue_from_headers`, `continue_from_environ` and `from_traceparent` have been removed, please use top-level API `sentry_sdk.continue_trace` instead.
-- `PropagationContext` constructor no longer takes a `dynamic_sampling_context` but takes a `baggage` object instead.
-- `ThreadingIntegration` no longer takes the `propagate_hub` argument.
-- `Baggage.populate_from_transaction` has been removed.
-- `debug.configure_debug_hub` was removed.
-- `profiles_sample_rate` and `profiler_mode` were removed from options available via `_experiments`. Use the top-level `profiles_sample_rate` and `profiler_mode` options instead.
-- `Transport.capture_event` has been removed. Use `Transport.capture_envelope` instead.
-- Function transports are no longer supported. Subclass the `Transport` instead.
-- `start_transaction` (`start_span`) no longer takes the following arguments:
+- `start_transaction` is deprecated and no longer takes the following arguments:
   - `trace_id`, `baggage`: use `continue_trace` for propagation from headers or environment variables
   - `same_process_as_parent`
   - `span_id`
   - `parent_span_id`: you can supply a `parent_span` instead
 - The `Scope.transaction` property has been removed. To obtain the root span (previously transaction), use `Scope.root_span`. To set the root span's (transaction's) name, use `Scope.set_transaction_name()`.
 - The `Scope.span =` setter has been removed. Please use the new `span.activate()` api instead if you want to activate a new span manually instead of using the `start_span` context manager.
-- Passing a list or `None` for `failed_request_status_codes` in the Starlette integration is no longer supported. Pass a set of integers instead.
+- `span.containing_transaction` has been removed. Use `span.root_span` instead.
+- `continue_from_headers`, `continue_from_environ` and `from_traceparent` have been removed, please use top-level API `sentry_sdk.continue_trace` instead.
+- `Baggage.populate_from_transaction` has been removed.
+
+#### Integrations
+
+- PyMongo: The integration no longer sets tags. The data is still accessible via span attributes.
+- PyMongo: The integration doesn't set `operation_ids` anymore. The individual IDs (`operation_id`, `request_id`, `session_id`) are now accessible as separate span attributes.
+- Django: Dropped support for Django versions below 2.0.
+- trytond: Dropped support for trytond versions below 5.0.
+- Falcon: Dropped support for Falcon versions below 3.0.
+- eventlet: Dropped support for eventlet completely.
+- Threading: The integration no longer takes the `propagate_hub` argument.
+- Starlette: Passing a list or `None` for `failed_request_status_codes` is no longer supported. Pass a set of integers instead.
+
+#### Profiling
+
+- `profiles_sample_rate` and `profiler_mode` were removed from options available via `_experiments`. Use the top-level `profiles_sample_rate` and `profiler_mode` options instead.
+
+#### Transport
+
+- `Transport.capture_event` has been removed. Use `Transport.capture_envelope` instead.
+- Function transports are no longer supported. Subclass the `Transport` instead.
+
+#### Sessions
+
+- The context manager `auto_session_tracking()` has been removed. Use `track_session()` instead.
+- The context manager `auto_session_tracking_scope()` has been removed. Use `track_session()` instead.
+- Utility function `is_auto_session_tracking_enabled()` has been removed. There is no public replacement. There is a private `_is_auto_session_tracking_enabled()` (if you absolutely need this function) It accepts a `scope` parameter instead of the previously used `hub` parameter.
+- Utility function `is_auto_session_tracking_enabled_scope()` has been removed. There is no public replacement. There is a private `_is_auto_session_tracking_enabled()` (if you absolutely need this function).
+
+#### Metrics
+
+- `sentry_sdk.metrics` and associated metrics APIs have been removed as Sentry no longer accepts metrics data in this form. See https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-to-Metrics
+- The experimental options `enable_metrics`, `before_emit_metric` and `metric_code_locations` have been removed.
+
+#### Internals
+
+- Class `Hub` has been removed.
+- Class `_ScopeManager` has been removed.
+- `PropagationContext` constructor no longer takes a `dynamic_sampling_context` but takes a `baggage` object instead.
+- Setting `scope.level` has been removed. Use `scope.set_level` instead.
+- `debug.configure_debug_hub` was removed.
 - The `span` argument of `Scope.trace_propagation_meta` is no longer supported.
-- Setting `Scope.user` directly is no longer supported. Use `Scope.set_user()` instead.
-- Dropped support for Django versions below 2.0.
-- Dropped support for trytond versions below 5.0.
-- Dropped support for Falcon versions below 3.0.
-- Dropped support for eventlet completely.
+
 
 ### Deprecated
 
 - `sentry_sdk.start_transaction()` is deprecated. Use `sentry_sdk.start_span()` instead.
+  - If you want to force creation of a new trace, use the `sentry_sdk.new_trace()` context manager.
 - `Span.set_data()` is deprecated. Use `Span.set_attribute()` instead.
 
+
+---------------------------------------------------------------------------------
+
+
 ## Upgrading to 2.0
 
 Looking to upgrade from Sentry SDK 1.x to 2.x? Here's a comprehensive list of what's changed. Looking for a more digestible summary? See the [guide in the docs](https://docs.sentry.io/platforms/python/migration/1.x-to-2.x) with the most common migration patterns.

sentry_sdk/__init__.py

@@ -22,6 +22,7 @@
     "capture_exception",
     "capture_message",
     "continue_trace",
+    "new_trace",
     "flush",
     "get_baggage",
     "get_client",
@@ -47,6 +48,7 @@
     "logger",
     "start_session",
     "end_session",
+    "set_transaction_name",
 ]
 
 # Initialize the debug support after everything is loaded

sentry_sdk/ai/monitoring.py

@@ -38,7 +38,7 @@ def sync_wrapped(*args: Any, **kwargs: Any) -> Any:
                 for k, v in kwargs.pop("sentry_data", {}).items():
                     span.set_attribute(k, v)
                 if curr_pipeline:
-                    span.set_attribute(SPANDATA.AI_PIPELINE_NAME, curr_pipeline)
+                    span.set_attribute(SPANDATA.GEN_AI_PIPELINE_NAME, curr_pipeline)
                     return f(*args, **kwargs)
                 else:
                     _ai_pipeline_name.set(description)
@@ -68,7 +68,7 @@ async def async_wrapped(*args: Any, **kwargs: Any) -> Any:
                 for k, v in kwargs.pop("sentry_data", {}).items():
                     span.set_attribute(k, v)
                 if curr_pipeline:
-                    span.set_attribute(SPANDATA.AI_PIPELINE_NAME, curr_pipeline)
+                    span.set_attribute(SPANDATA.GEN_AI_PIPELINE_NAME, curr_pipeline)
                     return await f(*args, **kwargs)
                 else:
                     _ai_pipeline_name.set(description)
@@ -105,7 +105,7 @@ def record_token_usage(
     # TODO: move pipeline name elsewhere
     ai_pipeline_name = get_ai_pipeline_name()
     if ai_pipeline_name:
-        span.set_attribute(SPANDATA.AI_PIPELINE_NAME, ai_pipeline_name)
+        span.set_attribute(SPANDATA.GEN_AI_PIPELINE_NAME, ai_pipeline_name)
 
     if input_tokens is not None:
         span.set_attribute(SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, input_tokens)
@@ -117,10 +117,10 @@ def record_token_usage(
         )
 
     if output_tokens is not None:
-        span.set_data(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens)
+        span.set_attribute(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens)
 
     if output_tokens_reasoning is not None:
-        span.set_data(
+        span.set_attribute(
             SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS_REASONING,
             output_tokens_reasoning,
         )

sentry_sdk/ai/utils.py

@@ -23,9 +23,13 @@ def _normalize_data(data: Any) -> Any:
         return list(_normalize_data(x) for x in data)
     if isinstance(data, dict):
         return {k: _normalize_data(v) for (k, v) in data.items()}
+
     return data
 
 
 def set_data_normalized(span: Span, key: str, value: Any) -> None:
     normalized = _normalize_data(value)
-    span.set_attribute(key, normalized)
+    if isinstance(normalized, (int, float, bool, str)):
+        span.set_attribute(key, normalized)
+    else:
+        span.set_attribute(key, str(normalized))