Ownership into GenericSets

telemetry/telemetry/internal/story_runner.py

Index: telemetry/telemetry/internal/story_runner.py
diff --git a/telemetry/telemetry/internal/story_runner.py b/telemetry/telemetry/internal/story_runner.py
index 8291b9b817369a36c8dc2e9f594b21d329efd2ae..f6039bc8c7575922e758c74131f0a4c0c0c27ddf 100644
--- a/telemetry/telemetry/internal/story_runner.py
+++ b/telemetry/telemetry/internal/story_runner.py
@@ -346,8 +346,17 @@ def RunBenchmark(benchmark, finder_options):
       exception_formatter.PrintFormattedException()
       return_code = 255
 
-    results.histograms.AddSharedDiagnostic(
-        reserved_infos.OWNERS.name, benchmark.GetOwnership())
+    benchmark_owners = benchmark.GetOwners()
+    benchmark_component = benchmark.GetBugComponents()
+
+    # TODO(#3734): Add a 'IsEmpty' method to GenericSet to replace this check.
+    if list(benchmark_owners):
+      results.histograms.AddSharedDiagnostic(
+          reserved_infos.OWNERS.name, benchmark_owners)
+
+    if list(benchmark_component):
+      results.histograms.AddSharedDiagnostic(
+          reserved_infos.BUG_COMPONENTS.name, benchmark_component)
 
     try:
       if finder_options.upload_results: