[tools/perf] Explicitly add Telemetry to path on scripts requiring it

We want to be able to import from core module in tools/perf without
bringing the whole of Telemetry as a dependency.

As a first step, for scripts that really need it we add near the
top:

    from core import path_util
    path_util.AddTelemetryToPath()

Alternatively, top level benchmark runner scripts can just import:

    from chrome_telemetry_build import chromium_config

which *will* implicitly add to sys.path Telemetry and all its
required dependencies.

The implicit dependency to Telemetry in "core" will be removed on a
follow up CL.

Bug: 981349
Change-Id: I900366d1849341d079b45ae4201a2c6e9d1c9044
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1760218Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688463}

chrome/test/media_router/telemetry/media_router_config.py

@@ -17,8 +17,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__),
 from chrome_telemetry_build import chromium_config
 from core import path_util
 
-TELEMETRY_DIR = path_util.GetTelemetryDir()
-
 _top_level_dir = os.path.dirname(os.path.realpath(__file__))
 
 

chrome/test/media_router/telemetry/run_benchmark.py

@@ -7,12 +7,12 @@ import sys
 
 import media_router_config
 
-sys.path.insert(1, media_router_config.TELEMETRY_DIR)
-
 from core import benchmark_runner
 
+
 def main():
   return benchmark_runner.main(media_router_config.Config(['benchmarks']))
 
+
 if __name__ == '__main__':
   sys.exit(main())

components/cronet/android/test/javaperftests/run.py

@@ -53,20 +53,16 @@ REPOSITORY_ROOT = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..', '..', '..'))
 
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'tools', 'perf'))
-from core import path_util  # pylint: disable=wrong-import-position
-from core import benchmark_runner  # pylint: disable=wrong-import-position
-sys.path.append(path_util.GetTelemetryDir())
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'build', 'android'))
-sys.path.append(os.path.join(
-    REPOSITORY_ROOT, 'third_party', 'catapult', 'devil'))
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'components'))
 
 # pylint: disable=wrong-import-position
-from cronet.tools import android_rndis_forwarder
-from cronet.tools import perf_test_utils
 from chrome_telemetry_build import chromium_config
 from devil.android import device_utils
 from devil.android.sdk import intent
+from core import benchmark_runner
+from cronet.tools import android_rndis_forwarder
+from cronet.tools import perf_test_utils
 import lighttpd_server
 from pylib import constants
 from telemetry import android

tools/perf/contrib/media_router_benchmarks/run_benchmark.py

@@ -7,11 +7,10 @@ import sys
 
 # Add //tools/perf/ to system path.
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+from chrome_telemetry_build import chromium_config
+
 from core import benchmark_runner
 from core import path_util
-sys.path.insert(1, path_util.GetTelemetryDir())
-
-from chrome_telemetry_build import chromium_config
 
 
 def main():

tools/perf/fetch_benchmark_deps.py

@@ -12,14 +12,11 @@ import os
 import sys
 import logging
 
+from chrome_telemetry_build import chromium_config
 from core import benchmark_finders
 from core import path_util
-
-path_util.AddPyUtilsToPath()
 from py_utils import cloud_storage
 
-from chrome_telemetry_build import chromium_config
-
 
 def _FetchDependenciesIfNeeded(story_set):
   """ Download files needed by a user story set. """

tools/perf/find_dependencies

@@ -5,6 +5,9 @@
 
 import sys
 
+from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import find_dependencies
 
 

tools/perf/generate_perf_data

@@ -5,6 +5,9 @@
 
 import sys
 
+from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import perf_data_generator
 
 

tools/perf/generate_perf_sharding

@@ -11,6 +11,9 @@ import os
 import sys
 import textwrap
 
+from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import benchmark_utils
 from core import bot_platforms
 from core import retrieve_story_timing

tools/perf/list_affected_benchmarks

@@ -9,6 +9,8 @@ import json
 import sys
 
 from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import benchmark_finders
 
 

tools/perf/list_benchmarks

@@ -6,12 +6,12 @@ import optparse
 import sys
 
 from core import path_util
-from core import benchmark_finders
-
-sys.path.insert(1, path_util.GetTelemetryDir())
+path_util.AddTelemetryToPath()
 
+from core import benchmark_finders
 from telemetry import decorators
 
+
 def _CreateParser():
   parser = optparse.OptionParser()
   parser.add_option('--include-contrib', action='store_true', default=False,

tools/perf/process_perf_results_unittest.py

@@ -6,14 +6,11 @@
 import json
 import os
 import shutil
-import sys
 import tempfile
 import unittest
 
 from core import path_util
-sys.path.insert(1, path_util.GetTelemetryDir())
-sys.path.insert(
-    1, os.path.join(path_util.GetTelemetryDir(), 'third_party', 'mock'))
+path_util.AddTelemetryToPath()
 
 from telemetry import decorators
 

tools/perf/run_benchmark

@@ -5,11 +5,9 @@
 
 import sys
 
-from core import path_util
-sys.path.insert(1, path_util.GetTelemetryDir())
-
 from chrome_telemetry_build import chromium_config
 from core import benchmark_runner
+from core import path_util
 
 
 def main():

tools/perf/validate_perf_json_config

@@ -5,6 +5,9 @@
 
 import sys
 
+from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import perf_json_config_validator
 
 

tools/perf/validate_story_expectation_data

@@ -5,6 +5,9 @@
 
 import sys
 
+from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import story_expectation_validator
 
 

tools/perf/validate_wpr_archives

@@ -9,6 +9,8 @@ import os
 import sys
 
 from core import path_util
+path_util.AddTelemetryToPath()
+
 from core import benchmark_finders
 
 from py_utils import cloud_storage