Use the same version of trace processor as Perfetto UI (#545)

gaogaotiantian · Jan 26, 2025 · c38b7b6 · c38b7b6
1 parent 6298bdc
commit c38b7b6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 34 deletions.
diff --git a/src/viztracer/web_dist/trace_processor b/src/viztracer/web_dist/trace_processor
@@ -30,18 +30,18 @@ exec python3 - "$@" <<'#'EOF
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/trace_processor_shell.py
-# This file has been generated by: tools/roll-prebuilts v46.0
+# This file has been generated by: tools/roll-prebuilts v47.0
 TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        9503800,
+        10209056,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/mac-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/mac-amd64/trace_processor_shell',
     'sha256':
-        'c979a616c2aeada9ff5e0807f15089c7415de7e1f19670945792be5953c05f87',
+        '203c4c7a3621ee7c60a3d558613216427aa0f7245dc34fbe27e03cbcaf15cbd7',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@ TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8873912,
+        9518360,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/mac-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/mac-arm64/trace_processor_shell',
     'sha256':
-        '8f88e9ec002fb0e95bcfdd655e1a9632487010876a234bc545c85c44d0019294',
+        '02130db81f477e795f0fb33e5183eed6d9350057346d730fe30aac5a6443d9c1',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@ TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'file_name':
         'trace_processor_shell',
     'file_size':
-        9675688,
+        10363488,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell',
     'sha256':
-        '70adf26bc45d6de8327b1e46e98f64d4fe8ccf9fd31a1391bb0916c31aaa9df8',
+        '832425c3c7934904d1e0ec1721beb51423de7dbcf399a899973f2b6b464603fa',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@ TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7098492,
+        7682608,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-arm/trace_processor_shell',
     'sha256':
-        'b9d5abb196a99d1ade08db3d97bff3c71e8ee4ccd6fedb6332effa4d5d50c21d',
+        '0d5e41279051326311b178c73289d6027493bdd8627f537e538aa39a6f74af81',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@ TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'file_name':
         'trace_processor_shell',
     'file_size':
-        9297416,
+        9949744,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-arm64/trace_processor_shell',
     'sha256':
-        'b0495e1ba864f3a315a31353e02f25fe8bcfc993ec6cdae1545f12f33f008c8c',
+        '2a9e5f6ee3d9a0d6007fc5503a9358629d7b3881233ee6fbe157edaa0f5a3b1b',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,55 +107,55 @@ TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7111084,
+        7716332,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/android-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/android-arm/trace_processor_shell',
     'sha256':
-        'd8aa4b6460aca2e166755952fa14010d1f80ddb6b6dc406ca2b5246f9885b153'
+        'a3a1f49448e72c368748cb6ec0cb1f63ba4fe5598ff08118053dac68916b9433'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        9200536,
+        9861544,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/android-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/android-arm64/trace_processor_shell',
     'sha256':
-        '1c1843ec2e127b5f7aa8eb9e8d2c216e4cc99f681ecf437ff09f7abc56191cef'
+        '49c9f94802986b9cada8ffab9ec911f21a416966a7c0b2acc3e467f03892ec56'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        10094664,
+        10805720,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/android-x86/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/android-x86/trace_processor_shell',
     'sha256':
-        '4501c9aa2eaaec62155aac914a35b3c61e9d434e765b20fcefa49b7d01f978f0'
+        'b188a7d95533a26b9eadcc5233d9fcc8552f94c0c7224a7f39f5e6eaebd7e981'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        9464288,
+        10150016,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/android-x64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/android-x64/trace_processor_shell',
     'sha256':
-        'fb54ee018ca1d4895ad3e1192e2e585a3709b58864ef3beab4368af3ae17e5fb'
+        'ff83eb7f53fc91d42c8756bb752fd70ed1f03b40a9daba99a6843c391bc8ff66'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'trace_processor_shell.exe',
     'file_size':
-        9548288,
+        10187264,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/windows-amd64/trace_processor_shell.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/windows-amd64/trace_processor_shell.exe',
     'sha256':
-        '41a3353caf59d4df14e7d5ba185861fdc8e41776c1720a6fc1eddc6a99afb6c0',
+        'f9b39c21a99f412697b4bf59f7046f80482c9f07dc3507c2d448dda02915aa14',
     'platform':
         'win32',
     'machine': ['amd64']

diff --git a/tests/test_viewer.py b/tests/test_viewer.py
@@ -265,9 +265,10 @@ def test_external_processor_version(self):
                 if match is None:
                     self.fail("Can't find perfetto version in trace_processor")
                 processor_version = match.group(1)
-                # The trace processor version is usually a version before the perfetto version
-                # So we allow a 1.0 difference
-                self.assertAlmostEqual(float(perfetto_version), float(processor_version), delta=1.0)
+                # We need processor version to match exactly. The release branch of perfetto
+                # does not have the trace_processor at the same version and we need to
+                # dig it up.
+                self.assertEqual(perfetto_version, processor_version)
                 break
 
     @unittest.skipIf(sys.platform == "win32", "Can't send Ctrl+C reliably on Windows")