Refactor C# Generator to make adding source generators easier (#828)

awschristou · web-flow · commit 43d8ece4be18 · 2024-08-26T10:48:04.000-07:00
This PR is a refactor of the C# Telemetry Generator. ## Problems 1. Some of the core fields ("global metadata properties") are generated types instead of primitive types (the "Result" property is one example). In order to add these into the base classes, we need the generated code. But the generated code is only applied during the package publishing automation. 2. The test classes awkwardly require the generator to be run, and the generated output is compiled into the test projects. This doesn't allow for a clean "build the repo", "test the repo" flow. Currently, we have a hack that force builds and runs the generator as a pre-build step for the test project. 3. There is a test that validates the generator output by placing the entire generated file in the repo. This file becomes very large, and falls out of date quickly, since most repo changes focus on updating the definitions json. Updates to this file are usually only checked in when changes are made to the generator. When this file is updated, the PR's change count is inflated by 17k+ lines. ## Approach We can take an _incremental_ approach to solving these problems, over a series of changes. The end goal is to use [C# Source Generators](https://learn.microsoft.com/en-us/dotnet/csharp/roslyn-sdk/source-generators-overview), which will auto-produce the generated code whenever the Events package is compiled. This allows us to solve problem 1 because the required generated types will be available within the `AwsToolkit.Telemetry.Events` package, even while it is being developed. Problems 2 and 3 will be solved, because we will be able to delete the large "GeneratedCode.cs" file, and exercise tests directly against `AwsToolkit.Telemetry.Events`, which will now contain the types that are currently only available after the package is produced and published. Before we introduce the source generator, the generation code is being moved to a "core" package, which will serve the CLI Generator and the (future) source generator. That is all that this change is doing. In follow-up changes, the source generator will be introduced. Once the source generator is available, the CLI generator will still be used for producing the product specific metrics that are defined in the Toolkit repo, but it will not be used for the purpose of producing `AwsToolkit.Telemetry.Events`. After the source generator is available, a follow-up change will define `Result` as a global property to all C# events. The motivation for making these changes incrementally is to rely on existing tests/CI/infrastructure to ensure the generator remains stable throughout the changes. Before: ```mermaid flowchart TB subgraph PkgEvents[Telemetry.Events package] direction TB eventsCodeDto["Core DTOs"] eventsCodeBase["Base Event class"] genCode["Generated code\n(based on telemetry definitions)"] end subgraph PkgEventsGen[Telemetry.Events.Generator package] direction TB gCodeDto["definitions json\nloading models"] gCodeBuilder["Code Builder"] gCli["Generator CLI\nProgram"] end PkgEventsGen -.Generates code\nwhen CLI is run;\nrequired for packaging.-> PkgEvents ``` After: ```mermaid flowchart TB subgraph PkgEventsGenCore[Telemetry.Events.Generator.Core package] direction TB gcCodeDto["definitions json\nloading models"] gcCodeBuilder["Code Builder"] end subgraph PkgEventsGen[Telemetry.Events.Generator package] direction TB gCli["Generator CLI\nProgram"] end subgraph PkgEventsSrcGen["Telemetry.Events.SourceGenerator package (FUTURE CHANGE)"] direction TB sgCode["Source Generator"] end style PkgEventsSrcGen stroke:#0000FF,stroke-dasharray: 5 5 subgraph PkgEvents[Telemetry.Events package] direction TB eventsCodeDto["Core DTOs"] eventsCodeBase["Base Event class"] genCode["Generated code\n(based on telemetry definitions)"] end PkgEventsGen -.Depends on.-> PkgEventsGenCore PkgEventsSrcGen -.Depends on.-> PkgEventsGenCore PkgEventsSrcGen -.Generates code\nwhen Events pkg\nis compiled.-> PkgEvents ```
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/AwsToolkit.Telemetry.Events.Generator.Core.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/AwsToolkit.Telemetry.Events.Generator.Core.csproj
@@ -0,0 +1,17 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!-- Source generators must target netstandard 2.0, and this project will be a dependency. -->
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <RootNamespace>Amazon.AwsToolkit.Telemetry.Events.Generator.Core</RootNamespace>
+    <AssemblyName>Amazon.AwsToolkit.Telemetry.Events.Generator.Core</AssemblyName>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.CodeDom" Version="8.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Constants.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Constants.cs
@@ -0,0 +1,7 @@
+﻿namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core
+{
+    public static class Constants
+    {
+        public const string DefaultEventsNamespace = "Amazon.AwsToolkit.Telemetry.Events.Generated";
+    }
+}
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/DefinitionsBuilder.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/DefinitionsBuilder.cs
@@ -1,15 +1,15 @@
-﻿using System;
+﻿using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models;
+using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Utils;
+using System;
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using Amazon.AwsToolkit.Telemetry.Events.Generator.Models;
-using Amazon.AwsToolkit.Telemetry.Events.Generator.Utils;
 
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core
 {
     /// <summary>
     /// Generates code that allows programs like the Toolkit to instantiate and publish Telemetry Events
@@ -112,9 +112,9 @@ public string Build()
             blankNamespace.Imports.Add(new CodeNamespaceImport("System.Collections.Generic"));
             // All generated code is expected to be placed in, or somewhere with a dependency on,
             // AwsToolkit.Telemetry.Events.Generated
-            if (_namespace != Options.DefaultEventsNamespace)
+            if (_namespace != Constants.DefaultEventsNamespace)
             {
-                blankNamespace.Imports.Add(new CodeNamespaceImport(Options.DefaultEventsNamespace));
+                blankNamespace.Imports.Add(new CodeNamespaceImport(Constants.DefaultEventsNamespace));
             }
             blankNamespace.Imports.Add(new CodeNamespaceImport("Amazon.AwsToolkit.Telemetry.Events.Core"));
 
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/Metadata.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/Metadata.cs
@@ -1,5 +1,5 @@
 ﻿// ReSharper disable InconsistentNaming
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Models
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models
 {
     public class Metadata
     {
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/Metric.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/Metric.cs
@@ -1,5 +1,5 @@
 ﻿// ReSharper disable InconsistentNaming
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Models
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models
 {
     public class Metric
     {
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/MetricType.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/MetricType.cs
@@ -1,5 +1,5 @@
 ﻿// ReSharper disable InconsistentNaming
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Models
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models
 {
     public class MetricType
     {
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/TelemetryDefinitions.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Models/TelemetryDefinitions.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Models
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models
 {
     public class TelemetryDefinitions
     {
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Utils/MetricTypeExtensionMethods.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Utils/MetricTypeExtensionMethods.cs
@@ -1,8 +1,8 @@
-﻿using System;
+﻿using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models;
+using System;
 using System.Collections.Generic;
-using Amazon.AwsToolkit.Telemetry.Events.Generator.Models;
 
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Utils
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Utils
 {
     public static class MetricTypeExtensionMethods
     {
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Utils/StringExtensionMethods.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/Utils/StringExtensionMethods.cs
@@ -1,6 +1,6 @@
 ﻿using System.Linq;
 
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Utils
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Utils
 {
     public static class StringExtensionMethods
     {
@@ -16,7 +16,7 @@ public static string ToPascalCase(this string text)
                 return text.ToUpper();
             }
 
-            var segments = text.Split("_");
+            var segments = text.Split('_');
             if (segments.Length > 1)
             {
                 return string.Concat(segments.Select(ToPascalCase));
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
@@ -21,14 +21,26 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="..\SampleData\Inputs\*.json">
+      <Link>SampleData\Inputs\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\SampleData\Outcomes\*.txt">
+      <Link>SampleData\Outcomes\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AwsToolkit.Telemetry.Events.Generator.Core\AwsToolkit.Telemetry.Events.Generator.Core.csproj" />
     <ProjectReference Include="..\AwsToolkit.Telemetry.Events.Generator\AwsToolkit.Telemetry.Events.Generator.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="test-data\expectedCode*.txt">
+    <None Update="SampleData\Outcomes\sampleDefinitions*.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="test-data\sampleDefinitions.json">
+    <None Update="SampleData\Inputs\sampleDefinitions.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Core/DefinitionsBuilderTests.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Core/DefinitionsBuilderTests.cs
@@ -1,13 +1,13 @@
-﻿using System.IO;
-using Amazon.AwsToolkit.Telemetry.Events.Generator.Models;
+﻿using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models;
+using System.IO;
 using Xunit;
 
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Tests
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Tests
 {
     public class DefinitionsBuilderTests
     {
         private readonly DefinitionsBuilder _sut = new DefinitionsBuilder().WithNamespace("Test");
-        private readonly TelemetryDefinitions _definitions = TelemetryDefinitions.Load("test-data/sampleDefinitions.json");
+        private readonly TelemetryDefinitions _definitions = TelemetryDefinitions.Load("SampleData/Inputs/sampleDefinitions.json");
 
         /// <summary>
         /// Treat the sample definitions as if they were the central telemetry definitions
@@ -19,7 +19,7 @@ public void Build_CommonDefinition()
                 .AddMetrics(_definitions.metrics)
                 .AddMetricsTypes(_definitions.types);
 
-            AssertGeneratedCode("test-data/expectedCode.txt");
+            AssertGeneratedCode("SampleData/Outcomes/sampleDefinitions-generated.txt");
         }
 
         /// <summary>
@@ -32,7 +32,7 @@ public void Build_ReferenceDefinition()
                 .AddMetrics(_definitions.metrics)
                 .AddMetricsTypes(_definitions.types, referenceOnly: true);
 
-            AssertGeneratedCode("test-data/expectedCode-supplemental.txt");
+            AssertGeneratedCode("SampleData/Outcomes/sampleDefinitions-supplemental.txt");
         }
 
         private void AssertGeneratedCode(string expectedCodePath)
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Core/StringExtensionMethodsTests.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Core/StringExtensionMethodsTests.cs
@@ -1,7 +1,7 @@
-using Amazon.AwsToolkit.Telemetry.Events.Generator.Utils;
+using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Utils;
 using Xunit;
 
-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Tests
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Tests
 {
     public class StringExtensionMethodsTests
     {
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Generator/GeneratorTests.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Generator/GeneratorTests.cs
@@ -0,0 +1,63 @@
+﻿using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models;
+using Amazon.AwsToolkit.Telemetry.Events.Generator.Tests.Utils;
+using FluentAssertions;
+using System;
+using System.IO;
+using Xunit;
+using GeneratorProgram = Amazon.AwsToolkit.Telemetry.Events.Generator.Program;
+
+
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Tests.Generator
+{
+    public class GeneratorTests : IDisposable
+    {
+        private const int _timeoutMs = 15_000;
+
+        private readonly TemporaryTestLocation _testLocation = new TemporaryTestLocation();
+        private readonly TelemetryDefinitions _definitions = TelemetryDefinitions.Load("SampleData/Inputs/sampleDefinitions.json");
+        private readonly string _generatedFilePath;
+        private readonly string _generatedFileName = "GeneratedCode.cs";
+
+        public GeneratorTests()
+        {
+            _generatedFilePath = Path.Combine(_testLocation.OutputFolder, _generatedFileName);
+        }
+
+        /// <summary>
+        /// Tests that the generator processes supplemental definitions (supplementDefinitions.json) which combine with 
+        /// the toolkit common telemetry definitions. This simulates producing the code as if the Toolkit repo was 
+        /// generating its own supplemental definitions.
+        /// </summary>
+        [Fact]
+        public void ProducesSupplementalDefinitions()
+        {
+            var options = new Options()
+            {
+                Namespace = "Test",
+                SupplementalDefinitions = ["SampleData/Inputs/supplementDefinitions.json"],
+                OutputFolder = _testLocation.OutputFolder,
+                OutputFilename = _generatedFileName,
+            };
+
+            GeneratorProgram.Generate(options);
+            AssertGeneratedCodeMatches(_generatedFilePath, "SampleData/Outcomes/supplementDefinitions.txt");
+        }
+
+        private void AssertGeneratedCodeMatches(string generatedFilePath, string expectedFilePath)
+        {
+            var generatedCode = File.ReadAllText(generatedFilePath);
+            var expectedCode = File.ReadAllText(expectedFilePath);
+            expectedCode.Should().Be(expectedCode);
+        }
+
+        private string NormalizeLineEndings(string text)
+        {
+            return text.Replace("\r\n", "\n");
+        }
+
+        public void Dispose()
+        {
+            _testLocation.Dispose();
+        }
+    }
+}
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Inputs/sampleDefinitions.json b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Inputs/sampleDefinitions.json
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Outcomes/sampleDefinitions-generated.txt b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Outcomes/sampleDefinitions-generated.txt
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Outcomes/sampleDefinitions-supplemental.txt b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Outcomes/sampleDefinitions-supplemental.txt
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Utils/TemporaryTestLocation.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/Utils/TemporaryTestLocation.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using System.IO;
+
+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Tests.Utils
+{
+    public class TemporaryTestLocation : IDisposable
+    {
+        public readonly string TestFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        public readonly string InputFolder;
+        public readonly string OutputFolder;
+
+        public TemporaryTestLocation(bool createInputOutputFolders = true)
+        {
+            Directory.CreateDirectory(TestFolder);
+
+            if (createInputOutputFolders)
+            {
+                InputFolder = Path.Combine(TestFolder, "input");
+                Directory.CreateDirectory(InputFolder);
+
+                OutputFolder = Path.Combine(TestFolder, "output");
+                Directory.CreateDirectory(OutputFolder);
+            }
+        }
+
+        public void Dispose()
+        {
+            var path = TestFolder;
+            if (Directory.Exists(path))
+            {
+                Directory.Delete(path, true);
+            }
+        }
+    }
+}
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator/AwsToolkit.Telemetry.Events.Generator.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator/AwsToolkit.Telemetry.Events.Generator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -23,12 +23,14 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.CodeDom" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Definitions\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\AwsToolkit.Telemetry.Events.Generator.Core\AwsToolkit.Telemetry.Events.Generator.Core.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator/Options.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator/Options.cs
@@ -1,14 +1,13 @@
-﻿using System.Collections.Generic;
+﻿using Amazon.AwsToolkit.Telemetry.Events.Generator.Core;
 using CommandLine;
+using System.Collections.Generic;
 
 namespace Amazon.AwsToolkit.Telemetry.Events.Generator
 {
     public class Options
     {
-        public const string DefaultEventsNamespace = "Amazon.AwsToolkit.Telemetry.Events.Generated";
-
         [Option(
-            Default = DefaultEventsNamespace,
+            Default = Constants.DefaultEventsNamespace,
             Required = false,
             HelpText = "Namespace to produce generated code in. When generating code for supplemental " +
                        "telemetry definitions, this can help 'fit' the generated code into a host codebase"
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator/Program.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator/Program.cs
@@ -1,12 +1,13 @@
-﻿using System;
+﻿using Amazon.AwsToolkit.Telemetry.Events.Generator.Core;
+using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models;
+using CommandLine;
+using System;
 using System.IO;
 using System.Linq;
-using Amazon.AwsToolkit.Telemetry.Events.Generator.Models;
-using CommandLine;
 
 namespace Amazon.AwsToolkit.Telemetry.Events.Generator
 {
-    class Program
+    public class Program
     {
         static void Main(string[] args)
         {
@@ -27,6 +28,11 @@ static void Main(string[] args)
                 throw new Exception("Program Options are undefined or missing.");
             }
 
+            Generate(options);
+        }
+
+        public static void Generate(Options options)
+        { 
             var definitionPath = Path.Combine(GetTelemetryDefinitionsFolder(), "commonDefinitions.json");
 
             var commonDefinitions = TelemetryDefinitions.Load(definitionPath);
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/Generated/GeneratedCode.cs b/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/Generated/GeneratedCode.cs
diff --git a/telemetry/csharp/AwsToolkit.Telemetry.sln b/telemetry/csharp/AwsToolkit.Telemetry.sln
diff --git a/telemetry/csharp/SampleData/Inputs/supplementDefinitions.json b/telemetry/csharp/SampleData/Inputs/supplementDefinitions.json
diff --git a/telemetry/csharp/SampleData/Outcomes/supplementDefinitions.txt b/telemetry/csharp/SampleData/Outcomes/supplementDefinitions.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// ReSharper disable InconsistentNaming`
`2`		`-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Models`
	`2`	`+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models`
`3`	`3`	`{`
`4`	`4`	`public class Metadata`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Newtonsoft.Json;`
`5`	`5`
`6`		`-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Models`
	`6`	`+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models`
`7`	`7`	`{`
`8`	`8`	`public class TelemetryDefinitions`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-using System;`
	`1`	`+using Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Models;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`		`-using Amazon.AwsToolkit.Telemetry.Events.Generator.Models;`
`4`	`4`
`5`		`-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Utils`
	`5`	`+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Utils`
`6`	`6`	`{`
`7`	`7`	`public static class MetricTypeExtensionMethods`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`
`3`		`-namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Utils`
	`3`	`+namespace Amazon.AwsToolkit.Telemetry.Events.Generator.Core.Utils`
`4`	`4`	`{`
`5`	`5`	`public static class StringExtensionMethods`
`6`	`6`	`{`
`@@ -16,7 +16,7 @@ public static string ToPascalCase(this string text)`
`16`	`16`	`return text.ToUpper();`
`17`	`17`	`}`
`18`	`18`
`19`		`- var segments = text.Split("_");`
	`19`	`+ var segments = text.Split('_');`
`20`	`20`	`if (segments.Length > 1)`
`21`	`21`	`{`
`22`	`22`	`return string.Concat(segments.Select(ToPascalCase));`