Merge branch 'master' into webb/concurrent-integration-scopes-only

Author: alexander-alderman-webb

.coveragerc36

@@ -3,12 +3,12 @@
 
 [run]
 branch = true
-omit = 
+omit =
     /tmp/*
     */tests/*
     */.venv/*
 
 
 [report]
-exclude_lines = 
+exclude_lines =
     if TYPE_CHECKING:

.cursor/rules/core-architecture.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Core Architecture

.cursor/rules/integrations-guide.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Integrations Guide
@@ -133,10 +133,10 @@ from sentry_sdk.integrations import Integration
 
 class MyIntegration(Integration):
     identifier = "my_integration"
-    
+
     def __init__(self, param=None):
         self.param = param
-    
+
     @staticmethod
     def setup_once():
         # Install hooks, monkey patches, etc.

.cursor/rules/project-overview.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Sentry Python SDK - Project Overview

.cursor/rules/quick-reference.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Quick Reference
@@ -44,7 +44,7 @@ tox -e py3.12-django-v5.2.3
 
 ### Code Quality
 
-Our `linters` tox environment runs `black` for formatting, `flake8` for linting and `mypy` for type checking.
+Our `linters` tox environment runs `ruff-format` for formatting, `ruff-check` for linting and `mypy` for type checking.
 
 ```bash
 tox -e linters

.cursor/rules/testing-guide.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Testing Guide
@@ -65,10 +65,10 @@ def test_flask_integration(sentry_init, capture_events):
     # Test setup
     sentry_init(integrations=[FlaskIntegration()])
     events = capture_events()
-    
+
     # Test execution
     # ... test code ...
-    
+
     # Assertions
     assert len(events) == 1
     assert events[0]["exception"]["values"][0]["type"] == "ValueError"

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# Formatting commits to ignore in git blame
+afea4a017bf13f78e82f725ea9d6a56a8e02cb34
+23a340a9dca60eea36de456def70c00952a33556

.github/workflows/test-integrations-ai.yml

@@ -66,6 +66,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-notiktoken"
+      - name: Test litellm
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-litellm"
       - name: Test openai-base
         run: |
           set -x # print commands that are executed

.pre-commit-config.yaml

@@ -1,31 +1,9 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.13.2
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-
--   repo: https://github.com/psf/black
-    rev: 24.1.0
-    hooks:
-    -   id: black
-        exclude: ^(.*_pb2.py|.*_pb2_grpc.py)
-
--   repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
-    hooks:
-    -   id: flake8
-        additional_dependencies:
-            [
-                flake8-pyproject,
-                flake8-bugbear,
-                pep8-naming,
-            ]
-
-# Disabled for now, because it lists a lot of problems.
-#-   repo: https://github.com/pre-commit/mirrors-mypy
-#    rev: 'v0.931'
-#    hooks:
-#    -   id: mypy
+    -   id: ruff-check
+        args: [--fix]
+    -   id: ruff-format

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## 2.40.0
+
+### Various fixes & improvements
+
+- Add LiteLLM integration (#4864) by @constantinius
+  Once you've enabled the [new LiteLLM integration](https://docs.sentry.io/platforms/python/integrations/litellm/), you can use the Sentry AI Agents Monitoring, a Sentry dashboard that helps you understand what's going on with your AI requests:
+  
+  ```python
+  import sentry_sdk
+  from sentry_sdk.integrations.litellm import LiteLLMIntegration
+  sentry_sdk.init(
+      dsn="<your-dsn>",
+      # Set traces_sample_rate to 1.0 to capture 100%
+      # of transactions for tracing.
+      traces_sample_rate=1.0,
+      # Add data like inputs and responses;
+      # see https://docs.sentry.io/platforms/python/data-management/data-collected/ for more info
+      send_default_pii=True,
+      integrations=[
+          LiteLLMIntegration(),
+      ],
+  )
+  ```
+
+- Litestar: Copy request info to prevent cookies mutation (#4883) by @alexander-alderman-webb
+- Add tracing to `DramatiqIntegration` (#4571) by @Igreh
+- Also emit spans for MCP tool calls done by the LLM (#4875) by @constantinius
+- Option to not trace HTTP requests based on status codes (#4869) by @alexander-alderman-webb
+  You can now disable transactions for incoming requests with specific HTTP status codes. The [new `trace_ignore_status_codes` option](https://docs.sentry.io/platforms/python/configuration/options/#trace_ignore_status_codes) accepts a `set` of status codes as integers. If a transaction wraps a request that results in one of the provided status codes, the transaction will be unsampled.
+    
+  ```python
+  import sentry_sdk
+  
+  sentry_sdk.init(
+      trace_ignore_status_codes={301, 302, 303, *range(305, 400), 404},
+  )
+  ```
+
+- Move `_set_agent_data` call to `ai_client_span` function (#4876) by @constantinius
+- Add script to determine lowest supported versions (#4867) by @sentrivana
+- Update `CONTRIBUTING.md` (#4870) by @sentrivana
+
 ## 2.39.0
 
 ### Various fixes & improvements