Vendor the EventSource Name of the ILRepacked MetricsEventSource.

Author: nrcventura

FullAgent.sln

@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 15.0.26228.04
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Agent\NewRelic\Agent\Core\Core.csproj", "{D6E22195-EE69-4320-B08B-E68229FB69AB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{36C4B766-2A2F-CACB-CB91-0FC5C2E69773} = {36C4B766-2A2F-CACB-CB91-0FC5C2E69773}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Api.Agent", "src\Agent\NewRelic.Api.Agent\NewRelic.Api.Agent.csproj", "{64C7F267-5185-4AB7-9EB5-0183D8BB0171}"
 EndProject
@@ -231,6 +234,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureServiceBus", "src\Agen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HybridHttpContext", "src\Agent\NewRelic\Agent\Extensions\Providers\Storage\HybridHttpContext\HybridHttpContext.csproj", "{CE9B992B-A2A7-20F9-9EEB-AE699C6D77CC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyModifier", "src\Agent\NewRelic\AssemblyModifier\AssemblyModifier.csproj", "{36C4B766-2A2F-CACB-CB91-0FC5C2E69773}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -485,6 +490,10 @@ Global
 		{CE9B992B-A2A7-20F9-9EEB-AE699C6D77CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE9B992B-A2A7-20F9-9EEB-AE699C6D77CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE9B992B-A2A7-20F9-9EEB-AE699C6D77CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36C4B766-2A2F-CACB-CB91-0FC5C2E69773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C4B766-2A2F-CACB-CB91-0FC5C2E69773}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C4B766-2A2F-CACB-CB91-0FC5C2E69773}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C4B766-2A2F-CACB-CB91-0FC5C2E69773}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -558,6 +567,7 @@ Global
 		{A0F784BB-D66D-47E0-80F4-66CF8DAF697C} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
 		{4078E594-E738-48F7-A7ED-B208ADD04900} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
 		{CE9B992B-A2A7-20F9-9EEB-AE699C6D77CC} = {2D194040-0192-4A87-A076-2B640C7FA82F}
