Format profiler/trace files cloud url

tools/telemetry/telemetry/results/page_test_results.py

Index: tools/telemetry/telemetry/results/page_test_results.py
diff --git a/tools/telemetry/telemetry/results/page_test_results.py b/tools/telemetry/telemetry/results/page_test_results.py
index fe01c0be1a1655644e38814eeaddc64df74474b8..5d907c6425e34712e02f94d4c03b14a26f440a03 100644
--- a/tools/telemetry/telemetry/results/page_test_results.py
+++ b/tools/telemetry/telemetry/results/page_test_results.py
@@ -4,18 +4,14 @@
 
 import collections
 import copy
-import datetime
 import itertools
-import logging
-import random
-import sys
 import traceback
 
 from telemetry import value as value_module
 from telemetry.results import page_run
 from telemetry.results import progress_reporter as progress_reporter_module
-from telemetry.util import cloud_storage
 from telemetry.value import failure
+from telemetry.value import profiler
 from telemetry.value import skip
 from telemetry.value import trace
 
@@ -49,8 +45,6 @@ class PageTestResults(object):
     self._all_page_runs = []
     self._representative_value_for_each_value_name = {}
     self._all_summary_values = []
-    self._pages_to_profiling_files = collections.defaultdict(list)
-    self._pages_to_profiling_files_cloud_url = collections.defaultdict(list)
 
   def __copy__(self):
     cls = self.__class__
@@ -62,10 +56,6 @@ class PageTestResults(object):
     return result
 
   @property
-  def pages_to_profiling_files_cloud_url(self):
-    return self._pages_to_profiling_files_cloud_url
-
-  @property
   def all_page_specific_values(self):
     values = []
     for run in self._all_page_runs:
@@ -154,9 +144,6 @@ class PageTestResults(object):
     self._current_page_run.AddValue(value)
     self._progress_reporter.DidAddValue(value)
 
-  def AddProfilingFile(self, page, file_handle):
-    self._pages_to_profiling_files[page].append(file_handle)
-
   def AddSummaryValue(self, value):
     assert value.page is None
     self._ValidateValue(value)
@@ -189,26 +176,24 @@ class PageTestResults(object):
         values.append(value)
     return values
 
-  def UploadTraceFilesToCloud(self, bucket):
+  def FindAllTraceValue(self):

[nednguyen, 2014/11/20 02:04:11]

FindAllTraceValues

[Yufeng Shen (Slow to review), 2014/11/20 17:56:15]

Done.

+    values = []
     for value in self.all_page_specific_values:
       if isinstance(value, trace.TraceValue):
-        value.UploadToCloud(bucket)
+        values.append(value)
+    return values
+
+  def FindAllProfilerValue(self):

[nednguyen, 2014/11/20 02:04:11]

FindAllProfilerValues

[Yufeng Shen (Slow to review), 2014/11/20 17:56:15]

removed.

+    values = []
+    for value in self.all_page_specific_values:
+      if isinstance(value, profiler.ProfilerValue):
+        values.append(value)
+    return values
+
+  def UploadTraceFilesToCloud(self, bucket):
+    for value in self.FindAllTraceValue():
+      value.UploadToCloud(bucket)
 
   def UploadProfilingFilesToCloud(self, bucket):
-    for page, file_handle_list in self._pages_to_profiling_files.iteritems():
-      for file_handle in file_handle_list:
-        remote_path = ('profiler-file-id_%s-%s%-d%s' % (
-            file_handle.id,
-            datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'),
-            random.randint(1, 100000),
-            file_handle.extension))
-        try:
-          cloud_url = cloud_storage.Insert(
-              bucket, remote_path, file_handle.GetAbsPath())
-          sys.stderr.write(
-              'View generated profiler files online at %s for page %s\n' %
-              (cloud_url, page.display_name))
-          self._pages_to_profiling_files_cloud_url[page].append(cloud_url)
-        except cloud_storage.PermissionError as e:
-          logging.error('Cannot upload profiling files to cloud storage due to '
-                        ' permission error: %s' % e.message)
+    for value in self.FindAllProfilerValue():
+      value.UploadToCloud(bucket)