Add filtering by attributes

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

@@ -43,19 +43,24 @@ public bool TryEnqueue<TState>(
         Exception? exception,
         Func<TState, Exception?, string> formatter)
     {
-        if (!IsEnabled(category, logLevel, eventId))
-        {
-            return false;
-        }
-
         SerializedLogRecord serializedLogRecord = default;
         if (attributes is ModernTagJoiner modernTagJoiner)
         {
+            if (!IsEnabled(category, logLevel, eventId, modernTagJoiner))
+            {
+                return false;
+            }
+
             serializedLogRecord = new SerializedLogRecord(logLevel, eventId, _timeProvider.GetUtcNow(), modernTagJoiner, exception,
                 ((Func<ModernTagJoiner, Exception?, string>)(object)formatter)(modernTagJoiner, exception));
         }
         else if (attributes is LegacyTagJoiner legacyTagJoiner)
         {
+            if (!IsEnabled(category, logLevel, eventId, legacyTagJoiner))
+            {
+                return false;
+            }
+
             serializedLogRecord = new SerializedLogRecord(logLevel, eventId, _timeProvider.GetUtcNow(), legacyTagJoiner, exception,
                 ((Func<LegacyTagJoiner, Exception?, string>)(object)formatter)(legacyTagJoiner, exception));
         }
@@ -101,7 +106,7 @@ public void Flush()
         _bufferedLogger.LogRecords(deserializedLogRecords);
     }
 
-    public bool IsEnabled(string category, LogLevel logLevel, EventId eventId)
+    public bool IsEnabled(string category, LogLevel logLevel, EventId eventId, IReadOnlyList<KeyValuePair<string, object?>> attributes)
     {
         if (_timeProvider.GetUtcNow() < _lastFlushTimestamp + _globalOptions.CurrentValue.SuspendAfterFlushDuration)
         {
@@ -110,7 +115,7 @@ public bool IsEnabled(string category, LogLevel logLevel, EventId eventId)
 
         LoggerFilterRuleSelector.Select(_options.CurrentValue.Rules, category, logLevel, eventId, out BufferFilterRule? rule);
 
-        return rule is not null;
+        return rule is not null && rule.Filter(category, logLevel, eventId, attributes);
     }
 
     private void Trim()

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

@@ -55,7 +55,7 @@ public static ILoggingBuilder AddHttpRequestBuffering(this ILoggingBuilder build
         _ = Throw.IfNull(builder);
 
         _ = builder.Services
-            .Configure<HttpRequestBufferOptions>(options => options.Rules.Add(new BufferFilterRule(null, level, null)))
+            .Configure<HttpRequestBufferOptions>(options => options.Rules.Add(new BufferFilterRule(null, level, null, null)))
             .Configure(configure ?? new Action<HttpRequestBufferOptions>(_ => { }));
 
         return builder

src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj

@@ -15,7 +15,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
-    <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <NoWarn>$(NoWarn);CA1063;CA2227;SA1316;S1067;S1121;S3358</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DisableNETStandardCompatErrors>true</DisableNETStandardCompatErrors>

src/Libraries/Microsoft.Extensions.Telemetry/Buffering/BufferFilterRule.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Microsoft.Shared.DiagnosticIds;
@@ -17,7 +19,7 @@ public class BufferFilterRule : ILoggerFilterRule
     /// Initializes a new instance of the <see cref="BufferFilterRule"/> class.
     /// </summary>
     public BufferFilterRule()
-        : this(null, null, null)
+        : this(null, null, null, null)
     {
     }
 
@@ -27,11 +29,14 @@ public BufferFilterRule()
     /// <param name="categoryName">The category name to use in this filter rule.</param>
     /// <param name="logLevel">The <see cref="LogLevel"/> to use in this filter rule.</param>
     /// <param name="eventId">The <see cref="EventId"/> to use in this filter rule.</param>
-    public BufferFilterRule(string? categoryName, LogLevel? logLevel, int? eventId)
+    /// <param name="filter">The optional filter delegate to use if a log message passes other filters.</param>
+    public BufferFilterRule(string? categoryName, LogLevel? logLevel, int? eventId,
+        Func<string?, LogLevel?, EventId?, IReadOnlyList<KeyValuePair<string, object?>>, bool>? filter = null)
     {
         Category = categoryName;
         LogLevel = logLevel;
         EventId = eventId;
+        Filter = filter ?? ((_, _, _, _) => true);
     }
 
     /// <inheritdoc/>
@@ -42,4 +47,7 @@ public BufferFilterRule(string? categoryName, LogLevel? logLevel, int? eventId)
 
     /// <inheritdoc/>
     public int? EventId { get; set; }
+
+    /// <inheritdoc/>
+    public Func<string?, LogLevel?, EventId?, IReadOnlyList<KeyValuePair<string, object?>>, bool> Filter { get; }
 }

src/Libraries/Microsoft.Extensions.Telemetry/Buffering/GlobalBuffer.cs

@@ -42,19 +42,24 @@ public bool TryEnqueue<T>(
         Exception? exception,
         Func<T, Exception?, string> formatter)
     {
-        if (!IsEnabled(category, logLevel, eventId))
-        {
-            return false;
-        }
-
         SerializedLogRecord serializedLogRecord = default;
         if (attributes is ModernTagJoiner modernTagJoiner)
         {
+            if (!IsEnabled(category, logLevel, eventId, modernTagJoiner))
+            {
+                return false;
+            }
+
             serializedLogRecord = new SerializedLogRecord(logLevel, eventId, _timeProvider.GetUtcNow(), modernTagJoiner, exception,
                 ((Func<ModernTagJoiner, Exception?, string>)(object)formatter)(modernTagJoiner, exception));
         }
         else if (attributes is LegacyTagJoiner legacyTagJoiner)
         {
+            if (!IsEnabled(category, logLevel, eventId, legacyTagJoiner))
+            {
+                return false;
+            }
+
             serializedLogRecord = new SerializedLogRecord(logLevel, eventId, _timeProvider.GetUtcNow(), legacyTagJoiner, exception,
                 ((Func<LegacyTagJoiner, Exception?, string>)(object)formatter)(legacyTagJoiner, exception));
         }
@@ -118,7 +123,7 @@ private void Trim()
         }
     }
 
