Skip to content

Commit 4738732

Browse files
authored
Revert "Support Python SDK 3.0.0 (#92011)" (#94790)
This reverts commit dee16a1. <!-- Describe your PR here. -->
1 parent 322c737 commit 4738732

File tree

82 files changed

+207
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+207
-287
lines changed

requirements-base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ sentry-ophio>=1.1.3
6969
sentry-protos==0.2.1
7070
sentry-redis-tools>=0.5.0
7171
sentry-relay>=0.9.9
72-
sentry-sdk[http2]==3.0.0a2
72+
sentry-sdk[http2]>=2.29.1
7373
slack-sdk>=3.27.2
7474
snuba-sdk>=3.0.43
7575
simplejson>=3.17.6

requirements-dev-frozen.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ cryptography==44.0.1
3737
cssselect==1.0.3
3838
cssutils==2.9.0
3939
datadog==0.49.1
40-
deprecated==1.2.18
4140
devservices==1.2.1
4241
distlib==0.3.8
4342
distro==1.8.0
@@ -84,7 +83,6 @@ httpx==0.25.2
8483
hyperframe==6.1.0
8584
identify==2.6.1
8685
idna==3.7
87-
importlib-metadata==8.6.1
8886
inflection==0.5.1
8987
iniconfig==1.1.1
9088
iso3166==2.1.1
@@ -117,9 +115,6 @@ openapi-core==0.18.2
117115
openapi-pydantic==0.4.0
118116
openapi-schema-validator==0.6.2
119117
openapi-spec-validator==0.7.1
120-
opentelemetry-api==1.33.1
121-
opentelemetry-sdk==1.33.1
122-
opentelemetry-semantic-conventions==0.54b1
123118
orjson==3.10.10
124119
outcome==1.2.0
125120
packaging==24.1
@@ -157,7 +152,7 @@ pytest-fail-slow==0.3.0
157152
pytest-json-report==1.5.0
158153
pytest-metadata==3.1.1
159154
pytest-rerunfailures==15.0
160-
pytest-sentry==0.5.1
155+
pytest-sentry==0.3.0
161156
pytest-workaround-12888==1.0.0
162157
pytest-xdist==3.0.2
163158
python-dateutil==2.9.0.post0
@@ -196,7 +191,7 @@ sentry-ophio==1.1.3
196191
sentry-protos==0.2.1
197192
sentry-redis-tools==0.5.0
198193
sentry-relay==0.9.9
199-
sentry-sdk==3.0.0a2
194+
sentry-sdk==2.29.1
200195
sentry-usage-accountant==0.0.10
201196
simplejson==3.17.6
202197
six==1.17.0
@@ -252,7 +247,6 @@ wheel==0.38.4
252247
wrapt==1.17.0
253248
wsproto==1.1.0
254249
xmlsec==1.3.14
255-
zipp==3.21.0
256250
zstandard==0.18.0
257251

258252
# The following packages are considered to be unsafe in a requirements file:

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pytest-django>=4.9.0
1717
pytest-fail-slow>=0.3.0
1818
pytest-json-report>=1.5.0
1919
pytest-rerunfailures>=15
20-
pytest-sentry>=0.5.1
20+
pytest-sentry>=0.3.0,<0.4.0
2121
pytest-workaround-12888
2222
pytest-xdist>=3
2323
responses>=0.23.1

requirements-frozen.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ cryptography==44.0.1
3232
cssselect==1.0.3
3333
cssutils==2.9.0
3434
datadog==0.49.1
35-
deprecated==1.2.18
3635
distro==1.8.0
3736
django==5.2.1
3837
django-crispy-forms==1.14.0
@@ -68,7 +67,6 @@ httpcore==1.0.2
6867
httpx==0.25.2
6968
hyperframe==6.1.0
7069
idna==3.7
71-
importlib-metadata==8.6.1
7270
inflection==0.5.1
7371
iso3166==2.1.1
7472
isodate==0.6.1
@@ -84,9 +82,6 @@ mmh3==4.0.0
8482
msgpack==1.1.0
8583
oauthlib==3.1.0
8684
openai==1.3.5
87-
opentelemetry-api==1.33.1
88-
opentelemetry-sdk==1.33.1
89-
opentelemetry-semantic-conventions==0.54b1
9085
orjson==3.10.10
9186
packaging==24.1
9287
parsimonious==0.10.0
@@ -133,7 +128,7 @@ sentry-ophio==1.1.3
133128
sentry-protos==0.2.1
134129
sentry-redis-tools==0.5.0
135130
sentry-relay==0.9.9
136-
sentry-sdk==3.0.0a2
131+
sentry-sdk==2.29.1
137132
sentry-usage-accountant==0.0.10
138133
simplejson==3.17.6
139134
six==1.17.0
@@ -159,9 +154,7 @@ urllib3==2.2.2
159154
vine==5.1.0
160155
vroomrs==0.1.6
161156
wcwidth==0.2.13
162-
wrapt==1.17.2
163157
xmlsec==1.3.14
164-
zipp==3.21.0
165158
zstandard==0.18.0
166159

167160
# The following packages are considered to be unsafe in a requirements file:

src/sentry/api/base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,7 @@ def dispatch(self, request: Request, *args, **kwargs) -> Response:
445445
op="base.dispatch.sleep",
446446
name=type(self).__name__,
447447
) as span:
448-
span.set_attribute(
449-
"SENTRY_API_RESPONSE_DELAY", settings.SENTRY_API_RESPONSE_DELAY
450-
)
448+
span.set_data("SENTRY_API_RESPONSE_DELAY", settings.SENTRY_API_RESPONSE_DELAY)
451449
time.sleep(settings.SENTRY_API_RESPONSE_DELAY / 1000.0 - duration)
452450