+		{36C4B766-2A2F-CACB-CB91-0FC5C2E69773} = {E3DAC9C6-AE41-4B37-A253-C621E568590E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35

src/Agent/NewRelic/Agent/Core/Core.csproj

@@ -188,6 +188,14 @@
 
     <Message Importance="High" Text="Executing ILRepack.exe for $(TargetFramework) build: $(ILRepackCommand)" />
     <Exec Command="$(ILRepackCommand)" />
+
+    <PropertyGroup>
+      <AssemblyModifierCommand>&quot;$(SolutionDir)src\Agent\NewRelic\AssemblyModifier\bin\$(Configuration)\AssemblyModifier.exe&quot;</AssemblyModifierCommand>
+      <AssemblyToModify>&quot;$(OutputPath)..\$(TargetFramework)-ILRepacked\$(AssemblyName).dll&quot;</AssemblyToModify>
+      <AssemblyDependency>&quot;$(OutputPath)..\..\NewRelic.Agent.Extensions\$(TargetFramework)-ILRepacked&quot;</AssemblyDependency>
+    </PropertyGroup>
+    <Message Importance="High" Text="Executing AssemblyModifier to complete the ILRepack process" />
+    <Exec Command="$(AssemblyModifierCommand) $(AssemblyToModify) $(AssemblyDependency)" />
   </Target>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

src/Agent/NewRelic/AssemblyModifier/AssemblyModifier.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
+  </ItemGroup>
+
+</Project>

src/Agent/NewRelic/AssemblyModifier/IModificationJob.cs

@@ -0,0 +1,18 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Mono.Cecil;
+/// <summary>
+/// Defines a contract for a job that performs a modification on a module definition.
+/// </summary>
+/// <remarks>Implementations of this interface encapsulate logic to modify a given module. The result of the
+/// operation is indicated by the return value of the Run method.</remarks>
+public interface IModificationJob
+{
+    /// <summary>
+    /// Run the logic to modify the specified module.
+    /// </summary>
+    /// <param name="module">The module to modify</param>
+    /// <returns>true if successful and false otherwise</returns>
+    public bool Run(ModuleDefinition module);
+}

src/Agent/NewRelic/AssemblyModifier/InternalizeMetricsEventSourceName.cs

@@ -0,0 +1,60 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Mono.Cecil;
+/// <summary>
+/// Updates the name of the EventSource used to make metric data available out-of-process
+/// so that tools like dotnet-counters will use the application's EventSource data
+/// instead of the agent's EventSource data.
+/// </summary>
+public class InternalizeMetricsEventSourceName(Logger logger) : IModificationJob
+{
+    public bool Run(ModuleDefinition module)
+    {
+        TypeDefinition? metricsEventSourceType = module.Types
+                .FirstOrDefault(t => t.FullName == "System.Diagnostics.Metrics.MetricsEventSource");
+
+        if (metricsEventSourceType == null)
+        {
+            logger.Log("Type 'System.Diagnostics.Metrics.MetricsEventSource' not found in the assembly.");
+            return false;
+        }
+
+        CustomAttribute? eventSourceAttribute = metricsEventSourceType.CustomAttributes
+        .FirstOrDefault(a => a.AttributeType.FullName == "System.Diagnostics.Tracing.EventSourceAttribute");
+
+        if (eventSourceAttribute == null)
+        {
+            logger.Log("EventSource attribute not found on the type.");
+            return false;
+        }
+
+        // Modify the EventSource attribute to add "Vendored." prefix
+        var nameProperty = eventSourceAttribute.Properties.FirstOrDefault(p => p.Name == "Name");
+        if (nameProperty.Name == null)
+        {
+            logger.Log("Name property not found in EventSource attribute.");
+            return false;
+        }
+
+        string currentName = nameProperty.Argument.Value?.ToString() ?? string.Empty;
+        if (currentName.StartsWith("Vendored."))
+        {
+            logger.Log($"EventSource Name already has 'Vendored.' prefix: {currentName}");
+        }
+
+        string newName = "Vendored." + currentName;
+
+        // Remove the old property
+        eventSourceAttribute.Properties.Remove(nameProperty);
+
+        // Add the new property with updated value
+        eventSourceAttribute.Properties.Add(new CustomAttributeNamedArgument(
+            nameProperty.Name,
+            new CustomAttributeArgument(nameProperty.Argument.Type, newName)));
+
+        logger.Log($"Updated EventSource Name from '{currentName}' to '{newName}'");
+
+        return true;
+    }
+}

src/Agent/NewRelic/AssemblyModifier/Program.cs

@@ -0,0 +1,81 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Mono.Cecil;
+
+if (args.Length == 0)
+{
+    Console.WriteLine("Usage: <program> <assembly-path> <optional-search-directory>");
+    return 1;
+}
+
+string assemblyPath = args[0];
+var logger = GetLogger(assemblyPath);
+
+if (!File.Exists(assemblyPath))
+{
+    logger.Log($"Error: Assembly not found at '{assemblyPath}'");
+    return 1;
+}
+
+try
+{
+    var resolver = new DefaultAssemblyResolver();
+
+    if (args.Length > 1 && Directory.Exists(args[1]))
+    {
+        resolver.AddSearchDirectory(args[1]);
+    }
+
+    var parameters = new ReaderParameters
+    {
+        AssemblyResolver = resolver,
+        ReadWrite = true
+    };
+
+    using ModuleDefinition module = ModuleDefinition.ReadModule(assemblyPath, parameters);
+
+    IEnumerable<IModificationJob> jobs = [new InternalizeMetricsEventSourceName(logger)];
+
+    foreach (var job in jobs)
+    {
+        if (!job.Run(module))
+        {
+            logger.Log("Modification Job {0} failed.", job.GetType().Name);
+            logger.Log("Not saving changes to the assembly.");
+            return 2;
+        }
+    }
+
+    // Save the modified assembly
+    module.Write();
+}
+catch (Exception ex)
+{
+    logger.Log($"Error reading assembly: {ex.Message}");
+    return 3;
+}
+
+logger.Log("Completed all assembly modifications.");
+return 0;
+
+static Logger GetLogger(string assemblyPath)
+{
+    string context = "unknown: ";
+
+    var assemblyName = Path.GetFileName(assemblyPath);
+    var directoryName = Path.GetFileName(Path.GetDirectoryName(assemblyPath));
+
+    if (string.IsNullOrWhiteSpace(assemblyName) || string.IsNullOrWhiteSpace(directoryName))
+        return new Logger(context);
+
+    return new Logger($"{directoryName}\\{assemblyName}: ");
+}
+
+public class Logger(string context)
+{
+    public void Log(string message, params scoped ReadOnlySpan<object?> arg)
+    {
+        Console.WriteLine(context + message, arg);
+    }
+}