-    private bool IsEnabled(string category, LogLevel logLevel, EventId eventId)
+    private bool IsEnabled(string category, LogLevel logLevel, EventId eventId, IReadOnlyList<KeyValuePair<string, object?>> attributes)
     {
         if (_timeProvider.GetUtcNow() < _lastFlushTimestamp + _options.CurrentValue.SuspendAfterFlushDuration)
         {
@@ -127,6 +132,6 @@ private bool IsEnabled(string category, LogLevel logLevel, EventId eventId)
 
         LoggerFilterRuleSelector.Select(_options.CurrentValue.Rules, category, logLevel, eventId, out BufferFilterRule? rule);
 
-        return rule is not null;
+        return rule is not null && rule.Filter(category, logLevel, eventId, attributes);
     }
 }

src/Libraries/Microsoft.Extensions.Telemetry/Buffering/GlobalBufferLoggerBuilderExtensions.cs

@@ -52,7 +52,7 @@ public static ILoggingBuilder AddGlobalBuffer(this ILoggingBuilder builder, LogL
         _ = Throw.IfNull(builder);
 
         _ = builder.Services
-            .Configure<GlobalBufferOptions>(options => options.Rules.Add(new BufferFilterRule(null, level, null)))
+            .Configure<GlobalBufferOptions>(options => options.Rules.Add(new BufferFilterRule(null, level, null, null)))
             .Configure(configure ?? new Action<GlobalBufferOptions>(_ => { }));
 
         return builder.AddGlobalBufferManager();

src/Libraries/Microsoft.Extensions.Telemetry/ILoggerFilterRule.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Shared.DiagnosticIds;
 
@@ -15,15 +17,20 @@ public interface ILoggerFilterRule
     /// <summary>
     /// Gets the logger category this rule applies to.
     /// </summary>
-    public string? Category { get; }
+    string? Category { get; }
 
     /// <summary>
     /// Gets the maximum <see cref="LogLevel"/> of messages.
     /// </summary>
-    public LogLevel? LogLevel { get; }
+    LogLevel? LogLevel { get; }
 
     /// <summary>
     /// Gets the <see cref="EventId"/> of messages where this rule applies to.
     /// </summary>
-    public int? EventId { get; }
+    int? EventId { get; }
+
+    /// <summary>
+    /// Gets the filter delegate that would be additionally applied to messages that passed the <see cref="LogLevel"/>, <see cref="Category"/>, and <see cref="EventId"/> filters.
+    /// </summary>
+    Func<string?, LogLevel?, EventId?, IReadOnlyList<KeyValuePair<string, object?>>, bool> Filter { get; }
 }

src/Libraries/Microsoft.Extensions.Telemetry/LoggerFilterRuleSelector.cs

@@ -27,8 +27,7 @@ public static class LoggerFilterRuleSelector
     /// <param name="logLevel">The log level of the log event.</param>
     /// <param name="eventId">The event id of the log event.</param>
     /// <param name="bestRule">The best rule that matches the log event.</param>
