Revert "Dogfood Python SDK 3.0.0a5 (#97664)"

This reverts commit 3670ef6.

Co-authored-by: sentrivana <[email protected]>

Author: getsentry-bot

pyproject.toml

@@ -83,7 +83,7 @@ dependencies = [
     "sentry-protos>=0.3.1",
     "sentry-redis-tools>=0.5.0",
     "sentry-relay>=0.9.11",
-    "sentry-sdk[http2]==3.0.0a5",
+    "sentry-sdk[http2]>=2.29.1",
     "sentry-usage-accountant>=0.0.10",
     # remove once there are no unmarked transitive dependencies on setuptools
     "setuptools>=70.0.0",
@@ -160,7 +160,7 @@ dev = [
     "pytest-fail-slow>=0.3.0",
     "pytest-json-report>=1.5.0",
     "pytest-rerunfailures>=15.0",
-    "pytest-sentry==0.5.1",
+    "pytest-sentry>=0.3.0",
     "pytest-workaround-12888>=1.0.0",
     "pytest-xdist>=3.0.2",
     "pyupgrade>=3.19.1",

requirements-base.txt

@@ -69,7 +69,7 @@ sentry-ophio>=1.1.3
 sentry-protos==0.3.1
 sentry-redis-tools>=0.5.0
 sentry-relay>=0.9.11
-sentry-sdk[http2]==3.0.0a5
+sentry-sdk[http2]>=2.29.1
 slack-sdk>=3.27.2
 snuba-sdk>=3.0.43
 simplejson>=3.17.6

requirements-dev-frozen.txt

@@ -83,7 +83,6 @@ httpx==0.25.2
 hyperframe==6.1.0
 identify==2.6.1
 idna==3.7
-importlib-metadata==8.7.0
 inflection==0.5.1
 iniconfig==1.1.1
 iso3166==2.1.1
@@ -116,9 +115,6 @@ openapi-core==0.18.2
 openapi-pydantic==0.4.0
 openapi-schema-validator==0.6.2
 openapi-spec-validator==0.7.1
-opentelemetry-api==1.35.0
-opentelemetry-sdk==1.35.0
-opentelemetry-semantic-conventions==0.56b0
 orjson==3.10.10
 outcome==1.2.0
 packaging==24.1
@@ -156,7 +152,7 @@ pytest-fail-slow==0.3.0
 pytest-json-report==1.5.0
 pytest-metadata==3.1.1
 pytest-rerunfailures==15.0
-pytest-sentry==0.5.1
+pytest-sentry==0.3.0
 pytest-workaround-12888==1.0.0
 pytest-xdist==3.0.2
 python-dateutil==2.9.0.post0
@@ -195,7 +191,7 @@ sentry-ophio==1.1.3
 sentry-protos==0.3.1
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.11
-sentry-sdk==3.0.0a5
+sentry-sdk==2.29.1
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.17.0
@@ -252,7 +248,6 @@ wheel==0.38.4
 wrapt==1.17.0
 wsproto==1.1.0
 xmlsec==1.3.14
-zipp==3.23.0
 zstandard==0.18.0
 
 # The following packages are considered to be unsafe in a requirements file:

requirements-dev.txt

@@ -17,7 +17,7 @@ pytest-django>=4.9.0
 pytest-fail-slow>=0.3.0
 pytest-json-report>=1.5.0
 pytest-rerunfailures>=15
-pytest-sentry>=0.5.1
+pytest-sentry>=0.3.0,<0.4.0
 pytest-workaround-12888
 pytest-xdist>=3
 responses>=0.23.1

requirements-frozen.txt

@@ -67,7 +67,6 @@ httpcore==1.0.9
 httpx==0.25.2
 hyperframe==6.1.0
 idna==3.7
-importlib-metadata==8.7.0
 inflection==0.5.1
 iso3166==2.1.1
 isodate==0.6.1
@@ -83,9 +82,6 @@ mmh3==4.0.0
 msgpack==1.1.0
 oauthlib==3.1.0
 openai==1.3.5
-opentelemetry-api==1.35.0
-opentelemetry-sdk==1.35.0
-opentelemetry-semantic-conventions==0.56b0
 orjson==3.10.10
 packaging==24.1
 parsimonious==0.10.0
@@ -132,7 +128,7 @@ sentry-ophio==1.1.3
 sentry-protos==0.3.1
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.11
-sentry-sdk==3.0.0a5
+sentry-sdk==2.29.1
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.17.0
@@ -159,7 +155,6 @@ vine==5.1.0
 vroomrs==0.1.17
 wcwidth==0.2.13
 xmlsec==1.3.14
-zipp==3.23.0
 zstandard==0.18.0
 
 # The following packages are considered to be unsafe in a requirements file:

src/sentry/api/base.py

@@ -447,9 +447,7 @@ def dispatch(self, request: Request, *args, **kwargs) -> Response:
                     op="base.dispatch.sleep",
                     name=type(self).__name__,
                 ) as span:
-                    span.set_attribute(
-                        "SENTRY_API_RESPONSE_DELAY", settings.SENTRY_API_RESPONSE_DELAY
-                    )
+                    span.set_data("SENTRY_API_RESPONSE_DELAY", settings.SENTRY_API_RESPONSE_DELAY)
                     time.sleep(settings.SENTRY_API_RESPONSE_DELAY / 1000.0 - duration)
 
         # Only enforced in dev environment

src/sentry/api/bases/organization.py

@@ -408,7 +408,7 @@ def get_projects(
 
         with sentry_sdk.start_span(op="fetch_organization_projects") as span:
             projects = list(qs)
-            span.set_attribute("Project Count", len(projects))
+            span.set_data("Project Count", len(projects))
 
         filter_by_membership = not bool(ids) and not bool(slugs)
         filtered_projects = self._filter_projects_by_permissions(
@@ -434,7 +434,7 @@ def _filter_projects_by_permissions(
         include_all_accessible: bool = False,
     ) -> list[Project]:
         with sentry_sdk.start_span(op="apply_project_permissions") as span:
-            span.set_attribute("Project Count", len(projects))
+            span.set_data("Project Count", len(projects))
             if force_global_perms:
                 span.set_tag("mode", "force_global_perms")
                 return projects

src/sentry/api/endpoints/organization_events_facets.py

@@ -57,7 +57,7 @@ def data_fn(offset, limit):
                     )
 
             with sentry_sdk.start_span(op="discover.endpoint", name="populate_results") as span:
-                span.set_attribute("facet_count", len(facets or []))
+                span.set_data("facet_count", len(facets or []))
                 resp: dict[str, _KeyTopValues]
                 resp = defaultdict(lambda: {"key": "", "topValues": []})
                 for row in facets:

src/sentry/api/endpoints/organization_events_facets_performance.py

@@ -263,7 +263,7 @@ def query_tag_data(
              Returns None if query was not successful which causes the endpoint to return early
     """
     with sentry_sdk.start_span(op="discover.discover", name="facets.filter_transform") as span:
-        span.set_attribute("query", filter_query)
+        span.set_data("query", filter_query)
         tag_query = DiscoverQueryBuilder(
             dataset=Dataset.Discover,
             params={},
@@ -392,7 +392,7 @@ def query_facet_performance(
     tag_key_limit = limit if tag_key else 1
 
     with sentry_sdk.start_span(op="discover.discover", name="facets.filter_transform") as span:
-        span.set_attribute("query", filter_query)
+        span.set_data("query", filter_query)
         tag_query = DiscoverQueryBuilder(
             dataset=Dataset.Discover,
             params={},
@@ -418,8 +418,8 @@ def query_facet_performance(
     )
 
     with sentry_sdk.start_span(op="discover.discover", name="facets.aggregate_tags"):
-        span.set_attribute("sample_rate", sample_rate)
-        span.set_attribute("target_sample", target_sample)
+        span.set_data("sample_rate", sample_rate)
+        span.set_data("target_sample", target_sample)
         aggregate_comparison = transaction_aggregate * 1.005 if transaction_aggregate else 0
         aggregate_column = Function("avg", [translated_aggregate_column], "aggregate")
         tag_query.where.append(excluded_tags)

src/sentry/api/endpoints/organization_events_meta.py

@@ -171,7 +171,7 @@ def get(self, request: Request, organization: Organization) -> Response:
 
         with sentry_sdk.start_span(op="discover.endpoint", name="serialize_results") as span:
             results = list(results_cursor)
-            span.set_attribute("result_length", len(results))
+            span.set_data("result_length", len(results))
             context = serialize(
                 results,
                 request.user,