Move shared files to Shared project and add more tests

Author: evgenyfedorov2

eng/MSBuild/Shared.props

@@ -46,4 +46,8 @@
   <ItemGroup Condition="'$(InjectStringSplitExtensions)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\StringSplit\*.cs" LinkBase="Shared\StringSplit" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(InjectSharedLoggingBuffering)' == 'true'">
+    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\LoggingBuffering\*.cs" LinkBase="Shared\LoggingBuffering" />
+  </ItemGroup>
 </Project>

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Buffering/DeserializedLogRecord.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Concurrent;
+using Microsoft.Extensions.Diagnostics.Buffering;
 
 namespace Microsoft.AspNetCore.Diagnostics.Buffering;
 

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Buffering/HttpRequestBufferHolder.cs

@@ -11,14 +11,14 @@
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
     <UseLoggingGenerator>true</UseLoggingGenerator>
-    <InjectSharedThrow>false</InjectSharedThrow>
-    <InjectTrimAttributesOnLegacy>false</InjectTrimAttributesOnLegacy>
+    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectSharedDebugger>true</InjectSharedDebugger>
     <InjectSharedDataValidation>false</InjectSharedDataValidation>
     <InjectSharedPools>false</InjectSharedPools>
     <InjectSharedBufferWriterPool>true</InjectSharedBufferWriterPool>
     <InjectSharedNumericExtensions>false</InjectSharedNumericExtensions>
-    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectSharedThrow>false</InjectSharedThrow>
+    <InjectTrimAttributesOnLegacy>false</InjectTrimAttributesOnLegacy>
   </PropertyGroup>
 
   <PropertyGroup>

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Buffering/ILoggingBuffer.cs

@@ -8,15 +8,16 @@
   <PropertyGroup>
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <InjectGetOrAddOnLegacy>true</InjectGetOrAddOnLegacy>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
-    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
-    <InjectSharedText>true</InjectSharedText>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
+    <InjectSharedLoggingBuffering>true</InjectSharedLoggingBuffering>
+    <InjectSharedMemoization>true</InjectSharedMemoization>
     <InjectSharedNumericExtensions>true</InjectSharedNumericExtensions>
     <InjectSharedPools>true</InjectSharedPools>
     <InjectSharedRentedSpan>true</InjectSharedRentedSpan>
-    <InjectSharedMemoization>true</InjectSharedMemoization>
-    <InjectGetOrAddOnLegacy>true</InjectGetOrAddOnLegacy>
+    <InjectSharedText>true</InjectSharedText>
     <EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <NoWarn>$(NoWarn);IL2026</NoWarn>

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Buffering/SerializedLogRecord.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-
+#if !SHARED_PROJECT || NET9_0_OR_GREATER
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
@@ -62,3 +62,4 @@ public DeserializedLogRecord(
     public override IReadOnlyList<KeyValuePair<string, object?>> Attributes => _attributes;
     private IReadOnlyList<KeyValuePair<string, object?>> _attributes;
 }
+#endif

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Microsoft.AspNetCore.Diagnostics.Middleware.csproj

@@ -10,9 +10,8 @@ namespace Microsoft.Extensions.Diagnostics.Buffering;
 /// <summary>
 /// Represents a log record that has been serialized for purposes of buffering or similar.
 /// </summary>
-#pragma warning disable CA1815 // Override equals and operator equals on value types
+#pragma warning disable CA1815 // Override equals and operator equals on value types - not used for this struct, would be dead code
 internal readonly struct SerializedLogRecord
-#pragma warning restore CA1815 // Override equals and operator equals on value types
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="SerializedLogRecord"/> struct.
@@ -41,16 +40,28 @@ public SerializedLogRecord(
             serializedAttributes = new List<KeyValuePair<string, object?>>(attributes.Count);
             for (int i = 0; i < attributes.Count; i++)
             {
+                string key = attributes[i].Key;
                 string value = attributes[i].Value?.ToString() ?? string.Empty;
-                serializedAttributes.Add(new KeyValuePair<string, object?>(attributes[i].Key, value));
+                serializedAttributes.Add(new KeyValuePair<string, object?>(key, value));
+
+                SizeInBytes += key.Length * sizeof(char);
                 SizeInBytes += value.Length * sizeof(char);
             }
-
-            Exception = exception?.Message;
         }
 
         Attributes = serializedAttributes;
+
+        Exception = exception?.Message;
+        if (Exception is not null)
+        {
+            SizeInBytes += Exception.Length * sizeof(char);
+        }
+
         FormattedMessage = formattedMessage;
+        if (FormattedMessage is not null)
+        {
+            SizeInBytes += FormattedMessage.Length * sizeof(char);
+        }
     }
 
     /// <summary>

src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj

@@ -29,6 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.HashCode" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" />
     <PackageReference Include="System.ComponentModel.Annotations" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" NoWarn="RT0003" />
     <PackageReference Include="System.Memory" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" />

src/Libraries/Microsoft.Extensions.Telemetry/Buffering/DeserializedLogRecord.cs src/Shared/LoggingBuffering/DeserializedLogRecord.cs

@@ -44,7 +44,7 @@ public void AddGlobalBuffer_WithConfiguration_RegistersInDI()
     {
         List<BufferFilterRule> expectedData =
         [
-            new BufferFilterRule("Program.MyLogger", LogLevel.Information, 1, [new("region", "westus2")]),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Information, 1, [new("region", "westus2"), new ("priority", 1)]),
             new BufferFilterRule(null, LogLevel.Information, null, null),
         ];
         ConfigurationBuilder configBuilder = new ConfigurationBuilder();

src/Libraries/Microsoft.Extensions.Telemetry/Buffering/ILoggingBuffer.cs src/Shared/LoggingBuffering/ILoggingBuffer.cs

@@ -68,4 +68,22 @@ public void WhenManyRuleApply_SelectsLast()
         // Assert
         Assert.Same(rules.Last(), actualResult);
     }
+
+    [Fact]
+    public void CanWorkWithValueTypeAttributes()
+    {
+        // Arrange
+        var rules = new List<BufferFilterRule>
+        {
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, 1, [new("priority", 2)]), // the best rule
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, 1, [new("priority", 3)]),
+            new BufferFilterRule("Program.MyLogger*", LogLevel.Warning, 1, null),
+        };
+
+        // Act
+        BufferFilterRuleSelector.Select(rules, "Program.MyLogger", LogLevel.Warning, 1, [new("priority", 2)], out var actualResult);
+
+        // Assert
+        Assert.Same(rules.First(), actualResult);
+    }
 }

src/Libraries/Microsoft.Extensions.Telemetry/Buffering/SerializedLogRecord.cs src/Shared/LoggingBuffering/SerializedLogRecord.cs

@@ -29,6 +29,10 @@
           {
             "key": "region",
             "value": "westus2"
+          },
+          {
+            "key": "priority",
+            "value": 1
           }
         ]
       },