From 3170e29ed85eeacb2f728c0c8f71a91cdc40dcf7 Mon Sep 17 00:00:00 2001
From: ivberg <ivberg@microsoft.com>
Date: Tue, 7 Nov 2023 14:06:45 -0800
Subject: [PATCH] Perfetto - Upgrade to latest Perfetto v38 and Protobuf 3.25.0
 /w .pdb (#115)

* Perfetto - Upgrade to latest Perfetto v38 and Protobuf 3.25.0 /w .pdb
---
 PerfettoCds/PerfettoCds.csproj             |  5 +++--
 PerfettoCds/pluginManifest.json            |  2 +-
 PerfettoProcessor/PerfettoProcessor.csproj |  4 ++--
 PerfettoUnitTest/PerfettoUnitTest.cs       | 15 ++++++++-------
 PerfettoUnitTest/PerfettoUnitTest.csproj   |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/PerfettoCds/PerfettoCds.csproj b/PerfettoCds/PerfettoCds.csproj
index f378bd8..7b87890 100644
--- a/PerfettoCds/PerfettoCds.csproj
+++ b/PerfettoCds/PerfettoCds.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.11">
+    <PackageReference Include="Google.Protobuf" Version="3.25.0">
       <GeneratePathProperty>true</GeneratePathProperty>
     </PackageReference>
     <PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
@@ -30,7 +30,7 @@
   <Target Name="DownloadTraceProcessorShell">
 	<!-- Keep in sync with other DownloadTraceProcessorShell Targets -->
     <!-- Download the trace_processor.exe from Perfetto's GitHub release and copy it to the output directory-->
-    <DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v24.2/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
+    <DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v38.0/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
     <Unzip SourceFiles="$(TargetDir)\windows-amd64.zip" DestinationFolder="$(TargetDir)" />
     <Copy SourceFiles="$(TargetDir)\windows-amd64\trace_processor_shell.exe" DestinationFolder="$(TargetDir)" />
     <RemoveDir Directories="$(TargetDir)\windows-amd64" />
@@ -58,6 +58,7 @@
 
   <Target Name="CopyRulesToTarget" AfterTargets="Build">
     <Copy SourceFiles="$(PkgGoogle_Protobuf)\lib\netstandard2.0\Google.Protobuf.dll" DestinationFolder="$(TargetDir)" />
+	<Copy SourceFiles="$(PkgGoogle_Protobuf)\lib\netstandard2.0\Google.Protobuf.pdb" DestinationFolder="$(TargetDir)" />
     <!-- Download trace_processor_shell to the output directory if it doesn't exist -->
     <CallTarget Condition="!Exists('$(TargetDir)\trace_processor_shell.exe')" Targets="DownloadTraceProcessorShell" />
   </Target>
diff --git a/PerfettoCds/pluginManifest.json b/PerfettoCds/pluginManifest.json
index 4258351..59b9ea7 100644
--- a/PerfettoCds/pluginManifest.json
+++ b/PerfettoCds/pluginManifest.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/microsoft-performance-toolkit-sdk/main/src/PluginsSystem/Tools/Microsoft.Performance.Toolkit.Plugins.Cli/Manifest/PluginManifestSchema.json",
   "identity": {
     "id": "Microsoft.Performance.Toolkit.Plugins.PerfettoPlugin",
-    "version": "1.5.4"
+    "version": "1.5.5"
   },
   "displayName": "Perfetto for Android and Chromium logs",
   "description": "Perfetto Android & Chromium (CPU Scheduling, CPU Sampling, CPU Frequency, FTrace, Android Logs, Generic Events / Default Tracks, GPU Counters, Jank Detection, Processes, Android Packages) - https://perfetto.dev/",
diff --git a/PerfettoProcessor/PerfettoProcessor.csproj b/PerfettoProcessor/PerfettoProcessor.csproj
index ed7dc2a..fe9f136 100644
--- a/PerfettoProcessor/PerfettoProcessor.csproj
+++ b/PerfettoProcessor/PerfettoProcessor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	  <Version>1.5.1</Version>
+	  <Version>1.5.5</Version>
       <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
       <Authors>Microsoft</Authors>
       <Company>Microsoft Corp.</Company>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.11">
+    <PackageReference Include="Google.Protobuf" Version="3.25.0">
       <GeneratePathProperty>true</GeneratePathProperty>
     </PackageReference>
   </ItemGroup>
diff --git a/PerfettoUnitTest/PerfettoUnitTest.cs b/PerfettoUnitTest/PerfettoUnitTest.cs
index d621b9b..aeb53c5 100644
--- a/PerfettoUnitTest/PerfettoUnitTest.cs
+++ b/PerfettoUnitTest/PerfettoUnitTest.cs
@@ -119,7 +119,7 @@ public void TestAndroidTrace()
             Assert.IsTrue(cpuSchedEventData[0].ThreadName == "kworker/u17:9 (834)");
             Assert.IsTrue(cpuSchedEventData[1].EndState == "Task Dead");
             Assert.IsTrue(cpuSchedEventData[0].ProcessName == string.Empty);
-            Assert.IsTrue(cpuSchedEventData[5801].EndState == "Runnable");
+            Assert.IsTrue(cpuSchedEventData[5801].EndState == "Runnable (Preempted)");
             Assert.IsTrue(cpuSchedEventData[5801].ThreadName == "TraceLogApiTest (20855)");
             Assert.IsTrue(cpuSchedEventData[5801].ProcessName == "TraceLogApiTest (20855)");
 
@@ -203,21 +203,22 @@ public void TestAndroid12Trace()
                     PerfettoPluginConstants.ProcessEventCookerPath,
                     nameof(PerfettoProcessEventCooker.ProcessEvents)));
 
