Skip to content

Use msbuild logging for symbol messages #7352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epananth merged 4 commits into from
May 12, 2021
Merged

Use msbuild logging for symbol messages #7352

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b0245b
Use msbuild logging for symbol messages
mmitche May 6, 2021
2675578
Merge branch 'main' into log-interleaved
mmitche May 10, 2021
ea6ebda
Merge remote-tracking branch 'upstream/main' into log-interleaved
mmitche May 11, 2021
d9716af
Fix compile error
mmitche May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ public async Task PublishSymbolsUsingStreamingAsync(
Dictionary<string, HashSet<Asset>> buildAssets,
SemaphoreSlim clientThrottle)
{
StringBuilder symbolLog = new StringBuilder();
symbolLog.AppendLine("Publishing Symbols to Symbol server: ");
Log.LogMessage(MessageImportance.High,
$"Performing symbol publishing... \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false ");
var symbolCategory = TargetFeedContentType.Symbols;
string containerId = await GetContainerIdAsync(ArtifactName.BlobArtifacts);

Expand All @@ -411,6 +411,8 @@ public async Task PublishSymbolsUsingStreamingAsync(
}
}

Log.LogMessage(MessageImportance.High, $"Total number of symbol files : {symbolsToPublish.Count}");

HashSet<TargetFeedConfig> feedConfigsForSymbols = FeedConfigs[symbolCategory];
Dictionary<string, string> serversToPublish =
GetTargetSymbolServers(feedConfigsForSymbols, msdlToken, symWebToken);
Expand All @@ -427,7 +429,7 @@ await Task.WhenAll(symbolsToPublish.Select(async symbol =>
await clientThrottle.WaitAsync();
string temporarySymbolsDirectory = CreateTemporaryDirectory();
string localSymbolPath = Path.Combine(temporarySymbolsDirectory, symbol);
symbolLog.AppendLine($"Downloading symbol : {symbol} to {localSymbolPath}");
Log.LogMessage(MessageImportance.High, $"Downloading symbol : {symbol} to {localSymbolPath}");

Stopwatch gatherDownloadTime = Stopwatch.StartNew();
await DownloadFileAsync(
Expand All @@ -438,18 +440,17 @@ await DownloadFileAsync(
localSymbolPath);

gatherDownloadTime.Stop();
symbolLog.AppendLine($"Time taken to download file to '{localSymbolPath}' is {gatherDownloadTime.ElapsedMilliseconds / 1000.0} (seconds)");
symbolLog.AppendLine($"Successfully downloaded symbol : {symbol} to {localSymbolPath}");
Log.LogMessage(MessageImportance.High, $"Time taken to download file to '{localSymbolPath}' is {gatherDownloadTime.ElapsedMilliseconds / 1000.0} (seconds)");
Log.LogMessage(MessageImportance.High, $"Successfully downloaded symbol : {symbol} to {localSymbolPath}");

List<string> symbolFiles = new List<string>();
symbolFiles.Add(localSymbolPath);
symbolLog.AppendLine($"Uploading symbol file '{string.Join(",", symbolFiles)}'");

foreach (var server in serversToPublish)
{
var serverPath = server.Key;
var token = server.Value;
symbolLog.AppendLine($"Publishing symbol file {symbol} to {serverPath}:");
Log.LogMessage(MessageImportance.High, $"Publishing symbol file {symbol} to {serverPath}:");
Stopwatch gatherSymbolPublishingTime = Stopwatch.StartNew();

try
Expand All @@ -475,7 +476,7 @@ await PublishSymbolsHelper.PublishAsync(
}

gatherSymbolPublishingTime.Stop();
symbolLog.AppendLine(
Log.LogMessage(MessageImportance.High,
$"Symbol publishing for {symbol} took {gatherSymbolPublishingTime.ElapsedMilliseconds / 1000.0} (seconds)");
}

Expand All @@ -487,13 +488,7 @@ await PublishSymbolsHelper.PublishAsync(
}
}));

symbolLog.AppendLine(
$"Performing symbol publishing... \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false ");
symbolLog.AppendLine($"Total number of symbol files : {symbolsToPublish.Count}");
symbolLog.AppendLine("Successfully published to Symbol Server.");
symbolLog.AppendLine();
Log.LogMessage(MessageImportance.High, symbolLog.ToString());
symbolLog.Clear();
Log.LogMessage(MessageImportance.High, "Successfully published to symbol servers.");
}
}
else
Expand Down Expand Up @@ -522,7 +517,7 @@ await PublishSymbolsHelper.PublishAsync(
{
var serverPath = server.Key;
var token = server.Value;
symbolLog.AppendLine($"Publishing pdbFiles to {serverPath}:");
Log.LogMessage(MessageImportance.High, $"Publishing pdbFiles to {serverPath}:");

try
{
Expand Down Expand Up @@ -618,8 +613,7 @@ public async Task PublishSymbolsfromBlobArtifactsAsync(
{
if (Directory.Exists(temporarySymbolsLocation))
{
StringBuilder symbolLog = new StringBuilder();
symbolLog.AppendLine("Publishing Symbols to Symbol server: ");
Log.LogMessage(MessageImportance.High, "Publishing Symbols to Symbol server: ");
string[] fileEntries = Directory.GetFiles(temporarySymbolsLocation);

var category = TargetFeedContentType.Symbols;
Expand Down Expand Up @@ -647,9 +641,8 @@ public async Task PublishSymbolsfromBlobArtifactsAsync(
foreach (var server in serversToPublish)
{
var serverPath = server.Key;
var token = server.Value;
symbolLog.AppendLine($"Publishing symbol packages to {serverPath}:");
symbolLog.AppendLine(
var token = server.Value;;
Log.LogMessage(MessageImportance.High,
$"Performing symbol publishing...\nSymbolServerPath : ${serverPath} \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false \nTotal number of symbol files : {fileEntries.Length} ");

try
Expand All @@ -674,10 +667,7 @@ await PublishSymbolsHelper.PublishAsync(
Log.LogError(ex.Message);
}

symbolLog.AppendLine("Successfully published to Symbol Server.");
symbolLog.AppendLine();
Log.LogMessage(MessageImportance.High, symbolLog.ToString());
symbolLog.Clear();
Log.LogMessage(MessageImportance.High, $"Successfully published to ${serverPath}.");
}
}
else
Expand Down