Merge branch 'microsoft:main' into recording-redis-version-clean

Author: vaishalitvv

.github/workflows/pull-request.yml

@@ -34,6 +34,7 @@ jobs:
         dotnet-version: 9.0.x
 
     - name: Initialize CodeQL
+      if: false # this is causing PR to fail on Windows with single slashes on Windows, temporarily disabling since we have it in Linux PR
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
@@ -51,6 +52,7 @@ jobs:
       run: ./build-test.cmd
 
     - name: Perform CodeQL Analysis
+      if: false # this is causing PR to fail on Windows with single slashes on Windows, temporarily disabling since we have it in Linux PR
       uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{matrix.language}}"

VERSION

@@ -1 +1 @@
-2.0.16
+2.0.27

src/VirtualClient/Module.props

@@ -31,6 +31,15 @@
 
         <!-- Azure.Messaging.EventHubs -->
         <Azure_Messaging_EventHubs_PackageVersion>5.11.5</Azure_Messaging_EventHubs_PackageVersion>
+      
+        <!-- Azure.Security.KeyVault.Certificates -->
+        <Azure_Security_KeyVault_Certificates_PackageVersion>4.7.0</Azure_Security_KeyVault_Certificates_PackageVersion>
+      
+        <!-- Azure.Security.KeyVault.Keys -->
+        <Azure_Security_KeyVault_Keys_PackageVersion>4.7.0</Azure_Security_KeyVault_Keys_PackageVersion>
+      
+        <!-- Azure.Security.KeyVault.Secrets -->
+        <Azure_Security_KeyVault_Secrets_PackageVersion>4.7.0</Azure_Security_KeyVault_Secrets_PackageVersion>
 
         <!-- Azure.Storage.Blobs -->
         <Azure_Storage_Blobs_PackageVersion>12.18.0</Azure_Storage_Blobs_PackageVersion>
@@ -117,7 +126,7 @@
         <System_Diagnostics_PerformanceCounter_PackageVersion>9.0.3</System_Diagnostics_PerformanceCounter_PackageVersion>
 
         <!-- System.IO.Abstractions -->
-        <System_IO_Abstractions_PackageVersion>21.0.29</System_IO_Abstractions_PackageVersion>
+        <System_IO_Abstractions_PackageVersion>22.0.14</System_IO_Abstractions_PackageVersion>
 
         <!-- System.IO.FileSystem.AccessControl -->
         <System_IO_FileSystem_AccessControl_PackageVersion>5.0.0</System_IO_FileSystem_AccessControl_PackageVersion>
@@ -145,7 +154,7 @@
 
         <!-- System.ServiceProcess.ServiceController -->
         <System_ServiceProcess_ServiceController_PackageVersion>9.0.3</System_ServiceProcess_ServiceController_PackageVersion>
-        
+
         <!-- YamlDotNet -->
         <YamlDotNet_PackageVersion>15.1.1</YamlDotNet_PackageVersion>
 

src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdMetricsParserTests.cs

@@ -206,7 +206,7 @@ public void DiskSpdParserVerifyForCoreCountGreaterThan64WhichAddsProcessorGroupi
             var parser = new DiskSpdMetricsParser(results, "diskspd.exe -b8K -r8K -t32 -o16 -w100 -d900 -Suw -W30 -D -L -Rtext D:\\diskspd-test.dat");
 
             IList<Metric> metrics = parser.Parse();
-            metrics.LogConsole("test");
+            metrics.LogConsole("test", "testtool");
 
             // cpu metrics
             MetricAssert.Exists(metrics, "cpu usage 0", 92.79, "percentage");

src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs

@@ -300,7 +300,7 @@ public async Task MemtierBenchmarkClientExecutorEmitsTheExpectedMetricsRawMetric
 
                 await executor.ExecuteAsync(CancellationToken.None);
 
-                IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("ScenarioResult"));
+                IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("(ScenarioResult)|(SucceededOrFailed)"));
                 Assert.AreEqual(30, metricsEmitted.Count());
 
                 IEnumerable<string> expectedMetrics = new List<string>
@@ -362,7 +362,7 @@ public async Task MemtierBenchmarkClientExecutorEmitsTheExpectedMetricsAggregate
 
                 await executor.ExecuteAsync(CancellationToken.None);
 