-            Assert.IsTrue(processEventData.Count == 121);
+            Assert.IsTrue(processEventData.Count == 266);
             Assert.IsTrue(processEventData[1].AndroidAppId == 10135);
             Assert.IsTrue(processEventData[1].Uid == 10135);
             Assert.IsTrue(processEventData[1].CmdLine == "com.android.systemui");
-            Assert.IsTrue(processEventData[1].ParentUpid == 25);
+            Assert.IsTrue(processEventData[1].ParentUpid == 158);
             Assert.IsTrue(processEventData[1].ParentProcess != null && processEventData[1].ParentProcess.Name == "zygote64");
             Assert.IsTrue(processEventData[1].Pid == 980);
             Assert.IsTrue(processEventData[1].Upid == 1);
             Assert.IsTrue(processEventData[1].StartTimestamp == Timestamp.Zero); // NULL should be at trace start
             Assert.IsTrue(processEventData[1].EndTimestamp == new Timestamp(39446647558)); // NULL should be at trace stop
 
-            Assert.IsTrue(processEventData[119].StartTimestamp == new Timestamp(33970357558));
-            Assert.IsTrue(processEventData[119].EndTimestamp == new Timestamp(34203203358));
-            Assert.IsTrue(processEventData[119].ParentProcess != null && processEventData[119].ParentProcess.Name == "/apex/com.android.adbd/bin/adbd");
-            UnitTest.TestTableBuild(RuntimeExecutionResults, PerfettoProcessTable.TableDescriptor, 121);
+            Assert.IsTrue(processEventData[264].StartTimestamp == new Timestamp(33970357558));
+            Assert.IsTrue(processEventData[264].EndTimestamp == new Timestamp(34203203358));
+            Assert.IsTrue(processEventData[264].ParentProcess != null && processEventData[264].ParentProcess.Name == "/apex/com.android.adbd/bin/adbd");
+            Assert.IsTrue(processEventData[264].CmdLine == "/system/bin/sh -c cat /proc/10628/cmdline");
+            UnitTest.TestTableBuild(RuntimeExecutionResults, PerfettoProcessTable.TableDescriptor, 266);
 
             // Packages
             var packagesList = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoPackageListEvent>>(
diff --git a/PerfettoUnitTest/PerfettoUnitTest.csproj b/PerfettoUnitTest/PerfettoUnitTest.csproj
index c2ae738..c37effc 100644
--- a/PerfettoUnitTest/PerfettoUnitTest.csproj
+++ b/PerfettoUnitTest/PerfettoUnitTest.csproj
@@ -29,7 +29,7 @@
   <Target Name="DownloadTraceProcessorShell">
 	<!-- Keep in sync with other DownloadTraceProcessorShell Targets -->
 	<!-- Download the trace_processor.exe from Perfetto's GitHub release and copy it to the output directory-->
-    <DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v24.2/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
+    <DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v38.0/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
     <Unzip SourceFiles="$(TargetDir)\windows-amd64.zip" DestinationFolder="$(TargetDir)" />
     <Copy SourceFiles="$(TargetDir)\windows-amd64\trace_processor_shell.exe" DestinationFolder="$(TargetDir)" />
     <RemoveDir Directories="$(TargetDir)\windows-amd64" />