Skip to content

fix(taskworker) Improve metrics for scheduler #93051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/sentry/taskworker/scheduler/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ def __repr__(self) -> str:
def fullname(self) -> str:
return self._task.fullname

@property
def namespace(self) -> str:
return self._task.namespace.name

@property
def taskname(self) -> str:
return self._task.name

def set_last_run(self, last_run: datetime | None) -> None:
self._last_run = last_run

Expand All @@ -118,7 +126,6 @@ def runtime_after(self, start: datetime) -> datetime:
return self._schedule.runtime_after(start)

def delay_task(self) -> None:
logger.info("taskworker.scheduler.delay_task", extra={"task": self._task.fullname})
monitor_config = self.monitor_config()
headers: dict[str, Any] | None = None
if monitor_config:
Expand Down Expand Up @@ -223,13 +230,21 @@ def _try_spawn(self, entry: ScheduleEntry) -> None:
entry.delay_task()
entry.set_last_run(now)

logger.info("taskworker.scheduler.delay_task", extra={"task": entry.fullname})
metrics.incr("taskworker.scheduler.delay_task")
logger.info("taskworker.scheduler.delay_task", extra={"fullname": entry.fullname})
metrics.incr(
"taskworker.scheduler.delay_task",
tags={
"taskname": entry.taskname,
"namespace": entry.namespace,
},
)
else:
# sync with last_run state in storage
entry.set_last_run(self._run_storage.read(entry.fullname))

logger.info("taskworker.scheduler.sync_with_storage", extra={"task": entry.fullname})
logger.info(
"taskworker.scheduler.sync_with_storage", extra={"fullname": entry.fullname}
)
metrics.incr("taskworker.scheduler.sync_with_storage")

def _update_heap(self) -> None:
Expand Down
4 changes: 4 additions & 0 deletions src/sentry/taskworker/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ def __init__(
def fullname(self) -> str:
return f"{self._namespace.name}:{self.name}"

@property
def namespace(self) -> TaskNamespace:
return self._namespace

@property
def retry(self) -> Retry | None:
return self._retry
Expand Down
1 change: 1 addition & 0 deletions tests/sentry/taskworker/test_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def test_define_task_defaults(task_namespace: TaskNamespace) -> None:
task = Task(name="test.do_things", func=do_things, namespace=task_namespace)
assert task.retry is None
assert task.name == "test.do_things"
assert task.namespace == task_namespace


def test_define_task_retry(task_namespace: TaskNamespace) -> None:
Expand Down
Loading