Skip to content

Add runtime label for crashes metrics #5106

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.

Sign up for GitHub

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

Open
javanlacerda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add runtime label for crashes metrics #5106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions src/clusterfuzz/_internal/bot/tasks/utasks/fuzz_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ def clamp(val, minimum, maximum):
'return_code': return_code,
'platform': environment.platform(),
'job': job_type,
'runtime': environment.get_runtime().value
})


Expand All @@ -480,20 +481,26 @@ def _track_testcase_run_result(fuzzer, job_type, new_crash_count,
known_crash_count, {
'fuzzer': fuzzer,
'platform': environment.platform(),
'runtime': environment.get_runtime().value
})
monitoring_metrics.FUZZER_NEW_CRASH_COUNT.increment_by(
new_crash_count, {
'fuzzer': fuzzer,
'platform': environment.platform(),
'runtime': environment.get_runtime().value
})
monitoring_metrics.JOB_KNOWN_CRASH_COUNT.increment_by(
known_crash_count, {
'job': job_type,
'platform': environment.platform(),
'runtime': environment.get_runtime().value
})
monitoring_metrics.JOB_NEW_CRASH_COUNT.increment_by(
new_crash_count, {
'job': job_type,
'platform': environment.platform(),
'runtime': environment.get_runtime().value
})
monitoring_metrics.JOB_KNOWN_CRASH_COUNT.increment_by(known_crash_count, {
'job': job_type,
'platform': environment.platform(),
})
monitoring_metrics.JOB_NEW_CRASH_COUNT.increment_by(new_crash_count, {
'job': job_type,
'platform': environment.platform()
})


def _last_sync_time(sync_file_path):
Expand Down Expand Up @@ -2020,7 +2027,8 @@ def run(self):
fuzzing_session_duration, {
'fuzzer': self.fuzzer_name,
'job': self.job_type,
'platform': environment.platform()
'platform': environment.platform(),
'runtime': environment.get_runtime().value,
})

return uworker_msg_pb2.Output(fuzz_task_output=self.fuzz_task_output) # pylint: disable=no-member
Expand Down
6 changes: 6 additions & 0 deletions src/clusterfuzz/_internal/metrics/monitoring_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
field_spec=[
monitor.StringField('fuzzer'),
monitor.StringField('platform'),
monitor.StringField('runtime')
])

FUZZER_NEW_CRASH_COUNT = monitor.CounterMetric(
Expand All @@ -106,6 +107,7 @@
field_spec=[
monitor.StringField('fuzzer'),
monitor.StringField('platform'),
monitor.StringField('runtime')
])

JOB_KNOWN_CRASH_COUNT = monitor.CounterMetric(
Expand All @@ -115,6 +117,7 @@
field_spec=[
monitor.StringField('job'),
monitor.StringField('platform'),
monitor.StringField('runtime')
])

JOB_NEW_CRASH_COUNT = monitor.CounterMetric(
Expand All @@ -124,6 +127,7 @@
field_spec=[
monitor.StringField('job'),
monitor.StringField('platform'),
monitor.StringField('runtime')
])

FUZZER_RETURN_CODE_COUNT = monitor.CounterMetric(
Expand All @@ -135,6 +139,7 @@
monitor.IntegerField('return_code'),
monitor.StringField('platform'),
monitor.StringField('job'),
monitor.StringField('runtime')
],
)

Expand Down Expand Up @@ -163,6 +168,7 @@
monitor.StringField('fuzzer'),
monitor.StringField('job'),
monitor.StringField('platform'),
monitor.StringField('runtime')
],
)

Expand Down
13 changes: 13 additions & 0 deletions src/clusterfuzz/_internal/tests/core/bot/tasks/utasks/fuzz_task_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ def setUp(self):
monitor.metrics_store().reset_for_testing()
helpers.patch(self, ['clusterfuzz._internal.system.environment.platform'])
self.mock.platform.return_value = 'some_platform'
helpers.patch(self,
['clusterfuzz._internal.system.environment.get_runtime'])
self.mock.get_runtime.return_value = environment.UtaskMainRuntime.KATA_CONTAINER

def test_fuzzer_run_result(self):
"""Ensure _track_fuzzer_run_result set the right metrics."""
Expand All @@ -77,6 +80,7 @@ def test_fuzzer_run_result(self):
'return_code': 2,
'platform': 'some_platform',
'job': 'job',
'runtime': 'kata_container'
}))
self.assertEqual(
1,
Expand All @@ -85,6 +89,7 @@ def test_fuzzer_run_result(self):
'return_code': 0,
'platform': 'some_platform',
'job': 'job',
'runtime': 'kata_container'
}))
self.assertEqual(
1,
Expand All @@ -93,6 +98,7 @@ def test_fuzzer_run_result(self):
'return_code': -1,
'platform': 'some_platform',
'job': 'job',
'runtime': 'kata_container'
}))

testcase_count_ratio = (
Expand Down Expand Up @@ -143,6 +149,9 @@ def setUp(self):
monitor.metrics_store().reset_for_testing()
helpers.patch(self, ['clusterfuzz._internal.system.environment.platform'])
self.mock.platform.return_value = 'some_platform'
helpers.patch(self,
['clusterfuzz._internal.system.environment.get_runtime'])
self.mock.get_runtime.return_value = environment.UtaskMainRuntime.KATA_CONTAINER

def test_testcase_run_result(self):
"""Ensure _track_testcase_run_result sets the right metrics."""
Expand All @@ -154,24 +163,28 @@ def test_testcase_run_result(self):
monitoring_metrics.JOB_NEW_CRASH_COUNT.get({
'job': 'job',
'platform': 'some_platform',
'runtime': 'kata_container',
}))
self.assertEqual(
15,
monitoring_metrics.JOB_KNOWN_CRASH_COUNT.get({
'job': 'job',
'platform': 'some_platform',
'runtime': 'kata_container',
}))
self.assertEqual(
7,
monitoring_metrics.FUZZER_NEW_CRASH_COUNT.get({
'fuzzer': 'fuzzer',
'platform': 'some_platform',
'runtime': 'kata_container',
}))
self.assertEqual(
15,
monitoring_metrics.FUZZER_KNOWN_CRASH_COUNT.get({
'fuzzer': 'fuzzer',
'platform': 'some_platform',
'runtime': 'kata_container',
}))


Expand Down
Loading