-                IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("ScenarioResult"));
+                IEnumerable<Tuple<LogLevel, EventId, object, Exception>> metricsEmitted = this.mockFixture.Logger.MessagesLogged(new Regex("(ScenarioResult)|(SucceededOrFailed)"));
                 Assert.AreEqual(141, metricsEmitted.Count());
 
                 IEnumerable<string> expectedMetrics = new List<string>

src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslExecutorTests.cs

@@ -23,6 +23,7 @@ public class OpenSslExecutorTests
     {
         private DependencyFixture fixture;
         private DependencyPath mockPackage;
+        private string mockOpensslVersion = "OpenSSL 3.5.0 8 Apr 2025 (Library: OpenSSL 3.5.0 8 Apr 2025)\n";
 
         [Test]
         [TestCase(PlatformID.Unix, Architecture.X64, "linux-x64/bin/openssl")]
@@ -287,6 +288,24 @@ await executor.ExecuteAsync(CancellationToken.None)
             }
         }
 
+        [Test]
+        public async Task OpenSslExecutorExecutesGetOpensslVersionAsync()
+        {
+            this.SetupDefaultBehaviors();
+            this.SetupOpensslVersionBehavior();
+
+             using (TestOpenSslExecutor executor = new TestOpenSslExecutor(this.fixture))
+            {
+
+                await executor.ExecuteAsync(CancellationToken.None)
+                  .ConfigureAwait(false);
+
+                var messages = this.fixture.Logger.MessagesLogged($"{nameof(OpenSslExecutor)}.GetOpenSslVersionAsync");
+                Assert.IsNotEmpty(messages);
+                Assert.IsTrue(messages.All(msg => (msg.Item3 as EventContext).Properties["opensslVersion"].ToString() == "OpenSSL 3.5.0 8 Apr 2025 (Library: OpenSSL 3.5.0 8 Apr 2025)"));
+            }
+        }
+
         private void SetupDefaultBehaviors(PlatformID platform = PlatformID.Unix, Architecture architecture = Architecture.X64)
         {
             // Setup the default behaviors given all expected dependencies are in place such that the
@@ -329,8 +348,20 @@ private void SetupDefaultBehaviors(PlatformID platform = PlatformID.Unix, Archit
                     process.StandardOutput.Append(TestResources.Results_OpenSSL_speed);
                 }
             };
+            
         }
 
+        private void SetupOpensslVersionBehavior()
+        {
+            this.fixture.ProcessManager.OnProcessCreated = (process) =>
+            {
+                // mock openssl version command result
+                if (process.IsMatch("openssl(.exe)* version"))
+                {
+                    process.StandardOutput.Append(this.mockOpensslVersion);
+                }
+            };
+        }
         private class TestOpenSslExecutor : OpenSslExecutor
         {
             public TestOpenSslExecutor(DependencyFixture mockFixture)

src/VirtualClient/VirtualClient.Actions/DiskSpd/DiskSpdExecutor.cs

@@ -355,7 +355,7 @@ private void CaptureMetrics(DiskWorkloadProcess workload, EventContext telemetry
                 metrics = metrics.FilterBy(this.MetricFilters).ToList();
             }
 
-            metrics.LogConsole(this.MetricScenario ?? this.Scenario);
+            metrics.LogConsole(this.MetricScenario ?? this.Scenario, "DiskSpd");
 
             this.Logger.LogMetrics(
                 "DiskSpd",

src/VirtualClient/VirtualClient.Actions/OpenSSL/OpenSslExecutor.cs

@@ -18,6 +18,7 @@ namespace VirtualClient.Actions
     using VirtualClient.Common.Telemetry;
     using VirtualClient.Contracts;
     using VirtualClient.Contracts.Metadata;
+    using YamlDotNet.Serialization;
 
     /// <summary>
     /// Executes the OpenSSL workload.
@@ -90,17 +91,50 @@ await this.InitializeWorkloadToolsetsAsync(cancellationToken)
                 .ConfigureAwait(false);
         }
 
-        private void CaptureMetrics(IProcessProxy workloadProcess, string commandArguments, EventContext telemetryContext)
+        /// <summary>
+        /// Gets openssl version by running openssl version command.
+        /// </summary>
+        private async Task GetOpenSslVersionAsync(string toolCommand, CancellationToken cancellationToken)
         {
-            if (workloadProcess.ExitCode == 0)
+            // The OpenSSL version is not available in the workload output. We need to run a separate command to get the version.   
+            // The command 'openssl version' will return the version of OpenSSL installed on the system.
+            string opensslVersion = "Unknown";
+            if (!cancellationToken.IsCancellationRequested)
             {
-                try
+                this.Logger.LogTraceMessage($"Executing process 'openssl version' at directory '{this.ExecutablePath}'.");
+                using (IProcessProxy process = this.systemManagement.ProcessManager.CreateProcess(this.ExecutablePath, "version"))
                 {
+                    this.SetEnvironmentVariables(process);
+                    await process.StartAndWaitAsync(cancellationToken).ConfigureAwait(false);
+                    process.ThrowIfWorkloadFailed();
+
+                    opensslVersion = process.StandardOutput?.ToString().Trim() ?? "Unknown";
+                    if (string.IsNullOrWhiteSpace(opensslVersion))
+                    {
+                        opensslVersion = "Unknown";
+                    }
+
+                    this.MetadataContract.Add("OpenSSLVersion", opensslVersion, MetadataContractCategory.Dependencies);
+                    this.Logger.LogMessage($"{nameof(OpenSslExecutor)}.GetOpenSslVersionAsync", LogLevel.Information, EventContext.Persisted().AddContext("opensslVersion", opensslVersion));
+
                     this.MetadataContract.AddForScenario(
                        "OpenSSL Speed",
-                       workloadProcess.FullCommand(),
-                       toolVersion: null);
+                       toolCommand,
+                       toolVersion: opensslVersion);
+                }
+            }
+            
+        }
 