453451
# Only enforced in dev environment

src/sentry/api/bases/organization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def get_projects(
408408

409409
with sentry_sdk.start_span(op="fetch_organization_projects") as span:
410410
projects = list(qs)
411-
span.set_attribute("Project Count", len(projects))
411+
span.set_data("Project Count", len(projects))
412412

413413
filter_by_membership = not bool(ids) and not bool(slugs)
414414
filtered_projects = self._filter_projects_by_permissions(
@@ -434,7 +434,7 @@ def _filter_projects_by_permissions(
434434
include_all_accessible: bool = False,
435435
) -> list[Project]:
436436
with sentry_sdk.start_span(op="apply_project_permissions") as span:
437-
span.set_attribute("Project Count", len(projects))
437+
span.set_data("Project Count", len(projects))
438438
if force_global_perms:
439439
span.set_tag("mode", "force_global_perms")
440440
return projects

src/sentry/api/endpoints/group_current_release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def get(self, request: Request, group) -> Response:
6565
environments = get_environments(request, group.project.organization)
6666

6767
with sentry_sdk.start_span(op="CurrentReleaseEndpoint.get.current_release") as span:
68-
span.set_attribute("Environment Count", len(environments))
69-
span.set_attribute(
68+
span.set_data("Environment Count", len(environments))
69+
span.set_data(
7070
"Raw Parameters",
7171
{
7272
"group.id": group.id,

src/sentry/api/endpoints/organization_events_facets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def data_fn(offset, limit):
5656
)
5757

5858
with sentry_sdk.start_span(op="discover.endpoint", name="populate_results") as span:
59-
span.set_attribute("facet_count", len(facets or []))
59+
span.set_data("facet_count", len(facets or []))
6060
resp: dict[str, _KeyTopValues]
6161
resp = defaultdict(lambda: {"key": "", "topValues": []})
6262
for row in facets:

src/sentry/api/endpoints/organization_events_facets_performance.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def query_tag_data(
262262
Returns None if query was not successful which causes the endpoint to return early
263263
"""
264264
with sentry_sdk.start_span(op="discover.discover", name="facets.filter_transform") as span:
265-
span.set_attribute("query", filter_query)
265+
span.set_data("query", filter_query)
266266
tag_query = DiscoverQueryBuilder(
267267
dataset=Dataset.Discover,
268268
params={},
@@ -391,7 +391,7 @@ def query_facet_performance(
391391
tag_key_limit = limit if tag_key else 1
392392

393393
with sentry_sdk.start_span(op="discover.discover", name="facets.filter_transform") as span:
394-
span.set_attribute("query", filter_query)
394+
span.set_data("query", filter_query)
395395
tag_query = DiscoverQueryBuilder(
396396
dataset=Dataset.Discover,
397397
params={},
@@ -417,8 +417,8 @@ def query_facet_performance(
417417
)
418418

419419
with sentry_sdk.start_span(op="discover.discover", name="facets.aggregate_tags"):
420-
span.set_attribute("sample_rate", sample_rate)
421-
span.set_attribute("target_sample", target_sample)
420+
span.set_data("sample_rate", sample_rate)
421+
span.set_data("target_sample", target_sample)
422422
aggregate_comparison = transaction_aggregate * 1.005 if transaction_aggregate else 0
423423
aggregate_column = Function("avg", [translated_aggregate_column], "aggregate")
424424
tag_query.where.append(excluded_tags)

src/sentry/api/endpoints/organization_events_meta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def get(self, request: Request, organization) -> Response:
170170

171171
with sentry_sdk.start_span(op="discover.endpoint", name="serialize_results") as span:
172172
results = list(results_cursor)
173-
span.set_attribute("result_length", len(results))
173+
span.set_data("result_length", len(results))
174174
context = serialize(
175175
results,
176176
request.user,

0 commit comments

Comments
 (0)