Skip to content

Commit cb00fd5

Browse files
authored
ref(profiling): remove option to switch profile processing backend (#102210)
1 parent 0798ab7 commit cb00fd5

File tree

2 files changed

+34
-38
lines changed

2 files changed

+34
-38
lines changed

src/sentry/profiles/task.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -244,18 +244,8 @@ def process_profile_task(
244244
except Exception as e:
245245
sentry_sdk.capture_exception(e)
246246

247-
if (
248-
features.has("projects:continuous-profiling-vroomrs-processing", project)
249-
and "profiler_id" in profile
250-
) or (
251-
features.has("projects:transaction-profiling-vroomrs-processing", project)
252-
and ("event_id" in profile or "profile_id" in profile)
253-
):
254-
if not _process_vroomrs_profile(profile, project):
255-
return
256-
else:
257-
if not _push_profile_to_vroom(profile, project):
258-
return
247+
if not _process_vroomrs_profile(profile, project):
248+
return
259249

260250
if sampled:
261251
with metrics.timer("process_profile.track_outcome.accepted"):

tests/sentry/profiles/test_task.py

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -847,14 +847,14 @@ def test_set_frames_platform_android() -> None:
847847
@patch("sentry.profiles.task._track_duration_outcome")
848848
@patch("sentry.profiles.task._symbolicate_profile")
849849
@patch("sentry.profiles.task._deobfuscate_profile")
850-
@patch("sentry.profiles.task._push_profile_to_vroom")
850+
@patch("sentry.profiles.task._process_vroomrs_profile")
851851
@django_db_all
852852
@pytest.mark.parametrize(
853853
"profile",
854854
["sample_v1_profile", "sample_v2_profile"],
855855
)
856856
def test_process_profile_task_should_emit_profile_duration_outcome(
857-
_push_profile_to_vroom,
857+
_process_vroomrs_profile,
858858
_deobfuscate_profile,
859859
_symbolicate_profile,
860860
_track_duration_outcome,
@@ -864,7 +864,7 @@ def test_process_profile_task_should_emit_profile_duration_outcome(
864864
project,
865865
request,
866866
):
867-
_push_profile_to_vroom.return_value = True
867+
_process_vroomrs_profile.return_value = True
868868
_deobfuscate_profile.return_value = True
869869
_symbolicate_profile.return_value = True
870870

@@ -893,14 +893,14 @@ def test_process_profile_task_should_emit_profile_duration_outcome(
893893
@patch("sentry.profiles.task._track_duration_outcome")
894894
@patch("sentry.profiles.task._symbolicate_profile")
895895
@patch("sentry.profiles.task._deobfuscate_profile")
896-
@patch("sentry.profiles.task._push_profile_to_vroom")
896+
@patch("sentry.profiles.task._process_vroomrs_profile")
897897
@django_db_all
898898
@pytest.mark.parametrize(
899899
"profile",
900900
["sample_v1_profile", "sample_v2_profile"],
901901
)
902902
def test_process_profile_task_should_not_emit_profile_duration_outcome(
903-
_push_profile_to_vroom,
903+
_process_vroomrs_profile,
904904
_deobfuscate_profile,
905905
_symbolicate_profile,
906906
_track_duration_outcome,
@@ -911,7 +911,7 @@ def test_process_profile_task_should_not_emit_profile_duration_outcome(
911911
project,
912912
request,
913913
):
914-
_push_profile_to_vroom.return_value = True
914+
_process_vroomrs_profile.return_value = True
915915
_deobfuscate_profile.return_value = True
916916
_symbolicate_profile.return_value = True
917917
should_emit_profile_duration_outcome.return_value = False
@@ -941,7 +941,7 @@ def test_process_profile_task_should_not_emit_profile_duration_outcome(
941941
assert _track_outcome.call_count == 0
942942

943943

944-
@patch("sentry.profiles.task._push_profile_to_vroom")
944+
@patch("sentry.profiles.task._process_vroomrs_profile")
945945
@patch("sentry.profiles.task._symbolicate_profile")
946946
@patch("sentry.models.projectsdk.get_sdk_index")
947947
@pytest.mark.parametrize(
@@ -955,14 +955,14 @@ def test_process_profile_task_should_not_emit_profile_duration_outcome(
955955
def test_track_latest_sdk(
956956
get_sdk_index,
957957
_symbolicate_profile,
958-
_push_profile_to_vroom,
958+
_process_vroomrs_profile,
959959
profile,
960960
event_type,
961961
organization,
962962
project,
963963
request,
964964
):
965-
_push_profile_to_vroom.return_value = True
965+
_process_vroomrs_profile.return_value = True
966966
_symbolicate_profile.return_value = True
967967
get_sdk_index.return_value = {
968968
"sentry.python": {},
@@ -986,7 +986,7 @@ def test_track_latest_sdk(
986986
)
987987

988988

989-
@patch("sentry.profiles.task._push_profile_to_vroom")
989+
@patch("sentry.profiles.task._process_vroomrs_profile")
990990
@patch("sentry.profiles.task._symbolicate_profile")
991991
@patch("sentry.models.projectsdk.get_sdk_index")
992992
@pytest.mark.parametrize(
@@ -1001,14 +1001,14 @@ def test_track_latest_sdk(
10011001
def test_unknown_sdk(
10021002
get_sdk_index,
10031003
_symbolicate_profile,
1004-
_push_profile_to_vroom,
1004+
_process_vroomrs_profile,
10051005
platform,
10061006
sdk_name,
10071007
organization,
10081008
project,
10091009
request,
10101010
):
1011-
_push_profile_to_vroom.return_value = True
1011+
_process_vroomrs_profile.return_value = True
10121012
_symbolicate_profile.return_value = True
10131013
get_sdk_index.return_value = {
10141014
sdk_name: {},
@@ -1034,19 +1034,19 @@ def test_unknown_sdk(
10341034
)
10351035

10361036

1037-
@patch("sentry.profiles.task._push_profile_to_vroom")
1037+
@patch("sentry.profiles.task._process_vroomrs_profile")
10381038
@patch("sentry.profiles.task._symbolicate_profile")
10391039
@patch("sentry.models.projectsdk.get_sdk_index")
10401040
@django_db_all
10411041
def test_track_latest_sdk_with_payload(
10421042
get_sdk_index: Any,
10431043
_symbolicate_profile: Any,
1044-
_push_profile_to_vroom: Any,
1044+
_process_vroomrs_profile: Any,
10451045
organization: Organization,
10461046
project: Project,
10471047
request: Any,
10481048
) -> None:
1049-
_push_profile_to_vroom.return_value = True
1049+
_process_vroomrs_profile.return_value = True
10501050
_symbolicate_profile.return_value = True
10511051
get_sdk_index.return_value = {
10521052
"sentry.python": {},
@@ -1078,8 +1078,9 @@ def test_track_latest_sdk_with_payload(
10781078
)
10791079

10801080

1081+
@patch("sentry.profiles.task._symbolicate_profile")
10811082
@patch("sentry.profiles.task._track_outcome")
1082-
@patch("sentry.profiles.task._push_profile_to_vroom")
1083+
@patch("sentry.profiles.task._process_vroomrs_profile")
10831084
@django_db_all
10841085
@pytest.mark.parametrize(
10851086
["profile", "category", "sdk_version", "dropped"],
@@ -1091,8 +1092,9 @@ def test_track_latest_sdk_with_payload(
10911092
],
10921093
)
10931094
def test_deprecated_sdks(
1094-
_push_profile_to_vroom,
1095+
_process_vroomrs_profile,
10951096
_track_outcome,
1097+
_symbolicate_profile: mock.MagicMock,
10961098
profile,
10971099
category,
10981100
sdk_version,
@@ -1108,6 +1110,7 @@ def test_deprecated_sdks(
11081110
"name": "sentry.python",
11091111
"version": sdk_version,
11101112
}
1113+
_symbolicate_profile.return_value = True
11111114

11121115
with Feature(
11131116
[
@@ -1124,7 +1127,7 @@ def test_deprecated_sdks(
11241127
process_profile_task(profile=profile)
11251128

11261129
if dropped:
1127-
_push_profile_to_vroom.assert_not_called()
1130+
_process_vroomrs_profile.assert_not_called()
11281131
_track_outcome.assert_called_with(
11291132
profile=profile,
11301133
project=project,
@@ -1133,11 +1136,12 @@ def test_deprecated_sdks(
11331136
reason="deprecated sdk",
11341137
)
11351138
else:
1136-
_push_profile_to_vroom.assert_called()
1139+
_process_vroomrs_profile.assert_called()
11371140

11381141

1142+
@patch("sentry.profiles.task._symbolicate_profile")
11391143
@patch("sentry.profiles.task._track_outcome")
1140-
@patch("sentry.profiles.task._push_profile_to_vroom")
1144+
@patch("sentry.profiles.task._process_vroomrs_profile")
11411145
@django_db_all
11421146
@pytest.mark.parametrize(
11431147
["profile", "category", "sdk_version", "dropped"],
@@ -1149,8 +1153,9 @@ def test_deprecated_sdks(
11491153
],
11501154
)
11511155
def test_rejected_sdks(
1152-
_push_profile_to_vroom,
1156+
_process_vroomrs_profile,
11531157
_track_outcome,
1158+
_symbolicate_profile: mock.MagicMock,
11541159
profile,
11551160
category,
11561161
sdk_version,
@@ -1166,6 +1171,7 @@ def test_rejected_sdks(
11661171
"name": "sentry.cocoa",
11671172
"version": sdk_version,
11681173
}
1174+
_symbolicate_profile.return_value = True
11691175

11701176
with Feature(
11711177
[
@@ -1185,7 +1191,7 @@ def test_rejected_sdks(
11851191
process_profile_task(profile=profile)
11861192

11871193
if dropped:
1188-
_push_profile_to_vroom.assert_not_called()
1194+
_process_vroomrs_profile.assert_not_called()
11891195
_track_outcome.assert_called_with(
11901196
profile=profile,
11911197
project=project,
@@ -1194,19 +1200,19 @@ def test_rejected_sdks(
11941200
reason="rejected sdk",
11951201
)
11961202
else:
1197-
_push_profile_to_vroom.assert_called()
1203+
_process_vroomrs_profile.assert_called()
11981204

11991205

12001206
@patch("sentry.profiles.task._symbolicate_profile")
12011207
@patch("sentry.profiles.task._deobfuscate_profile")
1202-
@patch("sentry.profiles.task._push_profile_to_vroom")
1208+
@patch("sentry.profiles.task._process_vroomrs_profile")
12031209
@django_db_all
12041210
@pytest.mark.parametrize(
12051211
"profile",
12061212
["sample_v1_profile", "sample_v2_profile"],
12071213
)
12081214
def test_process_profile_task_should_flip_project_flag(
1209-
_push_profile_to_vroom: mock.MagicMock,
1215+
_process_vroomrs_profile: mock.MagicMock,
12101216
_deobfuscate_profile: mock.MagicMock,
12111217
_symbolicate_profile: mock.MagicMock,
12121218
profile,
@@ -1218,7 +1224,7 @@ def test_process_profile_task_should_flip_project_flag(
12181224
"sentry.receivers.onboarding.record_first_profile",
12191225
) as mock_record_first_profile:
12201226
first_profile_received.connect(mock_record_first_profile, weak=False)
1221-
_push_profile_to_vroom.return_value = True
1227+
_process_vroomrs_profile.return_value = True
12221228
_deobfuscate_profile.return_value = True
12231229
_symbolicate_profile.return_value = True
12241230

0 commit comments

Comments
 (0)