Merge branch 'master' into fix/wrong-return-type

Author: sentrivana

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

@@ -59,6 +59,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx"
+      - name: Test httpx2
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx2"
       - name: Test pyreqwest
         run: |
           set -x # print commands that are executed

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.61.1
+
+### Internal Changes 🔧
+
+#### Rq
+
+- Pin `fakeredis<2.36.0` in tests by @alexander-alderman-webb in [#6454](https://github.com/getsentry/sentry-python/pull/6454)
+- Unpin `redis` and `fakeredis` for tests by @alexander-alderman-webb in [#6443](https://github.com/getsentry/sentry-python/pull/6443)
+
+#### Other
+
+- (aiohttp) Unfurl spans explicitly instead of using pop() by @sentrivana in [#6435](https://github.com/getsentry/sentry-python/pull/6435)
+- (tox) Migrate from pip to uv via tox-uv by @sentry-junior in [#6390](https://github.com/getsentry/sentry-python/pull/6390)
+- Pin redis<8 for rq by @sl0thentr0py in [#6438](https://github.com/getsentry/sentry-python/pull/6438)
+
 ## 2.61.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.61.0"
+release = "2.61.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

pyproject.toml

@@ -64,6 +64,7 @@ typing = [
     "typer",
     "strawberry-graphql",
     "httpx",
+    "httpx2",
     "botocore-stubs",
     "werkzeug",
 ]

scripts/populate_tox/config.py

@@ -35,8 +35,10 @@
     "arq": {
         "package": "arq",
         "deps": {
-            "*": ["async-timeout", "pytest-asyncio", "fakeredis>=2.2.0,<2.8"],
+            "*": ["async-timeout", "pytest-asyncio", "fakeredis"],
             "<=0.23": ["pydantic<2"],
+            # https://github.com/cunla/fakeredis-py/issues/490
+            "py3.6,py3.7,py3.8": ["fakeredis<2.36.0"],
         },
         "num_versions": 2,
     },
@@ -200,6 +202,13 @@
             ">=0.28": ">=3.9",
         },
     },
+    "httpx2": {
+        "package": "httpx2",
+        "deps": {
+            "*": ["anyio>=3,<5", "httpx2-pytest==1.0.1"],
+        },
+        "python": ">=3.10",
+    },
     "huey": {
         "package": "huey",
         "num_versions": 2,
@@ -393,6 +402,11 @@
             # https://github.com/jamesls/fakeredis/issues/245
             # https://github.com/cunla/fakeredis-py/issues/341
             "*": ["fakeredis"],
+            # RQ commit https://github.com/rq/rq/commit/64cb1a27b9d1f2fd52bbbb5c1e4518c024f74685
+            # introduced unguarded access to "addr" from the CLIENT LIST command.
+            # The default "addr" value was removed in https://github.com/cunla/fakeredis-py/commit/0441288fb22c8c191fc716b561e0001cf512abe5.
+            # from fakeredis.
+            ">=1.1.14": ["fakeredis<2.36.0"],
             "<0.9": ["fakeredis<1.0", "redis<3.2.2"],
             ">=0.9,<0.14": ["fakeredis>=1.0,<1.7.4"],
             "py3.6,py3.7": ["fakeredis!=2.26.0"],

scripts/populate_tox/package_dependencies.jsonl

@@ -124,6 +124,7 @@
     "Network": [
         "grpc",
         "httpx",
+        "httpx2",
         "pyreqwest",
         "requests",
     ],

scripts/populate_tox/releases.jsonl

@@ -507,6 +507,14 @@ def _setup_instrumentation(
         for function in functions_to_trace:
             class_name = None
             function_qualname = function["qualified_name"]
+
+            if "." not in function_qualname:
+                logger.warning(
+                    "Can not enable tracing for '%s'. Please provide the fully qualified name including the module (e.g. 'mymodule.my_function').",
+                    function_qualname,
+                )
+                continue
+
             module_name, function_name = function_qualname.rsplit(".", 1)
 
             try:

scripts/split_tox_gh_actions/split_tox_gh_actions.py

@@ -1745,4 +1745,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "2.61.0"
+VERSION = "2.61.1"