Backed out changeset b06f5fef9488 (bug 1244143) for OS 10.7 opt build trouble
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 10 Feb 2016 15:58:09 +0100
changeset 330107 2064cff635eb6e40579a42a704da38f4117ee488
parent 330106 2ee5ba0e786c5b6e0e55a9cbe69be590fd9ba925
child 330108 e90a223c6a9733703b13cf77593b20934deafcfb
child 330209 36a93fd1d3b0f30d7084f4933e0b23c476d50c23
push id10675
push userbmo:james@hoppipolla.co.uk
push dateWed, 10 Feb 2016 15:13:04 +0000
bugs1244143
milestone47.0a1
backs outb06f5fef948812558288b1dc34f678f52d7512dd
Backed out changeset b06f5fef9488 (bug 1244143) for OS 10.7 opt build trouble
python/mozbuild/mozbuild/mach_commands.py
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -490,27 +490,18 @@ class Build(MachCommandBase):
             # if excessive:
             #    print(EXCESSIVE_SWAP_MESSAGE)
 
             print('To view resource usage of the build, run |mach '
                 'resource-usage|.')
 
             telemetry_handler = getattr(self._mach_context,
                                         'telemetry_handler', None)
-            telemetry_data = monitor.record_resource_usage()
-
-            # Record build configuration data. For now, we cherry pick
-            # items we need rather than grabbing everything, in order
-            # to avoid accidentally disclosing PII.
-            telemetry_data['substs'] = {
-                'MOZ_ARTIFACT_BUILDS': self.substs.get('MOZ_ARTIFACT_BUILDS',
-                                                       False)
-            }
-
-            telemetry_handler(self._mach_context, telemetry_data)
+            usage = monitor.record_resource_usage()
+            telemetry_handler(self._mach_context, usage)
 
         # Only for full builds because incremental builders likely don't
         # need to be burdened with this.
         if not what:
             try:
                 # Fennec doesn't have useful output from just building. We should
                 # arguably make the build action useful for Fennec. Another day...
                 if self.substs['MOZ_BUILD_APP'] != 'mobile/android':