Bug 1484611 - Re-organize the telemetry module layout. r=chutten,janerik on a CLOSED TREE

This patch organizes the Telemetry files according to a new
directory layout, which makes the top level dir less cluttered.
For a comprehensive discussion about the new layout, see
the bug comments.
Additionally, the build script and a few Python and C++ files
are adjusted for dealing with the new directory layout.

Differential Revision: https://phabricator.services.mozilla.com/D4427

--HG--
rename : toolkit/components/telemetry/TelemetryArchive.jsm => toolkit/components/telemetry/app/TelemetryArchive.jsm
rename : toolkit/components/telemetry/TelemetryController.jsm => toolkit/components/telemetry/app/TelemetryController.jsm
rename : toolkit/components/telemetry/TelemetryEnvironment.jsm => toolkit/components/telemetry/app/TelemetryEnvironment.jsm
rename : toolkit/components/telemetry/TelemetryReportingPolicy.jsm => toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
rename : toolkit/components/telemetry/TelemetrySend.jsm => toolkit/components/telemetry/app/TelemetrySend.jsm
rename : toolkit/components/telemetry/TelemetryStopwatch.jsm => toolkit/components/telemetry/app/TelemetryStopwatch.jsm
rename : toolkit/components/telemetry/TelemetryStorage.jsm => toolkit/components/telemetry/app/TelemetryStorage.jsm
rename : toolkit/components/telemetry/TelemetryTimestamps.jsm => toolkit/components/telemetry/app/TelemetryTimestamps.jsm
rename : toolkit/components/telemetry/TelemetryUtils.jsm => toolkit/components/telemetry/app/TelemetryUtils.jsm
rename : toolkit/components/telemetry/gen_event_data.py => toolkit/components/telemetry/build_scripts/gen_event_data.py
rename : toolkit/components/telemetry/gen_event_enum.py => toolkit/components/telemetry/build_scripts/gen_event_enum.py
rename : toolkit/components/telemetry/gen_histogram_data.py => toolkit/components/telemetry/build_scripts/gen_histogram_data.py
rename : toolkit/components/telemetry/gen_histogram_enum.py => toolkit/components/telemetry/build_scripts/gen_histogram_enum.py
rename : toolkit/components/telemetry/gen_histogram_phf.py => toolkit/components/telemetry/build_scripts/gen_histogram_phf.py
rename : toolkit/components/telemetry/gen_process_data.py => toolkit/components/telemetry/build_scripts/gen_process_data.py
rename : toolkit/components/telemetry/gen_process_enum.py => toolkit/components/telemetry/build_scripts/gen_process_enum.py
rename : toolkit/components/telemetry/gen_scalar_data.py => toolkit/components/telemetry/build_scripts/gen_scalar_data.py
rename : toolkit/components/telemetry/gen_scalar_enum.py => toolkit/components/telemetry/build_scripts/gen_scalar_enum.py
rename : toolkit/components/telemetry/parse_events.py => toolkit/components/telemetry/build_scripts/parsers/parse_events.py
rename : toolkit/components/telemetry/parse_histograms.py => toolkit/components/telemetry/build_scripts/parsers/parse_histograms.py
rename : toolkit/components/telemetry/parse_scalars.py => toolkit/components/telemetry/build_scripts/parsers/parse_scalars.py
rename : toolkit/components/telemetry/shared_telemetry_utils.py => toolkit/components/telemetry/build_scripts/parsers/shared_telemetry_utils.py
rename : toolkit/components/telemetry/EventInfo.h => toolkit/components/telemetry/core/EventInfo.h
rename : toolkit/components/telemetry/ScalarInfo.h => toolkit/components/telemetry/core/ScalarInfo.h
rename : toolkit/components/telemetry/Telemetry.cpp => toolkit/components/telemetry/core/Telemetry.cpp
rename : toolkit/components/telemetry/Telemetry.h => toolkit/components/telemetry/core/Telemetry.h
rename : toolkit/components/telemetry/TelemetryCommon.cpp => toolkit/components/telemetry/core/TelemetryCommon.cpp
rename : toolkit/components/telemetry/TelemetryCommon.h => toolkit/components/telemetry/core/TelemetryCommon.h
rename : toolkit/components/telemetry/TelemetryEvent.cpp => toolkit/components/telemetry/core/TelemetryEvent.cpp
rename : toolkit/components/telemetry/TelemetryEvent.h => toolkit/components/telemetry/core/TelemetryEvent.h
rename : toolkit/components/telemetry/TelemetryHistogram.cpp => toolkit/components/telemetry/core/TelemetryHistogram.cpp
rename : toolkit/components/telemetry/TelemetryHistogram.h => toolkit/components/telemetry/core/TelemetryHistogram.h
rename : toolkit/components/telemetry/TelemetryScalar.cpp => toolkit/components/telemetry/core/TelemetryScalar.cpp
rename : toolkit/components/telemetry/TelemetryScalar.h => toolkit/components/telemetry/core/TelemetryScalar.h
rename : toolkit/components/telemetry/ipc/TelemetryComms.h => toolkit/components/telemetry/core/ipc/TelemetryComms.h
rename : toolkit/components/telemetry/ipc/TelemetryIPC.cpp => toolkit/components/telemetry/core/ipc/TelemetryIPC.cpp
rename : toolkit/components/telemetry/ipc/TelemetryIPC.h => toolkit/components/telemetry/core/ipc/TelemetryIPC.h
rename : toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.cpp => toolkit/components/telemetry/core/ipc/TelemetryIPCAccumulator.cpp
rename : toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.h => toolkit/components/telemetry/core/ipc/TelemetryIPCAccumulator.h
rename : toolkit/components/telemetry/nsITelemetry.idl => toolkit/components/telemetry/core/nsITelemetry.idl
rename : toolkit/components/telemetry/CombinedStacks.cpp => toolkit/components/telemetry/other/CombinedStacks.cpp
rename : toolkit/components/telemetry/CombinedStacks.h => toolkit/components/telemetry/other/CombinedStacks.h
rename : toolkit/components/telemetry/GCTelemetry.jsm => toolkit/components/telemetry/other/GCTelemetry.jsm
rename : toolkit/components/telemetry/KeyedStackCapturer.cpp => toolkit/components/telemetry/other/KeyedStackCapturer.cpp
rename : toolkit/components/telemetry/KeyedStackCapturer.h => toolkit/components/telemetry/other/KeyedStackCapturer.h
rename : toolkit/components/telemetry/ProcessedStack.cpp => toolkit/components/telemetry/other/ProcessedStack.cpp
rename : toolkit/components/telemetry/ProcessedStack.h => toolkit/components/telemetry/other/ProcessedStack.h
rename : toolkit/components/telemetry/TelemetryIOInterposeObserver.cpp => toolkit/components/telemetry/other/TelemetryIOInterposeObserver.cpp
rename : toolkit/components/telemetry/TelemetryIOInterposeObserver.h => toolkit/components/telemetry/other/TelemetryIOInterposeObserver.h
rename : toolkit/components/telemetry/UITelemetry.jsm => toolkit/components/telemetry/other/UITelemetry.jsm
rename : toolkit/components/telemetry/WebrtcTelemetry.cpp => toolkit/components/telemetry/other/WebrtcTelemetry.cpp
rename : toolkit/components/telemetry/WebrtcTelemetry.h => toolkit/components/telemetry/other/WebrtcTelemetry.h
rename : toolkit/components/telemetry/TelemetryEventPing.jsm => toolkit/components/telemetry/pings/EventPing.jsm
rename : toolkit/components/telemetry/TelemetryHealthPing.jsm => toolkit/components/telemetry/pings/HealthPing.jsm
rename : toolkit/components/telemetry/TelemetryModules.jsm => toolkit/components/telemetry/pings/ModulesPing.jsm
rename : toolkit/components/telemetry/TelemetrySession.jsm => toolkit/components/telemetry/pings/TelemetrySession.jsm
rename : toolkit/components/telemetry/UpdatePing.jsm => toolkit/components/telemetry/pings/UpdatePing.jsm

