WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 4f61e62

Browse files
dkurepadkurepa
authored
[Rollout] Production Rollout 2025 03 05 (#4528)
<!-- Link the GitHub or AzDO issue this pull request is associated with. Please copy and paste the full URL rather than using the dotnet/arcade-services# syntax --> #4527
2 parents 8c33f21 + 93d595c commit 4f61e62

40 files changed

+420
-247
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dnceng.secretmanager": {
6-
"version": "1.1.0-beta.25112.1",
6+
"version": "1.1.0-beta.25125.2",
77
"commands": [
88
"secret-manager"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dnceng.configuration.bootstrap": {
18-
"version": "1.1.0-beta.25112.1",
18+
"version": "1.1.0-beta.25125.2",
1919
"commands": [
2020
"bootstrap-dnceng-configuration"
2121
]

‎arcade-services.sln‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.
8484
EndProject
8585
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.ScenarioTests", "test\ProductConstructionService.ScenarioTests\ProductConstructionService.ScenarioTests.csproj", "{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}"
8686
EndProject
87-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.Cli", "src\ProductConstructionService\ProductConstructionService.Cli\ProductConstructionService.Cli.csproj", "{A4125B78-593D-4659-AA28-0E176D4644E5}"
88-
EndProject
8987
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.BarViz", "src\ProductConstructionService\ProductConstructionService.BarViz\ProductConstructionService.BarViz.csproj", "{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}"
9088
EndProject
9189
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProductConstructionService.Client", "src\ProductConstructionService\Microsoft.DotNet.ProductConstructionService.Client\Microsoft.DotNet.ProductConstructionService.Client.csproj", "{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}"
9290
EndProject
93-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.ReproTool", "src\ProductConstructionService\ProductConstructionService.ReproTool\ProductConstructionService.ReproTool.csproj", "{5EFF5E1A-C951-4643-8994-9984D43E44D4}"
91+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.Cli", "tools\ProductConstructionService.Cli\ProductConstructionService.Cli.csproj", "{B95B12A8-FCE1-618A-CA77-134B59A5C050}"
92+
EndProject
93+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
94+
EndProject
95+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.ReproTool", "tools\ProductConstructionService.ReproTool\ProductConstructionService.ReproTool.csproj", "{261CB211-6023-8025-48E1-D11953F4C61C}"
9496
EndProject
9597
Global
9698
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -450,18 +452,6 @@ Global
450452
{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x64.Build.0 = Release|Any CPU
451453
{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x86.ActiveCfg = Release|Any CPU
452454
{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x86.Build.0 = Release|Any CPU
453-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
454-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
455-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Debug|x64.ActiveCfg = Debug|Any CPU
456-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Debug|x64.Build.0 = Debug|Any CPU
457-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Debug|x86.ActiveCfg = Debug|Any CPU
458-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Debug|x86.Build.0 = Debug|Any CPU
459-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
460-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Release|Any CPU.Build.0 = Release|Any CPU
461-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Release|x64.ActiveCfg = Release|Any CPU
462-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Release|x64.Build.0 = Release|Any CPU
463-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Release|x86.ActiveCfg = Release|Any CPU
464-
{A4125B78-593D-4659-AA28-0E176D4644E5}.Release|x86.Build.0 = Release|Any CPU
465455
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
466456
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
467457
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -486,18 +476,30 @@ Global
486476
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x64.Build.0 = Release|Any CPU
487477
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x86.ActiveCfg = Release|Any CPU
488478
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x86.Build.0 = Release|Any CPU
489-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
490-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
491-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Debug|x64.ActiveCfg = Debug|Any CPU
492-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Debug|x64.Build.0 = Debug|Any CPU
493-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Debug|x86.ActiveCfg = Debug|Any CPU
494-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Debug|x86.Build.0 = Debug|Any CPU
495-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
496-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Release|Any CPU.Build.0 = Release|Any CPU
497-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Release|x64.ActiveCfg = Release|Any CPU
498-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Release|x64.Build.0 = Release|Any CPU
499-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Release|x86.ActiveCfg = Release|Any CPU
500-
{5EFF5E1A-C951-4643-8994-9984D43E44D4}.Release|x86.Build.0 = Release|Any CPU
479+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
480+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Debug|Any CPU.Build.0 = Debug|Any CPU
481+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Debug|x64.ActiveCfg = Debug|Any CPU
482+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Debug|x64.Build.0 = Debug|Any CPU
483+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Debug|x86.ActiveCfg = Debug|Any CPU
484+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Debug|x86.Build.0 = Debug|Any CPU
485+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Release|Any CPU.ActiveCfg = Release|Any CPU
486+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Release|Any CPU.Build.0 = Release|Any CPU
487+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Release|x64.ActiveCfg = Release|Any CPU
488+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Release|x64.Build.0 = Release|Any CPU
489+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Release|x86.ActiveCfg = Release|Any CPU
490+
{B95B12A8-FCE1-618A-CA77-134B59A5C050}.Release|x86.Build.0 = Release|Any CPU
491+
{261CB211-6023-8025-48E1-D11953F4C61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
492+
{261CB211-6023-8025-48E1-D11953F4C61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
493+
{261CB211-6023-8025-48E1-D11953F4C61C}.Debug|x64.ActiveCfg = Debug|Any CPU
494+
{261CB211-6023-8025-48E1-D11953F4C61C}.Debug|x64.Build.0 = Debug|Any CPU
495+
{261CB211-6023-8025-48E1-D11953F4C61C}.Debug|x86.ActiveCfg = Debug|Any CPU
496+
{261CB211-6023-8025-48E1-D11953F4C61C}.Debug|x86.Build.0 = Debug|Any CPU
497+
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
498+
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|Any CPU.Build.0 = Release|Any CPU
499+
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x64.ActiveCfg = Release|Any CPU
500+
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x64.Build.0 = Release|Any CPU
501+
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x86.ActiveCfg = Release|Any CPU
502+
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x86.Build.0 = Release|Any CPU
501503
EndGlobalSection
502504
GlobalSection(SolutionProperties) = preSolution
503505
HideSolutionNode = FALSE
@@ -535,10 +537,10 @@ Global
535537
{B5833185-DD07-4C64-A4DA-D8290294F7E7} = {243A4561-BF35-405A-AF12-AC57BB27796D}
536538
{D94319F8-FCA0-495B-8B6E-190B4EEBEF93} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
537539
{12D91D30-EC50-4D2B-8D67-0C19FCD2303F} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
538-
{A4125B78-593D-4659-AA28-0E176D4644E5} = {243A4561-BF35-405A-AF12-AC57BB27796D}
539540
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21} = {243A4561-BF35-405A-AF12-AC57BB27796D}
540541
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE} = {243A4561-BF35-405A-AF12-AC57BB27796D}
541-
{5EFF5E1A-C951-4643-8994-9984D43E44D4} = {243A4561-BF35-405A-AF12-AC57BB27796D}
542+
{B95B12A8-FCE1-618A-CA77-134B59A5C050} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
543+
{261CB211-6023-8025-48E1-D11953F4C61C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
542544
EndGlobalSection
543545
GlobalSection(ExtensibilityGlobals) = postSolution
544546
SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
8383
<Uri>https://github.com/dotnet/arcade</Uri>
8484
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25112.1">
86+
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25125.2">
8787
<Uri>https://github.com/dotnet/dnceng</Uri>
88-
<Sha>311b348d2b56b83ad0ae81986835b050430eb63e</Sha>
88+
<Sha>f23f373d1315dbea9c2206e376e4519505fac211</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25112.1">
90+
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25125.2">
9191
<Uri>https://github.com/dotnet/dnceng</Uri>
92-
<Sha>311b348d2b56b83ad0ae81986835b050430eb63e</Sha>
92+
<Sha>f23f373d1315dbea9c2206e376e4519505fac211</Sha>
9393
</Dependency>
9494
</ToolsetDependencies>
9595
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<MicrosoftDotNetMetricsVersion>1.1.0-beta.25052.1</MicrosoftDotNetMetricsVersion>
3333
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.25125.2</MicrosoftDotNetServicesUtilityVersion>
3434
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.25053.1</MicrosoftDotNetWebAuthenticationVersion>
35-
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25112.1</MicrosoftDncEngSecretManagerVersion>
36-
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25112.1</MicrosoftDncEngConfigurationBootstrapVersion>
35+
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25125.2</MicrosoftDncEngSecretManagerVersion>
36+
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25125.2</MicrosoftDncEngConfigurationBootstrapVersion>
3737
</PropertyGroup>
3838
<!--Package names-->
3939
<PropertyGroup>

‎src/Microsoft.DotNet.Darc/DarcLib/TelemetryRecorder.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System;
5+
using System.Collections.Generic;
56

67
namespace Microsoft.DotNet.DarcLib;
78

@@ -12,17 +13,27 @@ public enum TrackedGitOperation
1213
Push,
1314
}
1415

16+
public enum CustomEventType
17+
{
18+
PullRequestUpdateFailed
19+
}
20+
1521
public interface ITelemetryRecorder
1622
{
1723
/// <summary>
1824
/// Records work item duration and result in the customEvents table, with the `workItem.{type}` name
1925
/// </summary>
20-
ITelemetryScope RecordWorkItemCompletion(string workItemName);
26+
ITelemetryScope RecordWorkItemCompletion(string workItemName, long attemptNumber, string operationId);
2127

2228
/// <summary>
2329
/// Records git operation duration and result.
2430
/// </summary>
2531
ITelemetryScope RecordGitOperation(TrackedGitOperation operation, string repoUri);
32+
33+
/// <summary>
34+
/// Records a custom event with the given name and custom properties.
35+
/// </summary>
36+
void RecordCustomEvent(CustomEventType customEvent, Dictionary<string, string> customProperties);
2637
}
2738

2839
public interface ITelemetryScope : IDisposable
@@ -40,8 +51,9 @@ public class NoTelemetryRecorder : ITelemetryRecorder
4051
{
4152
private static readonly NoTelemetryScope _instance = new();
4253

43-
public ITelemetryScope RecordWorkItemCompletion(string workItemName) => _instance;
54+
public ITelemetryScope RecordWorkItemCompletion(string workItemName, long attemptNumber, string operationId) => _instance;
4455
public ITelemetryScope RecordGitOperation(TrackedGitOperation operation, string repoUri) => _instance;
56+
public void RecordCustomEvent(CustomEventType eventName, Dictionary<string, string> customProperties) { }
4557

4658
public class NoTelemetryScope : ITelemetryScope
4759
{

‎src/ProductConstructionService/ProductConstructionService.Api/Telemetry/TelemetryRecorder.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,22 @@ public class TelemetryRecorder(
1515
private readonly ILogger<TelemetryRecorder> _logger = logger;
1616
private readonly TelemetryClient _telemetryClient = telemetryClient;
1717

18-
public ITelemetryScope RecordWorkItemCompletion(string workItemType)
19-
=> CreateScope("WorkItemExecuted", new() {{ "WorkItemType", workItemType }});
18+
public ITelemetryScope RecordWorkItemCompletion(string workItemType, long attemptNumber, string operationId)
19+
=> CreateScope("WorkItemExecuted", new()
20+
{
21+
{ "WorkItemType", workItemType },
22+
{ "Attempt", attemptNumber.ToString()},
23+
{ "OperationId", operationId }
24+
});
2025

2126
public ITelemetryScope RecordGitOperation(TrackedGitOperation operation, string repoUri)
2227
=> CreateScope($"Git{operation}", new() { { "Uri", repoUri } });
2328

29+
public void RecordCustomEvent(CustomEventType eventName, Dictionary<string, string> customProperties)
30+
{
31+
_telemetryClient.TrackEvent(eventName.ToString(), customProperties);
32+
}
33+
2434
private TelemetryScope CreateScope(string metricName, Dictionary<string, string> customDimensions)
2535
{
2636
return new TelemetryScope(metricName, _logger, _telemetryClient, customDimensions, []);

0 commit comments

Comments
 (0)