Merge branch 'main' into copilot/fix-50548

Resolved conflicts:
- WebAssemblyHotReload.cs: Accepted deletion from main (entire class was removed)
- PublicAPI.Unshipped.txt: Merged *REMOVED* entries properly

Author: Copilot

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@5a11b260f9b0f31b4e7643ad823a4e0f2cdb3ddb # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

.github/workflows/inter-branch-merge-flow.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@5a11b260f9b0f31b4e7643ad823a4e0f2cdb3ddb # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2024-06-24

eng/Version.Details.xml

@@ -124,6 +124,11 @@ try {
     foreach ($dep in $versionDetails.SelectNodes('//Dependency')) {
         Write-Verbose "Found $dep"
 
+        if ($dep.Label -eq 'Manual') {
+            # skip dependencies that are manually updated
+            continue
+        }
+
         $expectedVersion = $dep.Version
 
         if ($dep.Name -in $globalJson.'msbuild-sdks'.PSObject.Properties.Name) {

eng/Versions.props

@@ -31,7 +31,7 @@
       <ItemGroup>
         <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
         <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
-        <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
+        <HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
       </ItemGroup>
     </When>
     <Otherwise>
@@ -54,7 +54,7 @@
 
         <!-- Windows -->
         <HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
-        <HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
+        <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
 
         <!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on its setup scripts. -->
         <HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows"

eng/scripts/CodeCheck.ps1

@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.102",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.102",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25358.102",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25367.101",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/targets/Helix.Common.props

@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Components;
 internal class ComponentsActivitySource
 {
     internal const string Name = "Microsoft.AspNetCore.Components";
-    internal const string OnRouteName = $"{Name}.RouteChange";
+    internal const string OnRouteName = $"{Name}.Navigate";
     internal const string OnEventName = $"{Name}.HandleEvent";
 
     private static ActivitySource ActivitySource { get; } = new ActivitySource(Name);
@@ -23,7 +23,7 @@ public void Init(ComponentsActivityLinkStore store)
         _componentsActivityLinkStore = store;
     }
 
-    public ComponentsActivityHandle StartRouteActivity(string componentType, string route)
+    public ComponentsActivityHandle StartNavigateActivity(string componentType, string route)
     {
         var activity = ActivitySource.CreateActivity(OnRouteName, ActivityKind.Internal, parentId: null, null, null);
         if (activity is not null)
@@ -54,12 +54,12 @@ public ComponentsActivityHandle StartRouteActivity(string componentType, string
         return default;
     }
 
-    public void StopRouteActivity(ComponentsActivityHandle activityHandle, Exception? ex)
+    public void StopNavigateActivity(ComponentsActivityHandle activityHandle, Exception? ex)
     {
         StopComponentActivity(ComponentsActivityLinkStore.Route, activityHandle, ex);
     }
 
-    public static ComponentsActivityHandle StartEventActivity(string? componentType, string? methodName, string? attributeName)
+    public static ComponentsActivityHandle StartHandleEventActivity(string? componentType, string? methodName, string? attributeName)
     {
         var activity = ActivitySource.CreateActivity(OnEventName, ActivityKind.Internal, parentId: null, null, null);
 
@@ -91,21 +91,21 @@ public static ComponentsActivityHandle StartEventActivity(string? componentType,
         return default;
     }
 
-    public void StopEventActivity(ComponentsActivityHandle activityHandle, Exception? ex)
+    public void StopHandleEventActivity(ComponentsActivityHandle activityHandle, Exception? ex)
     {
         StopComponentActivity(ComponentsActivityLinkStore.Event, activityHandle, ex);
     }
 
-    public async Task CaptureEventStopAsync(Task task, ComponentsActivityHandle activityHandle)
+    public async Task CaptureHandleEventStopAsync(Task task, ComponentsActivityHandle activityHandle)
     {
         try
         {
             await task;
-            StopEventActivity(activityHandle, null);
+            StopHandleEventActivity(activityHandle, null);
         }
         catch (Exception ex)
         {
-            StopEventActivity(activityHandle, ex);
+            StopHandleEventActivity(activityHandle, ex);
         }
     }
 

global.json

@@ -20,6 +20,7 @@ internal sealed class ComponentsMetrics : IDisposable
     private readonly Histogram<double> _eventDuration;
     private readonly Histogram<double> _parametersDuration;
     private readonly Histogram<double> _batchDuration;
+    private readonly Histogram<int> _batchSize;
 
     public bool IsNavigationEnabled => _navigationCount.Enabled;
 
@@ -37,27 +38,33 @@ public ComponentsMetrics(IMeterFactory meterFactory)
         _lifeCycleMeter = meterFactory.Create(LifecycleMeterName);
 
         _navigationCount = _meter.CreateCounter<long>(
-            "aspnetcore.components.navigation",
+            "aspnetcore.components.navigate",
             unit: "{route}",
             description: "Total number of route changes.");
 
         _eventDuration = _meter.CreateHistogram(
-            "aspnetcore.components.event_handler",
+            "aspnetcore.components.handle_event.duration",
             unit: "s",
             description: "Duration of processing browser event.  It includes business logic of the component but not affected child components.",
             advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
 
         _parametersDuration = _lifeCycleMeter.CreateHistogram(
-            "aspnetcore.components.update_parameters",
+            "aspnetcore.components.update_parameters.duration",
             unit: "s",
             description: "Duration of processing component parameters. It includes business logic of the component.",
             advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.BlazorRenderingSecondsBucketBoundaries });
 
         _batchDuration = _lifeCycleMeter.CreateHistogram(
-            "aspnetcore.components.render_diff",
+            "aspnetcore.components.render_diff.duration",
             unit: "s",
             description: "Duration of rendering component tree and producing HTML diff. It includes business logic of the changed components.",
             advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.BlazorRenderingSecondsBucketBoundaries });
+
+        _batchSize = _lifeCycleMeter.CreateHistogram(
+            "aspnetcore.components.render_diff.size",
+            unit: "{elements}",
+            description: "Number of HTML elements modified during a rendering batch.",
+            advice: new InstrumentAdvice<int> { HistogramBucketBoundaries = MetricsConstants.BlazorRenderingDiffLengthBucketBoundaries });
     }
 
     public void Navigation(string componentType, string route)
@@ -137,10 +144,7 @@ public void FailParametersSync(Exception ex, long startTimestamp, string? compon
 
     public async Task CaptureBatchDuration(Task task, long startTimestamp, int diffLength)
     {
-        var tags = new TagList
-        {
-            { "aspnetcore.components.diff.length", BucketDiffLength(diffLength) }
-        };
+        var tags = new TagList();
 
         try
         {
@@ -152,37 +156,19 @@ public async Task CaptureBatchDuration(Task task, long startTimestamp, int diffL
         }
         var duration = Stopwatch.GetElapsedTime(startTimestamp);
         _batchDuration.Record(duration.TotalSeconds, tags);
+        _batchSize.Record(diffLength, tags);
     }
 
     public void FailBatchSync(Exception ex, long startTimestamp)
     {
         var duration = Stopwatch.GetElapsedTime(startTimestamp);
         var tags = new TagList
             {
-                { "aspnetcore.components.diff.length", 0 },
                 { "error.type", ex.GetType().FullName ?? "unknown" }
             };
         _batchDuration.Record(duration.TotalSeconds, tags);
     }
 
-    private static int BucketDiffLength(int diffLength)
-    {
-        return diffLength switch
-        {
-            <= 1 => 1,
-            <= 2 => 2,
-            <= 5 => 5,
-            <= 10 => 10,
-            <= 20 => 20,
-            <= 50 => 50,
-            <= 100 => 100,
-            <= 500 => 500,
-            <= 1000 => 1000,
-            <= 10000 => 10000,
-            _ => 10001,
-        };
-    }
-
     public void Dispose()
     {
         _meter.Dispose();

src/Components/Components/src/ComponentsActivitySource.cs

@@ -61,7 +61,6 @@ public event EventHandler<NotFoundEventArgs> OnNotFound
     // The URI. Always represented an absolute URI.
     private string? _uri;
     private bool _isInitialized;
-    internal string NotFoundPageRoute { get; set; } = string.Empty;
 
     /// <summary>
     /// Gets or sets the current base URI. The <see cref="BaseUri" /> is always represented as an absolute URI in string form with trailing slash.
@@ -211,7 +210,7 @@ private void NotFoundCore()
         }
         else
         {
-            _notFound.Invoke(this, new NotFoundEventArgs(NotFoundPageRoute));
+            _notFound.Invoke(this, new NotFoundEventArgs());
         }
     }