toolkit/components/telemetry/build_scripts/gen_event_data.py

@@ -7,10 +7,10 @@
 
 from __future__ import print_function
 from collections import OrderedDict
-from shared_telemetry_utils import StringTable, static_assert, ParserError
+from parsers.shared_telemetry_utils import StringTable, static_assert, ParserError
+from parsers import parse_events
 
 import json
-import parse_events
 import sys
 import itertools
 
@@ -22,7 +22,7 @@ banner = """/* This file is auto-generated, only for internal use in TelemetryEv
 file_header = """\
 #ifndef mozilla_TelemetryEventData_h
 #define mozilla_TelemetryEventData_h
-#include "EventInfo.h"
+#include "core/EventInfo.h"
 namespace {
 """
 

toolkit/components/telemetry/build_scripts/gen_event_enum.py

@@ -7,10 +7,10 @@
 # The events are defined in files provided as command-line arguments.
 
 from __future__ import print_function
-from shared_telemetry_utils import ParserError
+from parsers.shared_telemetry_utils import ParserError
+from parsers import parse_events
 
 import sys
-import parse_events
 
 banner = """/* This file is auto-generated, see gen_event_enum.py.  */
 """

toolkit/components/telemetry/build_scripts/gen_histogram_data.py

@@ -6,10 +6,10 @@
 # in a file provided as a command-line argument.
 
 from __future__ import print_function
-from shared_telemetry_utils import StringTable, static_assert, ParserError
+from parsers.shared_telemetry_utils import StringTable, static_assert, ParserError
+from parsers import parse_histograms
 
 import sys
-import parse_histograms
 import buildconfig
 
 banner = """/* This file is auto-generated, see gen_histogram_data.py.  */

toolkit/components/telemetry/build_scripts/gen_histogram_enum.py

@@ -13,9 +13,9 @@
 # The histograms are defined in files provided as command-line arguments.
 
 from __future__ import print_function
-from shared_telemetry_utils import ParserError
+from parsers.shared_telemetry_utils import ParserError
+from parsers import parse_histograms
 
-import parse_histograms
 import itertools
 import sys
 import buildconfig

toolkit/components/telemetry/build_scripts/gen_histogram_phf.py

@@ -3,12 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function
-from shared_telemetry_utils import ParserError
+from parsers.shared_telemetry_utils import ParserError
 from perfecthash import PerfectHash
 
 PHFSIZE = 512
 
-import parse_histograms
+from parsers import parse_histograms
 import sys
 import buildconfig
 

toolkit/components/telemetry/build_scripts/gen_process_data.py

@@ -6,7 +6,7 @@
 # in a file provided as a command-line argument.
 
 from __future__ import print_function
-from shared_telemetry_utils import ParserError, load_yaml_file
+from parsers.shared_telemetry_utils import ParserError, load_yaml_file
 
 import sys
 import collections

toolkit/components/telemetry/build_scripts/gen_process_enum.py

@@ -6,7 +6,7 @@
 # in a file provided as a command-line argument.
 
 from __future__ import print_function
-from shared_telemetry_utils import ParserError, load_yaml_file
+from parsers.shared_telemetry_utils import ParserError, load_yaml_file
 
 import sys
 import collections

toolkit/components/telemetry/build_scripts/gen_scalar_data.py

@@ -7,10 +7,10 @@
 
 from __future__ import print_function
 from collections import OrderedDict
-from shared_telemetry_utils import StringTable, static_assert, ParserError
+from parsers.shared_telemetry_utils import StringTable, static_assert, ParserError
+from parsers import parse_scalars
 
 import json
-import parse_scalars
 import sys
 
 # The banner/text at the top of the generated file.
@@ -21,7 +21,7 @@ banner = """/* This file is auto-generated, only for internal use in TelemetrySc
 file_header = """\
 #ifndef mozilla_TelemetryScalarData_h
 #define mozilla_TelemetryScalarData_h
-#include "ScalarInfo.h"
+#include "core/ScalarInfo.h"
 namespace {
 """
 

toolkit/components/telemetry/build_scripts/gen_scalar_enum.py

@@ -8,10 +8,10 @@
 # The scalars are defined in files provided as command-line arguments.
 
 from __future__ import print_function
-from shared_telemetry_utils import ParserError
+from parsers.shared_telemetry_utils import ParserError
+from parsers import parse_scalars
 
 import sys
-import parse_scalars
 
 banner = """/* This file is auto-generated, see gen_scalar_enum.py.  */
 """

toolkit/components/telemetry/build_scripts/parsers/parse_histograms.py

@@ -96,8 +96,13 @@ whitelists = None
 def load_whitelist():
     global whitelists
     try:
-        whitelist_path = os.path.join(os.path.abspath(os.path.realpath(os.path.dirname(__file__))),
-                                      'histogram-whitelists.json')
+        parsers_path = os.path.realpath(os.path.dirname(__file__))
+        # The parsers live in build_scripts/parsers in the Telemetry module, while
+        # the histogram-whitelists file lives in the root of the module. Account
+        # for that when looking for the whitelist.
+        # NOTE: if the parsers are moved, this logic will need to be updated.
+        telemetry_module_path = os.path.abspath(os.path.join(parsers_path, os.pardir, os.pardir))
+        whitelist_path = os.path.join(telemetry_module_path, 'histogram-whitelists.json')
         with open(whitelist_path, 'r') as f:
             try:
                 whitelists = json.load(f)

toolkit/components/telemetry/core/Telemetry.cpp

@@ -24,7 +24,7 @@
 #include "mozilla/Unused.h"
 
 #include "base/pickle.h"
-#include "CombinedStacks.h"
+#include "other/CombinedStacks.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsThreadManager.h"
@@ -52,11 +52,11 @@
 #include "Telemetry.h"
 #include "TelemetryCommon.h"
 #include "TelemetryHistogram.h"
-#include "TelemetryIOInterposeObserver.h"
+#include "other/TelemetryIOInterposeObserver.h"
 #include "ipc/TelemetryIPCAccumulator.h"
 #include "TelemetryScalar.h"
 #include "TelemetryEvent.h"
-#include "WebrtcTelemetry.h"
+#include "other/WebrtcTelemetry.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 #include "nsBaseHashtable.h"
@@ -91,7 +91,7 @@
 
 #if defined(MOZ_GECKO_PROFILER)
 #include "shared-libraries.h"
-#include "KeyedStackCapturer.h"
+#include "other/KeyedStackCapturer.h"
 #endif // MOZ_GECKO_PROFILER
 
 #if defined(MOZ_TELEMETRY_GECKOVIEW)

toolkit/components/telemetry/core/ipc/TelemetryIPCAccumulator.cpp

@@ -16,8 +16,8 @@
 #include "nsComponentManagerUtils.h"
 #include "nsITimer.h"
 #include "nsThreadUtils.h"
-#include "TelemetryHistogram.h"
-#include "TelemetryScalar.h"
+#include "core/TelemetryHistogram.h"
+#include "core/TelemetryScalar.h"
 
 using mozilla::StaticMutex;
 using mozilla::StaticMutexAutoLock;

toolkit/components/telemetry/geckoview/TelemetryGeckoViewPersistence.cpp

@@ -29,8 +29,8 @@
 #include "nsXULAppAPI.h"
 #include "prenv.h"
 #include "prio.h"
-#include "TelemetryScalar.h"
-#include "TelemetryHistogram.h"
+#include "core/TelemetryScalar.h"
+#include "core/TelemetryHistogram.h"
 #include "xpcpublic.h"
 
 using mozilla::GetErrorName;

toolkit/components/telemetry/geckoview/TelemetryGeckoViewTesting.cpp

@@ -4,7 +4,7 @@
 
 #include "TelemetryGeckoViewTesting.h"
 #include "TelemetryGeckoViewPersistence.h"
-#include "TelemetryScalar.h"
+#include "core/TelemetryScalar.h"
 
 namespace TelemetryGeckoViewTesting {
   // This is defined in TelemetryGeckoViewPersistence.cpp

toolkit/components/telemetry/geckoview/gtest/TestGeckoView.cpp

@@ -15,10 +15,10 @@
 #include "nsThreadUtils.h"
 #include "nsPrintfCString.h"
 #include "prenv.h"
-#include "Telemetry.h"
+#include "mozilla/Telemetry.h"
 #include "TelemetryFixture.h"
 #include "TelemetryGeckoViewPersistence.h"
-#include "TelemetryScalar.h"
+#include "core/TelemetryScalar.h"
 #include "TelemetryTestHelpers.h"
 
 using namespace mozilla;

toolkit/components/telemetry/gen-histogram-bucket-ranges.py

@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Write out detailed histogram information, including the ranges of the
-# buckets specified by each histogram.
-
-import sys
-import parse_histograms
-import json
-
-from collections import OrderedDict
-
-
-def main(argv):
-    filenames = argv
-
-    all_histograms = OrderedDict()
-
-    for histogram in parse_histograms.from_files(filenames):
-        name = histogram.name()
-        parameters = OrderedDict()
-        table = {
-            'boolean': '2',
-            'flag': '3',
-            'enumerated': '1',
-            'linear': '1',
-            'exponential': '0',
-            'count': '4',
-        }
-        # Use __setitem__ because Python lambdas are so limited.
-        parse_histograms.table_dispatch(histogram.kind(), table,
-                                        lambda k: parameters.__setitem__('kind', k))
-        if histogram.low() == 0:
-            parameters['min'] = 1
-        else:
-            parameters['min'] = histogram.low()
-
-        try:
-            buckets = histogram.ranges()
-            parameters['buckets'] = buckets
-            parameters['max'] = buckets[-1]
-            parameters['bucket_count'] = len(buckets)
-        except parse_histograms.DefinitionException:
-            continue
-
-        all_histograms.update({name: parameters})
-
-    print json.dumps({'histograms': all_histograms})
-
-
-main(sys.argv[1:])

toolkit/components/telemetry/moz.build

@@ -44,7 +44,7 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 
 XPIDL_SOURCES += [
-    'nsITelemetry.idl',
+    'core/nsITelemetry.idl',
 ]
 
 XPIDL_MODULE = 'telemetry'
@@ -54,32 +54,32 @@ EXPORTS.mozilla += [
     '!TelemetryHistogramEnums.h',
     '!TelemetryProcessEnums.h',
     '!TelemetryScalarEnums.h',
-    'CombinedStacks.h',
-    'ipc/TelemetryComms.h',
-    'ipc/TelemetryIPC.h',
-    'ProcessedStack.h',
-    'Telemetry.h',
+    'core/ipc/TelemetryComms.h',
+    'core/ipc/TelemetryIPC.h',
+    'core/Telemetry.h',
+    'other/CombinedStacks.h',
+    'other/ProcessedStack.h',
 ]
 
 SOURCES += [
-    'CombinedStacks.cpp',
+    'core/ipc/TelemetryIPC.cpp',
+    'core/ipc/TelemetryIPCAccumulator.cpp',
+    'core/Telemetry.cpp',
+    'core/TelemetryCommon.cpp',
+    'core/TelemetryEvent.cpp',
+    'core/TelemetryHistogram.cpp',
+    'core/TelemetryScalar.cpp',
     'geckoview/TelemetryGeckoViewPersistence.cpp',
-    'ipc/TelemetryIPC.cpp',
-    'ipc/TelemetryIPCAccumulator.cpp',
-    'ProcessedStack.cpp',
-    'Telemetry.cpp',
-    'TelemetryCommon.cpp',
-    'TelemetryEvent.cpp',
-    'TelemetryHistogram.cpp',
-    'TelemetryIOInterposeObserver.cpp',
-    'TelemetryScalar.cpp',
-    'WebrtcTelemetry.cpp',
+    'other/CombinedStacks.cpp',
+    'other/ProcessedStack.cpp',
+    'other/TelemetryIOInterposeObserver.cpp',
+    'other/WebrtcTelemetry.cpp',
 ]
 
 # KeyedStackCapturer entirely relies on profiler to be enabled.
 if CONFIG['MOZ_GECKO_PROFILER']:
     SOURCES += [
-      'KeyedStackCapturer.cpp'
+      'other/KeyedStackCapturer.cpp'
     ]
 
 EXTRA_COMPONENTS += [
@@ -88,22 +88,22 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES += [
-    'GCTelemetry.jsm',
-    'TelemetryArchive.jsm',
-    'TelemetryController.jsm',
-    'TelemetryEnvironment.jsm',
-    'TelemetryEventPing.jsm',
-    'TelemetryHealthPing.jsm',
-    'TelemetryModules.jsm',
-    'TelemetryReportingPolicy.jsm',
-    'TelemetrySend.jsm',
-    'TelemetrySession.jsm',
-    'TelemetryStopwatch.jsm',
-    'TelemetryStorage.jsm',
-    'TelemetryTimestamps.jsm',
-    'TelemetryUtils.jsm',
-    'UITelemetry.jsm',
-    'UpdatePing.jsm',
+    'app/TelemetryArchive.jsm',
+    'app/TelemetryController.jsm',
+    'app/TelemetryEnvironment.jsm',
+    'app/TelemetryReportingPolicy.jsm',
+    'app/TelemetrySend.jsm',
+    'app/TelemetryStopwatch.jsm',
+    'app/TelemetryStorage.jsm',
+    'app/TelemetryTimestamps.jsm',
+    'app/TelemetryUtils.jsm',
+    'other/GCTelemetry.jsm',
+    'other/UITelemetry.jsm',
+    'pings/EventPing.jsm',
+    'pings/HealthPing.jsm',
+    'pings/ModulesPing.jsm',
+    'pings/TelemetrySession.jsm',
+    'pings/UpdatePing.jsm',
 ]
 
 TESTING_JS_MODULES += [
@@ -136,15 +136,15 @@ histogram_files = [
 ]
 
 data = GENERATED_FILES['TelemetryHistogramData.inc']
-data.script = 'gen_histogram_data.py'
+data.script = 'build_scripts/gen_histogram_data.py'
 data.inputs = histogram_files
 
 enums = GENERATED_FILES['TelemetryHistogramEnums.h']
-enums.script = 'gen_histogram_enum.py'
+enums.script = 'build_scripts/gen_histogram_enum.py'
 enums.inputs = histogram_files
 
 data = GENERATED_FILES['TelemetryHistogramNameMap.h']
-data.script = 'gen_histogram_phf.py'
+data.script = 'build_scripts/gen_histogram_phf.py'
 data.inputs = histogram_files
 
 # Generate scalar files.
@@ -153,17 +153,17 @@ scalar_files = [
 ]
 
 scalar_data = GENERATED_FILES['TelemetryScalarData.h']
-scalar_data.script = 'gen_scalar_data.py'
+scalar_data.script = 'build_scripts/gen_scalar_data.py'
 scalar_data.inputs = scalar_files
 
 scalar_enums = GENERATED_FILES['TelemetryScalarEnums.h']
-scalar_enums.script = 'gen_scalar_enum.py'
+scalar_enums.script = 'build_scripts/gen_scalar_enum.py'
 scalar_enums.inputs = scalar_files
 
 # Generate the JSON scalar definitions. They will only be
 # used in artifact or "build faster" builds.
 scalar_json_data = GENERATED_FILES['ScalarArtifactDefinitions.json']
-scalar_json_data.script = 'gen_scalar_data.py:generate_JSON_definitions'
+scalar_json_data.script = 'build_scripts/gen_scalar_data.py:generate_JSON_definitions'
 scalar_json_data.inputs = scalar_files
 
 # Move the scalars JSON file to the directory where the Firefox binary is.
@@ -175,17 +175,17 @@ event_files = [
 ]
 
 event_data = GENERATED_FILES['TelemetryEventData.h']
-event_data.script = 'gen_event_data.py'
+event_data.script = 'build_scripts/gen_event_data.py'
 event_data.inputs = event_files
 
 event_enums = GENERATED_FILES['TelemetryEventEnums.h']
-event_enums.script = 'gen_event_enum.py'
+event_enums.script = 'build_scripts/gen_event_enum.py'
 event_enums.inputs = event_files
 
 # Generate the JSON event definitions. They will only be
 # used in artifact or "build faster" builds.
 event_json_data = GENERATED_FILES['EventArtifactDefinitions.json']
-event_json_data.script = 'gen_event_data.py:generate_JSON_definitions'
+event_json_data.script = 'build_scripts/gen_event_data.py:generate_JSON_definitions'
 event_json_data.inputs = event_files
 
 # Move the events JSON file to the directory where the Firefox binary is.
@@ -197,11 +197,11 @@ processes_files = [
 ]
 
 processes_enum = GENERATED_FILES['TelemetryProcessEnums.h']
-processes_enum.script = 'gen_process_enum.py'
+processes_enum.script = 'build_scripts/gen_process_enum.py'
 processes_enum.inputs = processes_files
 
 processes_data = GENERATED_FILES['TelemetryProcessData.h']
-processes_data.script = 'gen_process_data.py'
+processes_data.script = 'build_scripts/gen_process_data.py'
 processes_data.inputs = processes_files
 
 # Add support for GeckoView: please note that building GeckoView

toolkit/components/telemetry/other/KeyedStackCapturer.h

@@ -6,7 +6,7 @@
 #ifndef KeyedStackCapturer_h__
 #define KeyedStackCapturer_h__
 
-#include "Telemetry.h"
+#include "mozilla/Telemetry.h"
 #include "nsString.h"
 #include "nsClassHashtable.h"
 #include "mozilla/Mutex.h"

toolkit/components/telemetry/other/TelemetryIOInterposeObserver.cpp

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TelemetryIOInterposeObserver.h"
-#include "TelemetryCommon.h"
+#include "core/TelemetryCommon.h"
 
 namespace mozilla {
 namespace Telemetry {

toolkit/components/telemetry/other/TelemetryIOInterposeObserver.h

@@ -20,7 +20,7 @@
 #include "nsBaseHashtable.h"
 #include "nsClassHashtable.h"
 
-#include "TelemetryCommon.h"
+#include "core/TelemetryCommon.h"
 #include "mozilla/IOInterposer.h"
 
 namespace mozilla {

toolkit/components/telemetry/other/WebrtcTelemetry.cpp

@@ -5,8 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#include "Telemetry.h"
-#include "TelemetryCommon.h"
+#include "mozilla/Telemetry.h"
 #include "WebrtcTelemetry.h"
 #include "jsapi.h"
 #include "nsPrintfCString.h"

toolkit/components/telemetry/other/WebrtcTelemetry.h

@@ -9,7 +9,7 @@
 
 #include "nsBaseHashtable.h"
 #include "nsHashKeys.h"
-#include "TelemetryCommon.h"
+#include "core/TelemetryCommon.h"
 
 class WebrtcTelemetry {
 public:

toolkit/components/telemetry/schemas/core.schema.json

@@ -1,41 +0,0 @@
-{
-  "$schema" : "http://json-schema.org/draft-04/schema#",
-  "type" : "object",
-  "name" : "core",
-  "properties" : {
-    "arch" : {
-      "type" : "string"
-    },
-    "clientId" : {
-      "type" : "string",
-      "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-    },
-    "device" : {
-      "type" : "string"
-    },
-    "experiments" : {
-      "type" : "array",
-      "items" : {
-        "type" : "string"
-      }
-    },
-    "locale" : {
-      "type" : "string"
-    },
-    "os" : {
-      "type" : "string"
-    },
-    "osversion" : {
-      "type" : "string"
-    },
-    "seq" : {
-      "type" : "integer",
-      "minimum": 0
-    },
-    "v" : {
-      "type" : "integer",
-      "enum" : [ 1 ]
-    }
-  },
-  "required" : ["arch", "clientId", "device", "locale", "os", "osversion", "seq", "v"]
-}

toolkit/components/telemetry/tests/gtest/TelemetryTestHelpers.cpp

@@ -6,7 +6,7 @@
 
 #include "gtest/gtest.h"
 #include "mozilla/CycleCollectedJSContext.h"
-#include "TelemetryCommon.h"
+#include "core/TelemetryCommon.h"
 #include "mozilla/Unused.h"
 
 using namespace mozilla;

toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp

@@ -2,8 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-#include "CombinedStacks.h"
-#include "ProcessedStack.h"
+#include "other/CombinedStacks.h"
+#include "other/ProcessedStack.h"
 using namespace mozilla::Telemetry;
 using namespace TelemetryTestHelpers;
 

toolkit/components/telemetry/tests/gtest/TestCounters.cpp

@@ -6,7 +6,7 @@
 #include "gtest/gtest.h"
 #include "js/Conversions.h"
 #include "nsITelemetry.h"
-#include "Telemetry.h"
+#include "mozilla/Telemetry.h"
 #include "TelemetryFixture.h"
 #include "TelemetryTestHelpers.h"
 

toolkit/components/telemetry/tests/gtest/TestHistograms.cpp

@@ -6,7 +6,7 @@
 #include "gtest/gtest.h"
 #include "js/Conversions.h"
 #include "nsITelemetry.h"
-#include "Telemetry.h"
+#include "mozilla/Telemetry.h"
 #include "TelemetryFixture.h"
 #include "TelemetryTestHelpers.h"
 

toolkit/components/telemetry/tests/gtest/TestScalars.cpp

@@ -10,10 +10,10 @@
 #include "nsJSUtils.h" // nsAutoJSString
 #include "nsITelemetry.h"
 #include "nsThreadUtils.h"
-#include "Telemetry.h"
+#include "mozilla/Telemetry.h"
 #include "mozilla/TelemetryProcessEnums.h"
 #include "TelemetryFixture.h"
-#include "TelemetryScalar.h"
+#include "core/TelemetryScalar.h"
 #include "TelemetryTestHelpers.h"
 
 using namespace mozilla;