Browse Source

ref(dynamic-sampling): Remove unused task that was used to measure execution time (#70735)

Riccardo Busetti 10 months ago
parent
commit
8510452a60

+ 0 - 6
src/sentry/conf/server.py

@@ -793,7 +793,6 @@ CELERY_IMPORTS = (
     "sentry.tasks.weekly_escalating_forecast",
     "sentry.tasks.auto_ongoing_issues",
     "sentry.tasks.check_am2_compatibility",
-    "sentry.dynamic_sampling.tasks.collect_orgs",
     "sentry.tasks.statistical_detectors",
     "sentry.debug_files.tasks",
     "sentry.tasks.on_demand_metrics",
@@ -1210,11 +1209,6 @@ CELERYBEAT_SCHEDULE_REGION = {
         # 9:00 PDT, 12:00 EDT, 16:00 UTC
         "schedule": crontab(minute="0", hour="16"),
     },
-    "dynamic-sampling-collect-orgs": {
-        "task": "sentry.dynamic_sampling.tasks.collect_orgs",
-        # Run every 20 minutes
-        "schedule": crontab(minute="*/20"),
-    },
     "statistical-detectors-detect-regressions": {
         "task": "sentry.tasks.statistical_detectors.run_detection",
         # Run every 1 hour

+ 0 - 40
src/sentry/dynamic_sampling/tasks/collect_orgs.py

@@ -1,40 +0,0 @@
-from sentry_sdk import capture_message, set_extra
-
-from sentry import options
-from sentry.dynamic_sampling.tasks.common import GetActiveOrgs, TimedIterator, TimeoutException
-from sentry.dynamic_sampling.tasks.constants import MAX_PROJECTS_PER_QUERY, MAX_TASK_SECONDS
-from sentry.dynamic_sampling.tasks.task_context import TaskContext
-from sentry.dynamic_sampling.tasks.utils import dynamic_sampling_task
-from sentry.silo.base import SiloMode
-from sentry.tasks.base import instrumented_task
-
-
-@instrumented_task(
-    name="sentry.dynamic_sampling.tasks.collect_orgs",
-    queue="dynamicsampling",
-    default_retry_delay=5,
-    max_retries=5,
-    soft_time_limit=2 * 60 * 60,
-    time_limit=2 * 60 * 60 + 5,
-    silo_mode=SiloMode.REGION,
-)
-@dynamic_sampling_task
-def collect_orgs() -> None:
-    enabled = options.get("dynamic-sampling.tasks.collect_orgs") or False
-
-    if not enabled:
-        return
-
-    context = TaskContext("sentry.dynamic-sampling.tasks.collect_orgs", MAX_TASK_SECONDS)
-    iterator_name = GetActiveOrgs.__name__
-    try:
-        for orgs in TimedIterator(
-            context, GetActiveOrgs(max_projects=MAX_PROJECTS_PER_QUERY), iterator_name
-        ):
-            pass
-    except TimeoutException:
-        set_extra("context-data", context.to_dict())
-        raise
-    else:
-        set_extra("context-data", context.to_dict())
-        capture_message("Collect orgs")

+ 0 - 3
src/sentry/options/defaults.py

@@ -1872,9 +1872,6 @@ register(
 # Killswitch for monitor check-ins
 register("crons.organization.disable-check-in", type=Sequence, default=[])
 
-# Turns on and off the running for dynamic sampling collect_orgs.
-register("dynamic-sampling.tasks.collect_orgs", default=False, flags=FLAG_MODIFIABLE_BOOL)
-
 # Sets the timeout for webhooks
 register(
     "sentry-apps.webhook.timeout.sec",

+ 0 - 1
src/sentry/utils/sdk.py

@@ -80,7 +80,6 @@ SAMPLED_TASKS = {
     "sentry.dynamic_sampling.tasks.boost_low_volume_transactions": 0.2,
     "sentry.dynamic_sampling.tasks.recalibrate_orgs": 0.2,
     "sentry.dynamic_sampling.tasks.sliding_window_org": 0.2,
-    "sentry.dynamic_sampling.tasks.collect_orgs": 0.2,
     "sentry.dynamic_sampling.tasks.custom_rule_notifications": 0.2,
     "sentry.dynamic_sampling.tasks.clean_custom_rule_notifications": 0.2,
 }