+        private async Task CaptureMetricsAsync(IProcessProxy workloadProcess, string commandArguments, EventContext telemetryContext, CancellationToken cancellationToken)
+        {
+            if (workloadProcess.ExitCode == 0)
+            {
+                try
+                {
+                    // Retrieve OpenSSL version
+                    await this.GetOpenSslVersionAsync(workloadProcess.FullCommand(), cancellationToken);
+                
                     this.MetadataContract.Apply(telemetryContext);
 
                     OpenSslMetricsParser resultsParser = new OpenSslMetricsParser(workloadProcess.StandardOutput.ToString(), commandArguments);
@@ -116,6 +150,8 @@ private void CaptureMetrics(IProcessProxy workloadProcess, string commandArgumen
                         commandArguments,
                         this.Tags,
                         telemetryContext);
+
+                    metrics.LogConsole(this.Scenario, "OpenSSL");
                 }
                 catch (SchemaException exc)
                 {
@@ -133,7 +169,7 @@ private Task ExecuteWorkloadAsync(EventContext telemetryContext, CancellationTok
 
             EventContext relatedContext = telemetryContext.Clone()
                 .AddContext("executable", this.ExecutablePath)
-                .AddContext("commandArguments", commandArguments);
+                .AddContext("commandArguments", commandArguments);       
 
             return this.Logger.LogMessageAsync($"{nameof(OpenSslExecutor)}.ExecuteWorkload", relatedContext, async () =>
             {
@@ -153,7 +189,7 @@ private Task ExecuteWorkloadAsync(EventContext telemetryContext, CancellationTok
                                 await this.LogProcessDetailsAsync(process, telemetryContext, "OpenSSL", logToFile: true);
 
                                 process.ThrowIfWorkloadFailed();
-                                this.CaptureMetrics(process, commandArguments, telemetryContext);
+                                await this.CaptureMetricsAsync(process, commandArguments, telemetryContext, cancellationToken);
                             }
                         }
                         finally

src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs

@@ -337,7 +337,7 @@ private async Task CaptureMetricsAsync(IProcessProxy process, string commandArgu
 
                     SpecCpuMetricsParser parser = new SpecCpuMetricsParser(results);
                     IList<Metric> metrics = parser.Parse();
-                    metrics.LogConsole(this.Scenario);
+                    metrics.LogConsole(this.Scenario, "SPECcpu");
 
                     this.Logger.LogMetrics(
                         toolName: "SPECcpu",

src/VirtualClient/VirtualClient.Common/Extensions/StringExtensions.cs

@@ -6,6 +6,7 @@ namespace VirtualClient.Common.Extensions
     using System;
     using System.Collections;
     using System.Diagnostics.CodeAnalysis;
+    using System.Linq;
     using System.Runtime.InteropServices;
     using System.Security;
     using System.Text.RegularExpressions;