From 487c8cda3a8a28237989ea92d903693ebd66762e Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Tue, 21 Jun 2022 13:58:28 -0700 Subject: [PATCH 1/7] Initial pass at adding logging and/or switching Exceptions to specific types of Exceptions --- .../Controllers/DiagController.cs | 8 ++++++-- .../ProcessInfoImpl.cs | 11 ++++++++++- .../Egress/FileSystem/FileSystemEgressProvider.cs | 6 +++++- .../dotnet-monitor/FilteredEndpointInfoSource.cs | 3 ++- src/Tools/dotnet-monitor/Startup.cs | 4 ++-- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs index db544ac5504..b1f8dab050f 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs @@ -75,9 +75,13 @@ public DiagController(ILogger logger, { defaultProcessInfo = await _diagnosticServices.GetProcessAsync(null, HttpContext.RequestAborted); } - catch (Exception) + catch (ArgumentException ex) { - // Unable to locate a default process; no action required + _logger.LogInformation(ex.Message); + } + catch (InvalidOperationException ex) + { + _logger.LogInformation(ex.Message); } IList processesIdentifiers = new List(); diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs index 3a55dc2e993..6cbe944891d 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs @@ -92,7 +92,16 @@ public static async Task FromEndpointInfoAsync(IEndpointInfo endpo commandLine = await commandLineSource.Task; } - catch + catch (ObjectDisposedException) + { + } + catch (PipelineException) + { + } + catch (ArgumentNullException) + { + } + catch (ArgumentException) { } finally diff --git a/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs b/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs index 11d8b37d9ac..b16e8433140 100644 --- a/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs +++ b/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs @@ -18,9 +18,12 @@ namespace Microsoft.Diagnostics.Tools.Monitor.Egress.FileSystem internal class FileSystemEgressProvider : EgressProvider { + ILogger _logger; + public FileSystemEgressProvider(ILogger logger) : base(logger) { + _logger = logger; } public override async Task EgressAsync( @@ -75,8 +78,9 @@ public override async Task EgressAsync( File.Delete(intermediateFilePath); } } - catch (Exception) + catch (Exception ex) { + _logger.LogTrace(ex.Message); } } } diff --git a/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs b/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs index a8f8a73928d..b3628045910 100644 --- a/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs +++ b/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs @@ -63,8 +63,9 @@ public FilteredEndpointInfoSource( _runtimeInstanceCookieToFilterOut = runtimeInstanceCookie; } } - catch (Exception) + catch (Exception ex) { + clientSourceLogger.LogTrace(ex.Message); } // If connecting to runtime instances, filter self out. In listening mode, it's likely diff --git a/src/Tools/dotnet-monitor/Startup.cs b/src/Tools/dotnet-monitor/Startup.cs index 5086cfff423..05a7db788f0 100644 --- a/src/Tools/dotnet-monitor/Startup.cs +++ b/src/Tools/dotnet-monitor/Startup.cs @@ -155,9 +155,9 @@ public void Configure( { address = BindingAddress.Parse(url); } - catch (Exception) + catch (FormatException ex) { - continue; + logger.LogInformation(ex.Message); } if (string.Equals(Uri.UriSchemeHttp, address.Scheme, StringComparison.OrdinalIgnoreCase)) From c936104cf896f854fed7acf402f3198ba12f2615 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Wed, 22 Jun 2022 09:41:09 -0700 Subject: [PATCH 2/7] Minor tweaks --- .../Controllers/DiagController.cs | 1 + src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs index b1f8dab050f..e502f1fcec2 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs @@ -77,6 +77,7 @@ public DiagController(ILogger logger, } catch (ArgumentException ex) { + // Unable to locate a default process; no action required _logger.LogInformation(ex.Message); } catch (InvalidOperationException ex) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs index 6cbe944891d..004d10ac45a 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs @@ -104,6 +104,9 @@ public static async Task FromEndpointInfoAsync(IEndpointInfo endpo catch (ArgumentException) { } + catch (OperationCanceledException) + { + } finally { if (null != pipeline) From d8b30c360c2cc0296c637f55e722b6c5d3f89be6 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Wed, 22 Jun 2022 09:49:35 -0700 Subject: [PATCH 3/7] Pulled out the logging previously added in DiagController; may revert this in a future commit --- .../Controllers/DiagController.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs index e502f1fcec2..bbd02716b06 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs @@ -75,14 +75,12 @@ public DiagController(ILogger logger, { defaultProcessInfo = await _diagnosticServices.GetProcessAsync(null, HttpContext.RequestAborted); } - catch (ArgumentException ex) + catch (ArgumentException) { // Unable to locate a default process; no action required - _logger.LogInformation(ex.Message); } - catch (InvalidOperationException ex) + catch (InvalidOperationException) { - _logger.LogInformation(ex.Message); } IList processesIdentifiers = new List(); From a01f7c4fab0d44f909eab1cd3e187219a32e95f9 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Wed, 22 Jun 2022 10:11:22 -0700 Subject: [PATCH 4/7] Re-added continue --- src/Tools/dotnet-monitor/Startup.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tools/dotnet-monitor/Startup.cs b/src/Tools/dotnet-monitor/Startup.cs index 05a7db788f0..94dd88d4fcb 100644 --- a/src/Tools/dotnet-monitor/Startup.cs +++ b/src/Tools/dotnet-monitor/Startup.cs @@ -158,6 +158,7 @@ public void Configure( catch (FormatException ex) { logger.LogInformation(ex.Message); + continue; } if (string.Equals(Uri.UriSchemeHttp, address.Scheme, StringComparison.OrdinalIgnoreCase)) From 2d56c940934f0321e6dbc12011465ce01730d684 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Thu, 23 Jun 2022 10:57:50 -0700 Subject: [PATCH 5/7] Changes based on discussion from PR meeting --- .../Controllers/DiagController.cs | 4 +++ .../ProcessInfoImpl.cs | 9 ----- .../FileSystem/FileSystemEgressProvider.cs | 2 +- .../FilteredEndpointInfoSource.cs | 2 +- src/Tools/dotnet-monitor/LoggingEventIds.cs | 5 ++- src/Tools/dotnet-monitor/LoggingExtensions.cs | 33 +++++++++++++++++++ src/Tools/dotnet-monitor/Startup.cs | 2 +- src/Tools/dotnet-monitor/Strings.Designer.cs | 27 +++++++++++++++ src/Tools/dotnet-monitor/Strings.resx | 9 +++++ 9 files changed, 80 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs index bbd02716b06..6a78f39a2cc 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs @@ -82,6 +82,10 @@ public DiagController(ILogger logger, catch (InvalidOperationException) { } + catch (Exception ex) when (!(ex is OperationCanceledException)) + { + _logger.LogWarning(ex.Message); + } IList processesIdentifiers = new List(); foreach (IProcessInfo p in await _diagnosticServices.GetProcessesAsync(processFilter: null, HttpContext.RequestAborted)) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs index 004d10ac45a..ae2dfd8c847 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessInfoImpl.cs @@ -92,18 +92,9 @@ public static async Task FromEndpointInfoAsync(IEndpointInfo endpo commandLine = await commandLineSource.Task; } - catch (ObjectDisposedException) - { - } catch (PipelineException) { } - catch (ArgumentNullException) - { - } - catch (ArgumentException) - { - } catch (OperationCanceledException) { } diff --git a/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs b/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs index b16e8433140..21557466a16 100644 --- a/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs +++ b/src/Tools/dotnet-monitor/Egress/FileSystem/FileSystemEgressProvider.cs @@ -80,7 +80,7 @@ public override async Task EgressAsync( } catch (Exception ex) { - _logger.LogTrace(ex.Message); + _logger.IntermediateFileDeletionFailed(intermediateFilePath, ex); } } } diff --git a/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs b/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs index b3628045910..c04b6f82f4e 100644 --- a/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs +++ b/src/Tools/dotnet-monitor/FilteredEndpointInfoSource.cs @@ -65,7 +65,7 @@ public FilteredEndpointInfoSource( } catch (Exception ex) { - clientSourceLogger.LogTrace(ex.Message); + clientSourceLogger.RuntimeInstanceCookieFailedToFilterSelf(ex); } // If connecting to runtime instances, filter self out. In listening mode, it's likely diff --git a/src/Tools/dotnet-monitor/LoggingEventIds.cs b/src/Tools/dotnet-monitor/LoggingEventIds.cs index 6cc193069e8..c445892de78 100644 --- a/src/Tools/dotnet-monitor/LoggingEventIds.cs +++ b/src/Tools/dotnet-monitor/LoggingEventIds.cs @@ -71,7 +71,10 @@ internal enum LoggingEventIds QueueOptionsPartiallySet = 58, WritingMessageToQueueFailed = 59, ExperienceSurvey = 60, - DiagnosticPortNotInListenModeForCollectionRules = 61 + DiagnosticPortNotInListenModeForCollectionRules = 61, + RuntimeInstanceCookieFailedToFilterSelf = 62, + ParsingUrlFailed = 63, + IntermediateFileDeletionFailed = 64 } internal static class LoggingEventIdsExtensions diff --git a/src/Tools/dotnet-monitor/LoggingExtensions.cs b/src/Tools/dotnet-monitor/LoggingExtensions.cs index c5beefe7926..bcb0309112d 100644 --- a/src/Tools/dotnet-monitor/LoggingExtensions.cs +++ b/src/Tools/dotnet-monitor/LoggingExtensions.cs @@ -339,6 +339,24 @@ internal static class LoggingExtensions logLevel: LogLevel.Warning, formatString: Strings.LogFormatString_DiagnosticPortNotInListenModeForCollectionRules); + private static readonly Action _runtimeInstanceCookieFailedToFilterSelf = + LoggerMessage.Define( + eventId: LoggingEventIds.RuntimeInstanceCookieFailedToFilterSelf.EventId(), + logLevel: LogLevel.Debug, + formatString: Strings.LogFormatString_RuntimeInstanceCookieFailedToFilterSelf); + + private static readonly Action _parsingUrlFailed = + LoggerMessage.Define( + eventId: LoggingEventIds.ParsingUrlFailed.EventId(), + logLevel: LogLevel.Warning, + formatString: Strings.LogFormatString_ParsingUrlFailed); + + private static readonly Action _intermediateFileDeletionFailed = + LoggerMessage.Define( + eventId: LoggingEventIds.IntermediateFileDeletionFailed.EventId(), + logLevel: LogLevel.Debug, + formatString: Strings.LogFormatString_IntermediateFileDeletionFailed); + public static void EgressProviderInvalidOptions(this ILogger logger, string providerName) { _egressProviderInvalidOptions(logger, providerName, null); @@ -623,5 +641,20 @@ public static void DiagnosticPortNotInListenModeForCollectionRules(this ILogger { _diagnosticPortNotInListenModeForCollectionRules(logger, null); } + + public static void RuntimeInstanceCookieFailedToFilterSelf(this ILogger logger, Exception ex) + { + _runtimeInstanceCookieFailedToFilterSelf(logger, ex); + } + + public static void ParsingUrlFailed(this ILogger logger, string url, Exception ex) + { + _parsingUrlFailed(logger, url, ex); + } + + public static void IntermediateFileDeletionFailed(this ILogger logger, string intermediateFilePath, Exception ex) + { + _intermediateFileDeletionFailed(logger, intermediateFilePath, ex); + } } } diff --git a/src/Tools/dotnet-monitor/Startup.cs b/src/Tools/dotnet-monitor/Startup.cs index 94dd88d4fcb..127c9c39617 100644 --- a/src/Tools/dotnet-monitor/Startup.cs +++ b/src/Tools/dotnet-monitor/Startup.cs @@ -157,7 +157,7 @@ public void Configure( } catch (FormatException ex) { - logger.LogInformation(ex.Message); + logger.ParsingUrlFailed(url, ex); continue; } diff --git a/src/Tools/dotnet-monitor/Strings.Designer.cs b/src/Tools/dotnet-monitor/Strings.Designer.cs index b971ca6dddc..f6234986805 100644 --- a/src/Tools/dotnet-monitor/Strings.Designer.cs +++ b/src/Tools/dotnet-monitor/Strings.Designer.cs @@ -915,6 +915,15 @@ internal static string LogFormatString_InsecureAutheticationConfiguration { } } + /// + /// Looks up a localized string similar to The intermediate file at the following path could not be deleted: {0}. + /// + internal static string LogFormatString_IntermediateFileDeletionFailed { + get { + return ResourceManager.GetString("LogFormatString_IntermediateFileDeletionFailed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Invalid action reference '{actionReference}'.. /// @@ -987,6 +996,15 @@ internal static string LogFormatString_OptionsValidationFailure { } } + /// + /// Looks up a localized string similar to The provided url could not be parsed: {0}. + /// + internal static string LogFormatString_ParsingUrlFailed { + get { + return ResourceManager.GetString("LogFormatString_ParsingUrlFailed", resourceCulture); + } + } + /// /// Looks up a localized string similar to The queue {0} does not exist; ensure that the {queueName} and {queueAccountUri} fields are set correctly.. /// @@ -1014,6 +1032,15 @@ internal static string LogFormatString_RunningElevated { } } + /// + /// Looks up a localized string similar to The runtime instance cookie failed to filter out the current process.. + /// + internal static string LogFormatString_RuntimeInstanceCookieFailedToFilterSelf { + get { + return ResourceManager.GetString("LogFormatString_RuntimeInstanceCookieFailedToFilterSelf", resourceCulture); + } + } + /// /// Looks up a localized string similar to Setting the environment variable {variableName} in process {processId}.. /// diff --git a/src/Tools/dotnet-monitor/Strings.resx b/src/Tools/dotnet-monitor/Strings.resx index cc08e8249b7..e16ade167f6 100644 --- a/src/Tools/dotnet-monitor/Strings.resx +++ b/src/Tools/dotnet-monitor/Strings.resx @@ -565,6 +565,9 @@ Gets the format string that is printed in the 14:InsecureAutheticationConfiguration event. 0 Format Parameters + + The intermediate file at the following path could not be deleted: {0} + Invalid action reference '{actionReference}'. @@ -605,6 +608,9 @@ 1 Format Parameter: 1. failure: The failure message from validation + + The provided url could not be parsed: {0} + The queue {0} does not exist; ensure that the {queueName} and {queueAccountUri} fields are set correctly. Gets the format string that is printed in the 57:QueueDoesNotExist event. @@ -625,6 +631,9 @@ Gets the format string that is printed in the 19:RunningElevated event. 0 Format Parameters + + The runtime instance cookie failed to filter out the current process. + Setting the environment variable {variableName} in process {processId}. Gets the format string that is printed in the 54:SetEnvironmentVariable event. From b7a9fcc3e4720c51f220a53d839111c9c912972f Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Thu, 23 Jun 2022 11:32:53 -0700 Subject: [PATCH 6/7] Changes for Justin --- .../Controllers/DiagController.cs | 2 +- .../LoggingExtensions.cs | 11 +++++++++++ .../Strings.Designer.cs | 9 +++++++++ .../Strings.resx | 5 +++++ src/Tools/dotnet-monitor/Strings.Designer.cs | 6 +++--- src/Tools/dotnet-monitor/Strings.resx | 6 +++--- 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs index 6a78f39a2cc..435f24f92ef 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs @@ -84,7 +84,7 @@ public DiagController(ILogger logger, } catch (Exception ex) when (!(ex is OperationCanceledException)) { - _logger.LogWarning(ex.Message); + _logger.DefaultProcessUnexpectedFailure(ex); } IList processesIdentifiers = new List(); diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/LoggingExtensions.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/LoggingExtensions.cs index f583c437ea8..81ee488d273 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/LoggingExtensions.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/LoggingExtensions.cs @@ -45,6 +45,12 @@ internal static class LoggingExtensions logLevel: LogLevel.Warning, formatString: Strings.LogFormatString_ThrottledEndpoint); + private static readonly Action _defaultProcessUnexpectedFailure = + LoggerMessage.Define( + eventId: new EventId(7, "DefaultProcessUnexpectedFailure"), + logLevel: LogLevel.Warning, + formatString: Strings.LogFormatString_DefaultProcessUnexpectedFailure); + public static void RequestFailed(this ILogger logger, Exception ex) { _requestFailed(logger, ex); @@ -74,5 +80,10 @@ public static void WrittenToHttpStream(this ILogger logger) { _writtenToHttpStream(logger, null); } + + public static void DefaultProcessUnexpectedFailure(this ILogger logger, Exception ex) + { + _defaultProcessUnexpectedFailure(logger, ex); + } } } diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs index 250fd8afa02..c8e8f8de2b6 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs @@ -222,6 +222,15 @@ internal static string ErrorMessage_ValueNotString { } } + /// + /// Looks up a localized string similar to An unexpected error occurred while getting the default process.. + /// + internal static string LogFormatString_DefaultProcessUnexpectedFailure { + get { + return ResourceManager.GetString("LogFormatString_DefaultProcessUnexpectedFailure", resourceCulture); + } + } + /// /// Looks up a localized string similar to Egressed artifact to {location}. /// diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx index 5391d98f4b7..d4b1aeb269d 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx @@ -194,6 +194,11 @@ Value must be of type string. Gets a string similar to "Value must be of type string.". + + An unexpected error occurred while getting the default process. + Gets the format string that is printed in the 7:DefaultProcessUnexpectedFailure event. +0 Format Parameters + Egressed artifact to {location} Gets the format string that is printed in the 4:EgressedArtifact event. diff --git a/src/Tools/dotnet-monitor/Strings.Designer.cs b/src/Tools/dotnet-monitor/Strings.Designer.cs index f6234986805..320ec0d937d 100644 --- a/src/Tools/dotnet-monitor/Strings.Designer.cs +++ b/src/Tools/dotnet-monitor/Strings.Designer.cs @@ -916,7 +916,7 @@ internal static string LogFormatString_InsecureAutheticationConfiguration { } /// - /// Looks up a localized string similar to The intermediate file at the following path could not be deleted: {0}. + /// Looks up a localized string similar to The intermediate file at the following path could not be deleted: {path}. /// internal static string LogFormatString_IntermediateFileDeletionFailed { get { @@ -997,7 +997,7 @@ internal static string LogFormatString_OptionsValidationFailure { } /// - /// Looks up a localized string similar to The provided url could not be parsed: {0}. + /// Looks up a localized string similar to The provided url could not be parsed: {url}. /// internal static string LogFormatString_ParsingUrlFailed { get { @@ -1033,7 +1033,7 @@ internal static string LogFormatString_RunningElevated { } /// - /// Looks up a localized string similar to The runtime instance cookie failed to filter out the current process.. + /// Looks up a localized string similar to Unable to get the runtime instance cookie of the current process.. /// internal static string LogFormatString_RuntimeInstanceCookieFailedToFilterSelf { get { diff --git a/src/Tools/dotnet-monitor/Strings.resx b/src/Tools/dotnet-monitor/Strings.resx index e16ade167f6..210326a423c 100644 --- a/src/Tools/dotnet-monitor/Strings.resx +++ b/src/Tools/dotnet-monitor/Strings.resx @@ -566,7 +566,7 @@ 0 Format Parameters - The intermediate file at the following path could not be deleted: {0} + The intermediate file at the following path could not be deleted: {path} Invalid action reference '{actionReference}'. @@ -609,7 +609,7 @@ 1. failure: The failure message from validation - The provided url could not be parsed: {0} + The provided url could not be parsed: {url} The queue {0} does not exist; ensure that the {queueName} and {queueAccountUri} fields are set correctly. @@ -632,7 +632,7 @@ 0 Format Parameters - The runtime instance cookie failed to filter out the current process. + Unable to get the runtime instance cookie of the current process. Setting the environment variable {variableName} in process {processId}. From 8e0a6ed995b28dd225bda5865fa076b02dae95de Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Thu, 23 Jun 2022 12:31:49 -0700 Subject: [PATCH 7/7] Changed resx message --- src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs | 2 +- src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs index c8e8f8de2b6..6a9e494d2fc 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.Designer.cs @@ -223,7 +223,7 @@ internal static string ErrorMessage_ValueNotString { } /// - /// Looks up a localized string similar to An unexpected error occurred while getting the default process.. + /// Looks up a localized string similar to Failed to determine the default process.. /// internal static string LogFormatString_DefaultProcessUnexpectedFailure { get { diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx index d4b1aeb269d..5798c58b700 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Strings.resx @@ -195,7 +195,7 @@ Gets a string similar to "Value must be of type string.". - An unexpected error occurred while getting the default process. + Failed to determine the default process. Gets the format string that is printed in the 7:DefaultProcessUnexpectedFailure event. 0 Format Parameters