-    public static void Select<T>(IList<T> rules, string category, LogLevel logLevel, EventId eventId,
-        out T? bestRule)
+    public static void Select<T>(IList<T> rules, string category, LogLevel logLevel, EventId eventId, out T? bestRule)
         where T : class, ILoggerFilterRule
     {
         bestRule = null;

test/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware.Tests/Buffering/HttpRequestBufferLoggerBuilderExtensionsTests.cs

@@ -45,8 +45,8 @@ public void AddHttpRequestBufferConfiguration_RegistersInDI()
     {
         List<BufferFilterRule> expectedData =
         [
-            new BufferFilterRule("Program.MyLogger", LogLevel.Information, 1),
-            new BufferFilterRule(null, LogLevel.Information, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Information, 1, null),
+            new BufferFilterRule(null, LogLevel.Information, null, null),
         ];
         ConfigurationBuilder configBuilder = new ConfigurationBuilder();
         configBuilder.AddJsonFile("appsettings.json");

test/Libraries/Microsoft.Extensions.AotCompatibility.TestApp/Microsoft.Extensions.AotCompatibility.TestApp.csproj

@@ -25,13 +25,6 @@
     <LibraryProjects Remove="$(RepoRoot)\src\Libraries\Microsoft.Extensions.Compliance.Redaction\Microsoft.Extensions.Compliance.Redaction.csproj" />
     <!-- https://github.com/dotnet/extensions/issues/5625 -->
     <LibraryProjects Remove="$(RepoRoot)\src\Libraries\Microsoft.Extensions.Http.Resilience\Microsoft.Extensions.Http.Resilience.csproj" />
-
-    <!-- TO DO: create a GitHub issue -->
-    <LibraryProjects Remove="$(RepoRoot)\src\Libraries\Microsoft.Extensions.Diagnostics.Testing\Microsoft.Extensions.Diagnostics.Testing.csproj" />
-    <LibraryProjects Remove="$(RepoRoot)\src\Libraries\Microsoft.Extensions.Http.Diagnostics\Microsoft.Extensions.Http.Diagnosticss.csproj" />
-    <LibraryProjects Remove="$(RepoRoot)\src\Libraries\Microsoft.Extensions.Telemetry\Microsoft.Extensions.Telemetry.csproj" />
-    <LibraryProjects Remove="$(RepoRoot)\src\Libraries\Microsoft.AspNetCore.Diagnostics.Middleware\Microsoft.AspNetCore.Diagnostics.Middleware.csproj" />
-    <!---->
 
     <TrimmerRootAssembly Include="@(LibraryProjects->'%(FileName)')" />
     <ProjectReference Include="@(LibraryProjects)" />

test/Libraries/Microsoft.Extensions.Telemetry.Tests/Buffering/GlobalBufferLoggerBuilderExtensionsTests.cs

@@ -44,8 +44,8 @@ public void AddGlobalBufferConfiguration_RegistersInDI()
     {
         List<BufferFilterRule> expectedData =
         [
-            new BufferFilterRule("Program.MyLogger", LogLevel.Information, 1),
-            new BufferFilterRule(null, LogLevel.Information, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Information, 1, null),
+            new BufferFilterRule(null, LogLevel.Information, null, null),
         ];
         ConfigurationBuilder configBuilder = new ConfigurationBuilder();
         configBuilder.AddJsonFile("appsettings.json");

test/Libraries/Microsoft.Extensions.Telemetry.Tests/Buffering/LoggerFilterRuleSelectorTests.cs

@@ -0,0 +1,69 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Diagnostics.Buffering;
+using Xunit;
+
+namespace Microsoft.Extensions.Logging.Test;
+public class LoggerFilterRuleSelectorTests
+{
+    [Fact]
+    public void SelectsRightRule()
+    {
+        // Arrange
+        var rules = new List<ILoggerFilterRule>
+        {
+            new BufferFilterRule(null, null, null, null),
+            new BufferFilterRule(null, null, 1, null),
+            new BufferFilterRule(null, LogLevel.Information, 1, null),
+            new BufferFilterRule(null, LogLevel.Information, 1, null),
+            new BufferFilterRule(null, LogLevel.Warning, null, null),
+            new BufferFilterRule(null, LogLevel.Warning, 2, null),
+            new BufferFilterRule(null, LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program1.MyLogger", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.*MyLogger1", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, 1), // the best rule
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, 2, null),
+            new BufferFilterRule("Program.MyLogger", null, 1, null),
+            new BufferFilterRule(null, LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, null, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Error, 1, null),
+        };
+
+        // Act
+        LoggerFilterRuleSelector.Select(
+            rules, "Program.MyLogger", LogLevel.Warning, 1, out var actualResult);
+
+        // Assert
+        Assert.Same(rules[9], actualResult);
+    }
+
+    [Fact]
+    public void WhenManyRuleApply_SelectsLast()
+    {
+        // Arrange
+        var rules = new List<ILoggerFilterRule>
+        {
+            new BufferFilterRule(null, LogLevel.Information, 1, null),
+            new BufferFilterRule(null, LogLevel.Information, 1, null),
+            new BufferFilterRule(null, LogLevel.Warning, null, null),
+            new BufferFilterRule(null, LogLevel.Warning, 2, null),
+            new BufferFilterRule(null, LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program1.MyLogger", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.*MyLogger1", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.MyLogger*", LogLevel.Warning, 1, null),
+            new BufferFilterRule("Program.MyLogger", LogLevel.Warning, 1), // the best rule
+            new BufferFilterRule("Program.MyLogger*", LogLevel.Warning, 1), // same as the best, but last and should be selected
+        };
+
+        // Act
+        LoggerFilterRuleSelector.Select(rules, "Program.MyLogger", LogLevel.Warning, 1, out var actualResult);
+
+        // Assert
+        Assert.Same(rules.Last(), actualResult);
+    }
+}