Add total_fuzzing_time_seconds to FuzzTaskOutput

Author: dylanjew

src/clusterfuzz/_internal/bot/tasks/utasks/fuzz_task.py

@@ -412,24 +412,25 @@ def __init__(self, fuzzer_name, job_type, time_module=time):
     self.time = time_module
     self.start_time = None
     self.timeout = None
+    self.duration = 0
 
   def __enter__(self):
     self.start_time = self.time.time()
     self.timeout = False
     return self
 
   def __exit__(self, exc_type, value, traceback):
-    duration = self.time.time() - self.start_time
+    self.duration = self.time.time() - self.start_time
     monitoring_metrics.FUZZER_TOTAL_FUZZ_TIME.increment_by(
-        int(duration), {
+        int(self.duration), {
             'fuzzer': self.fuzzer_name,
             'timeout': self.timeout,
             'platform': environment.platform(),
             'is_batch': environment.is_uworker(),
             'runtime': environment.get_runtime().value,
         })
     monitoring_metrics.JOB_TOTAL_FUZZ_TIME.increment_by(
-        int(duration), {
+        int(self.duration), {
             'job': self.job_type,
             'timeout': self.timeout,
             'platform': environment.platform(),
@@ -1643,6 +1644,8 @@ def do_engine_fuzzing(self, engine_impl):
               self.testcase_directory)
           # Timeouts are only accounted for in libfuzzer, this can be None
           tracker.timeout = bool(result.timed_out)
+        self.fuzz_task_output.total_fuzzing_time_seconds += int(
+            tracker.duration)
       except FuzzTargetNotFoundError:
         # Ocassionally fuzz targets are deleted. This is pretty rare. Since
         # ClusterFuzz did nothing wrong, don't bubble up an exception, consider
@@ -1834,6 +1837,7 @@ def do_blackbox_fuzzing(self, fuzzer, fuzzer_directory, job_type):
       with _TrackFuzzTime(self.fully_qualified_fuzzer_name,
                           job_type) as tracker:
         tracker.timeout = utils.wait_until_timeout(threads, thread_timeout)
+      self.fuzz_task_output.total_fuzzing_time_seconds += int(tracker.duration)
 
       # Allow for some time to finish processing before terminating the
       # processes.
@@ -2054,7 +2058,9 @@ def postprocess(self, uworker_output):
     fuzz_task_output = uworker_output.fuzz_task_output
     postprocess_store_fuzzer_run_results(uworker_output)
     logs.info('postprocess: fuzz_task_output.fully_qualified_fuzzer_name '
-              f'{fuzz_task_output.fully_qualified_fuzzer_name}')
+              f'{fuzz_task_output.fully_qualified_fuzzer_name}. '
+              'Total fuzzing time seconds: '
+              f'{fuzz_task_output.total_fuzzing_time_seconds}')
     uworker_input = uworker_output.uworker_input
     postprocess_process_crashes(uworker_input, uworker_output)
     postprocess_sample_testcases(uworker_input, uworker_output)
@@ -2072,6 +2078,9 @@ def postprocess(self, uworker_output):
 
     _upload_testcase_run_jsons(
         uworker_output.fuzz_task_output.testcase_run_jsons)
+    # TODO(dylanj): Upload total fuzzing time to big query
+    logs.info(
+        f"Total fuzzing time {fuzz_task_output.total_fuzzing_time_seconds}")
     testcase_manager.update_build_metadata(
         uworker_input.job_type, uworker_output.fuzz_task_output.build_data)
 

src/clusterfuzz/_internal/build_management/build_manager.py

@@ -1207,6 +1207,8 @@ def _emit_build_age_metric(gcs_path):
       # the gcs api returns string, and the local filesystem implementation
       # returns a datetime.datetime object normalized for UTC.
       last_update_time = datetime.datetime.fromisoformat(last_update_time)
+    if last_update_time.tzinfo is None:
+      last_update_time = last_update_time.replace(tzinfo=datetime.timezone.utc)
     now = datetime.datetime.now(datetime.timezone.utc)
     elapsed_time = now - last_update_time
     elapsed_time_in_hours = elapsed_time.total_seconds() / 3600

src/clusterfuzz/_internal/protos/generate.sh

@@ -25,7 +25,7 @@ python -m grpc_tools.protoc \
   $SCRIPT_DIR/*.proto
 
 read -r -d '' COPYRIGHT_HEADER <<EOF
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/heartbeat_pb2.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/heartbeat_pb2.pyi

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/heartbeat_pb2_grpc.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/process_state_pb2.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/process_state_pb2.pyi

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/process_state_pb2_grpc.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/clusterfuzz/_internal/protos/swarming_pb2.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.