Merge branch 'release/2.68.0'

Author: sentry-release-bot[bot]

CHANGELOG.md

@@ -1,5 +1,72 @@
 # Changelog
 
+## 2.68.0
+
+### Important
+
+- We're making `enable_logs` and `enable_metrics` no-op with this release ([#7177](https://github.com/getsentry/sentry-python/pull/7177)), and they'll be dropped in the next major.
+
+  Previously, `enable_logs` also controlled automatic logs collection from the logging and Loguru integrations. These integrations now get an integration-level `capture_sentry_logs` boolean option to allow for more control over the auto-collection. These options are `False` by default, i.e., **nothing is auto-collected without your explicit opt-in**.
+
+  #### Action Needed
+
+  If you had `enable_logs` set to `True`:
+  - If you were using the `sentry_sdk.logger.X` API, no action necessary, the API will just work.
+  - If you were auto-collecting logs from either `LoggingIntegration` or `LoguruIntegration`, the auto-collection **will be turned off in this release**. You can switch auto-collection on explicitly with:
+
+  ```python
+  import sentry_sdk
+  from sentry_sdk.integrations.logging import LoggingIntegration
+  from sentry_sdk.integrations.loguru import LoguruIntegration
+
+  sentry_sdk.init(
+      integrations=[
+          LoggingIntegration(capture_sentry_logs=True),
+          LoguruIntegration(capture_sentry_logs=True),
+      ],
+  )
+  ```
+
+  If you had `enable_logs` set to `False`:
+  - If you were using it to gate usages of the `sentry_sdk.logger.X` API, you'll need to remove the calls entirely or define a `before_send_log` callback to filter out unwanted logs.
+
+  If you has `enable_metrics` set to `False`:
+  - Any metrics emitted using the metrics API will be emitted. You'll need to drop them in a `before_send_metric` or remove the calls to the API.
+
+  ### Why We're Doing This
+
+  We recognize this is a disruptive change for some folks and want to make it clear this is a one-off. We're removing the options because they were an unnecessary hurdle that one had to jump through to be able to use logs and metrics, and it was confusing why the logging API would not just work on its own. On the other hand, we wanted to give you more fine-grained control over automatic collection.
+
+
+### New Features ✨
+
+#### Other
+
+- Set the segment source on the scope for `NoOpStreamedSpan` by @alexander-alderman-webb in [#7163](https://github.com/getsentry/sentry-python/pull/7163)
+- Remove early return for `NoOpStreamedSpan` in `set_transaction_name()` by @alexander-alderman-webb in [#7164](https://github.com/getsentry/sentry-python/pull/7164)
+- Set the segment name on the scope with `NoOpStreamedSpan` by @alexander-alderman-webb in [#7162](https://github.com/getsentry/sentry-python/pull/7162)
+
+### Bug Fixes 🐛
+
+- (batcher) Add global flush trigger based on the span number by @alexander-alderman-webb in [#7150](https://github.com/getsentry/sentry-python/pull/7150)
+
+### Internal Changes 🔧
+
+#### HTTPX, HTTPX2
+
+- Move crumbs to integrations by @sentrivana in [#7149](https://github.com/getsentry/sentry-python/pull/7149)
+- Split into sync/async tests by @sentrivana in [#7152](https://github.com/getsentry/sentry-python/pull/7152)
+
+#### Other
+
+- (aiohttp) Move crumbs to integration by @sentrivana in [#7135](https://github.com/getsentry/sentry-python/pull/7135)
+- (boto3) Move crumbs to integration by @sentrivana in [#7165](https://github.com/getsentry/sentry-python/pull/7165)
+- (django) Remove dead code and stale markers from the Django test suite by @ericapisani in [#7156](https://github.com/getsentry/sentry-python/pull/7156)
+- (pyreqwest) Move crumbs to integration by @sentrivana in [#7148](https://github.com/getsentry/sentry-python/pull/7148)
+- (stdlib) Move crumbs to integration by @sentrivana in [#7161](https://github.com/getsentry/sentry-python/pull/7161)
+- Flush trace buckets when segment spans finish by @alexander-alderman-webb in [#7170](https://github.com/getsentry/sentry-python/pull/7170)
+- Revert global span batcher limits by @alexander-alderman-webb in [#7168](https://github.com/getsentry/sentry-python/pull/7168)
+
 ## 2.67.0
 
 ### New Features ✨

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.67.0"
+release = "2.68.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/consts.py

@@ -1840,4 +1840,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "2.67.0"
+VERSION = "2.68.0"

setup.py

@@ -22,7 +22,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.67.0",
+    version="2.68.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",