From 709408366082ed35b7d303402cdade52445200aa Mon Sep 17 00:00:00 2001 From: Yang Pan <31965446+yangpanMS@users.noreply.github.com> Date: Mon, 25 Aug 2025 14:45:58 -0700 Subject: [PATCH] Add proxy eventhub logger back --- VERSION | 2 +- .../VirtualClient.Main/CommandBase.cs | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 9d40fd662e..da35555aa1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.18 \ No newline at end of file +2.1.19 \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.Main/CommandBase.cs b/src/VirtualClient/VirtualClient.Main/CommandBase.cs index 01a2f140f0..5985226861 100644 --- a/src/VirtualClient/VirtualClient.Main/CommandBase.cs +++ b/src/VirtualClient/VirtualClient.Main/CommandBase.cs @@ -457,6 +457,10 @@ protected virtual IEnumerable GetLoggerDefinitions() if (loggerDefinitions.Any( l => Regex.IsMatch(l, "^file", RegexOptions.IgnoreCase))) { // only add proxy logger if user also asked for file logging. + loggerDefinitions.Add($"proxy;file;{this.ProxyApiUri.ToString()}"); + } + else + { loggerDefinitions.Add($"proxy;{this.ProxyApiUri.ToString()}"); } @@ -684,7 +688,8 @@ protected virtual IList InitializeLoggerProviders(IConfiguratio break; case "proxy": - CommandBase.AddProxyApiLogging(loggingProviders, configuration, platformSpecifics, new Uri(loggerParameters), this.CertificateManager, source); + + CommandBase.AddProxyApiLogging(loggingProviders, configuration, platformSpecifics, loggerParameters, this.CertificateManager, source); break; case "summary": @@ -805,14 +810,21 @@ private static void AddFileLogging(List loggingProviders, IConf } } - private static void AddProxyApiLogging(List loggingProviders, IConfiguration configuration, PlatformSpecifics specifics, Uri proxyApiUri, ICertificateManager certificateManager, string source = null) + private static void AddProxyApiLogging(List loggingProviders, IConfiguration configuration, PlatformSpecifics specifics, string parameters, ICertificateManager certificateManager, string source = null) { - if (proxyApiUri != null) + ILogger debugLogger = null; + if (parameters.StartsWith("file;", StringComparison.OrdinalIgnoreCase)) { - ILogger debugLogger = DependencyFactory.CreateFileLoggerProvider(specifics.GetLogsPath("proxy-traces.log"), TimeSpan.FromSeconds(5), LogLevel.Trace) + debugLogger = DependencyFactory.CreateFileLoggerProvider(specifics.GetLogsPath("proxy-traces.log"), TimeSpan.FromSeconds(5), LogLevel.Trace) .CreateLogger("Proxy"); CommandBase.proxyApiDebugLoggers.Add(debugLogger); + parameters = parameters.Substring("file;".Length); + } + + if (!string.IsNullOrEmpty(parameters)) + { + Uri proxyApiUri = new Uri(parameters); X509Certificate2 certificate = null; if (EndpointUtility.TryParseCertificateReference(proxyApiUri, out string issuer, out string subject))