Merge pull request #130 from microsoft/user/dcook/LinuxTracepoints0.2.0

PerfDataExtension - upgrade to LinuxTracepoints 0.2.0

Author: idigdoug

PerfDataExtension/PerfDataExtension.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
-    <Version>0.1.3</Version>
+    <Version>0.2.0</Version>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft</Company>
@@ -44,10 +44,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Performance.SDK" Version="1.1.24" />
 
-    <PackageReference Include="Microsoft.LinuxTracepoints.Types" Version="0.1.2.*" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.LinuxTracepoints.Types" Version="0.2.0.*" PrivateAssets="all" GeneratePathProperty="true" />
     <CopyToTargetDir Include="$(PkgMicrosoft_LinuxTracepoints_Types)\lib\netstandard2.1\Microsoft.LinuxTracepoints.Types.dll" />
 
-    <PackageReference Include="Microsoft.LinuxTracepoints.Decode" Version="0.1.2.*" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.LinuxTracepoints.Decode" Version="0.2.0.*" PrivateAssets="all" GeneratePathProperty="true" />
     <CopyToTargetDir Include="$(PkgMicrosoft_LinuxTracepoints_Decode)\lib\netstandard2.1\Microsoft.LinuxTracepoints.Decode.dll" />
   </ItemGroup>
 

PerfDataExtension/PerfDataFormatter.cs

@@ -483,13 +483,13 @@ public KeyValuePair<string, string>[] MakeRowSynchronized(
                     var field = fields[fieldIndex + commonFieldCount];
                     var fieldVal = field.GetFieldValue(rawData, byteReader);
                     sb.Clear();
-                    if (fieldVal.Type.IsArrayOrElement)
+                    if (fieldVal.Metadata.IsScalar)
                     {
-                        fieldVal.AppendSimpleArrayTo(sb, convertOptions);
+                        fieldVal.AppendScalarTo(sb, convertOptions);
                     }
                     else
                     {
-                        fieldVal.AppendScalarTo(sb, convertOptions);
+                        fieldVal.AppendSimpleArrayTo(sb, convertOptions);
                     }
 
                     row[fieldIndex] = new KeyValuePair<string, string>(field.Name, this.BuilderIntern());
@@ -547,13 +547,13 @@ private void AppendFieldAsJson(PerfByteReader byteReader, ReadOnlySpan<byte> raw
             }
 
             var fieldVal = field.GetFieldValue(rawData, byteReader);
-            if (fieldVal.Type.IsArrayOrElement)
+            if (fieldVal.Metadata.IsScalar)
             {
-                fieldVal.AppendJsonSimpleArrayTo(this.builder, convertOptions);
+                fieldVal.AppendJsonScalarTo(this.builder, convertOptions);
             }
             else
             {
-                fieldVal.AppendJsonScalarTo(this.builder, convertOptions);
+                fieldVal.AppendJsonSimpleArrayTo(this.builder, convertOptions);
             }
         }
 

PerfDataExtension/PerfDataSourceParser.cs

@@ -229,10 +229,10 @@ public override void ProcessSource(
                                         structFields -= 1;
                                     }
 
-                                    var type = enumerator.GetItemType();
-                                    if (type.Encoding == EventHeaderFieldEncoding.Struct)
+                                    var itemMetadata = enumerator.GetItemMetadata();
+                                    if (itemMetadata.Encoding == EventHeaderFieldEncoding.Struct)
                                     {
-                                        structFields += type.StructFieldCount;
+                                        structFields += itemMetadata.StructFieldCount;
                                     }
                                 }
 

PerfDataExtension/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.PerfDataExtension",
-    "version": "0.1.3"
+    "version": "0.2.0"
   },
   "displayName": "Linux - Perf",
   "description": "Enables loading Linux events from perf.data files (e.g. generated by the perf tool)",