[Rollout] Production rollout 2025-03-19 (#4582)

#4581

Author: premun

src/Microsoft.DotNet.Darc/DarcLib/Helpers/DependencyFileManager.cs

@@ -320,8 +320,8 @@ public void UpdateVersionDetails(
                 dependenciesNode.PrependChild(sourceNode);
             }
 
-            SetAttribute(versionDetails, sourceNode, VersionDetailsParser.MappingElementName, sourceDependency.Mapping);
             SetAttribute(versionDetails, sourceNode, VersionDetailsParser.UriElementName, sourceDependency.Uri);
+            SetAttribute(versionDetails, sourceNode, VersionDetailsParser.MappingElementName, sourceDependency.Mapping);
             SetAttribute(versionDetails, sourceNode, VersionDetailsParser.ShaElementName, sourceDependency.Sha);
             if (sourceDependency.BarId != null) {
                 SetAttribute(versionDetails, sourceNode, VersionDetailsParser.BarIdElementName, sourceDependency.BarId.ToString());

src/ProductConstructionService/ProductConstructionService.Common/AddJobLoggingExtension.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
+using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.Extensions.DependencyInjection;
@@ -44,6 +45,8 @@ public static IHostApplicationBuilder RegisterLogging(
             builder.AddConsole();
         });
 
+        builder.Services.AddSingleton<TelemetryClient>();
+
         return builder;
     }
 }

src/ProductConstructionService/ProductConstructionService.DependencyFlow/InProgressPullRequest.cs

@@ -33,9 +33,6 @@ public class InProgressPullRequest : DependencyFlowWorkItem, IPullRequest
     [DataMember]
     public List<SubscriptionPullRequestUpdate> ContainedSubscriptions { get; set; }
 
-    [DataMember]
-    public List<SubscriptionPullRequestUpdate> Contained { get; init; }
-
     [DataMember]
     public List<DependencyUpdateSummary> RequiredUpdates { get; set; }
 

src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestBuilder.cs

@@ -219,7 +219,7 @@ public string GenerateCodeFlowPRTitle(
         string targetBranch,
         List<string> repoNames)
     {
-        return GeneratePRTitle($"[{targetBranch}] Source code updates from ", repoNames);
+        return GeneratePRTitle($"[{targetBranch}] Source code updates from", repoNames);
     }
 
     public string GenerateCodeFlowPRDescription(

src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestUpdater.cs

@@ -919,7 +919,7 @@ private static TimeSpan GetReminderDelay(DateTimeOffset updatedAt)
             >= 30 => TimeSpan.FromHours(12),
             >= 21 => TimeSpan.FromHours(1),
             >= 14 => TimeSpan.FromMinutes(30),
-            >= 7 => TimeSpan.FromMinutes(15),
+            >= 2 => TimeSpan.FromMinutes(15),
             _ => DefaultReminderDelay,
         };
     }

src/ProductConstructionService/ProductConstructionService.FeedCleaner/FeedCleanerJob.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Kusto.Cloud.Platform.Utils;
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.DotNet.DarcLib;
 using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.Models.AzureDevOps;
@@ -93,15 +95,18 @@ await Parallel.ForEachAsync(
             async (AzureDevOpsFeed feed, CancellationToken cancellationToken) =>
             {
                 using var scope = _serviceProvider.CreateScope();
-
-                try
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-                    await feedProcessor(scope, feed);
-                }
-                catch (Exception e)
+                TelemetryClient telemetryClient = scope.ServiceProvider.GetRequiredService<TelemetryClient>();
+                using (var operation = telemetryClient.StartOperation<RequestTelemetry>(feed.Name))
                 {
-                    _logger.LogError(e, "Failed to process feed {feed}", feed.Name);
+                    try
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        await feedProcessor(scope, feed);
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogError(e, "Failed to process feed {feed}", feed.Name);
+                    }
                 }
 
                 Interlocked.Increment(ref feedsProcessed);

test/Microsoft.DotNet.DarcLib.Tests/Helpers/VersionDetailsParserTests.cs

@@ -143,7 +143,7 @@ public void IsVmrCodeflowParsedTest()
             """
             <?xml version="1.0" encoding="utf-8"?>
             <Dependencies>
-              <Source Uri="https://github.com/dotnet/dotnet" Mapping="SomeRepo" Sha="86ba5fba7c39323011c2bfc6b713142affc76171" BarId="23412" />
+              <Source Mapping="SomeRepo" Uri="https://github.com/dotnet/dotnet" Sha="86ba5fba7c39323011c2bfc6b713142affc76171" BarId="23412" />
               <ProductDependencies>
                 <Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
                   <Uri>https://github.com/dotnet/core-setup</Uri>

test/ProductConstructionService.FeedCleaner.Tests/FeedCleanerTests.cs

@@ -6,6 +6,7 @@
 using Maestro.Common.AzureDevOpsTokens;
 using Maestro.Data;
 using Maestro.Data.Models;
+using Microsoft.ApplicationInsights;
 using Microsoft.DotNet.DarcLib;
 using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.Models.AzureDevOps;
@@ -39,6 +40,7 @@ private FeedCleanerJob InitializeFeedCleaner(string name, Dictionary<string, Azu
 
         services.AddSingleton(_env.Object);
         services.AddLogging();
+        services.AddSingleton<TelemetryClient>();
         services.AddDbContext<BuildAssetRegistryContext>(
             options =>
             {

test/ProductConstructionService.ScenarioTests/ScenarioTestBase.cs

@@ -268,7 +268,7 @@ protected async Task CheckNonBatchedGitHubPullRequest(
     }
 
     protected static string GetExpectedCodeFlowDependencyVersionEntry(string repo, string sha, int buildId) =>
-        $"Source Uri=\"{GetGitHubRepoUrl(repo)}\" Sha=\"{sha}\" BarId=\"{buildId}\" />";
+        $"<Source Uri=\"{GetGitHubRepoUrl(repo)}\" Mapping=\"{repo}\" Sha=\"{sha}\" BarId=\"{buildId}\" />";
 
     protected async Task CheckGitHubPullRequest(
         string expectedPRTitle,