Skip to content

chore: Add sort when output environment variables logs #3130

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
timcassell merged 1 commit into from
May 14, 2026
Merged

chore: Add sort when output environment variables logs #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/BenchmarkDotNet/Extensions/ProcessExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ internal static void SetEnvironmentVariables(this ProcessStartInfo start, Benchm
SetClrEnvironmentVariables(start, "Version", clrRuntime.Version);

if (benchmarkCase.Job.Environment.Runtime is MonoRuntime monoRuntime && monoRuntime.MonoBclPath.IsNotBlank())
start.EnvironmentVariables["MONO_PATH"] = monoRuntime.MonoBclPath;
start.Environment["MONO_PATH"] = monoRuntime.MonoBclPath;

if (benchmarkCase.Config.HasPerfCollectProfiler())
{
Expand All @@ -122,7 +122,7 @@ internal static void SetEnvironmentVariables(this ProcessStartInfo start, Benchm
// enable BDN Event Source (https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/linux-performance-tracing.md#filtering)
SetClrEnvironmentVariables(start, "EventSourceFilter", EngineEventSource.SourceName);
// workaround for https://github.com/dotnet/runtime/issues/71786, will be solved by next perf version
start.EnvironmentVariables["DOTNET_EnableWriteXorExecute"] = "0";
start.Environment["DOTNET_EnableWriteXorExecute"] = "0";
}

// corerun does not understand runtimeconfig.json files;
Expand All @@ -132,7 +132,7 @@ internal static void SetEnvironmentVariables(this ProcessStartInfo start, Benchm
start.SetCoreRunEnvironmentVariables(benchmarkCase, resolver);

// disable ReSharper's Dynamic Program Analysis (see https://github.com/dotnet/BenchmarkDotNet/issues/1871 for details)
start.EnvironmentVariables["JETBRAINS_DPA_AGENT_ENABLE"] = "0";
start.Environment["JETBRAINS_DPA_AGENT_ENABLE"] = "0";

if (benchmarkCase.Job.ResolveValueAsNullable(RunMode.RunStrategyCharacteristic) != RunStrategy.ColdStart
// CallCountingDelayMs=0 breaks DisassemblyDiagnoser, so we only set it if the job doesn't need disassembly. https://github.com/dotnet/runtime/issues/117339
Expand All @@ -145,7 +145,7 @@ internal static void SetEnvironmentVariables(this ProcessStartInfo start, Benchm
return;

foreach (var environmentVariable in benchmarkCase.Job.Environment.EnvironmentVariables ?? [])
start.EnvironmentVariables[environmentVariable.Key] = environmentVariable.Value;
start.Environment[environmentVariable.Key] = environmentVariable.Value;
}

// the code below was copy-pasted from https://github.com/dotnet/cli/blob/0bc24bff775e22352c2309ef990281280f92dbaa/test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/ProcessExtensions.cs#L13
Expand Down Expand Up @@ -267,8 +267,8 @@ private static void SetCoreRunEnvironmentVariables(this ProcessStartInfo start,

private static void SetClrEnvironmentVariables(ProcessStartInfo start, string suffix, string value)
{
start.EnvironmentVariables[$"DOTNET_{suffix}"] = value;
start.EnvironmentVariables[$"COMPlus_{suffix}"] = value;
start.Environment[$"DOTNET_{suffix}"] = value;
start.Environment[$"COMPlus_{suffix}"] = value;
}

#if !NET5_0_OR_GREATER
Expand Down
10 changes: 5 additions & 5 deletions src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommandExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ internal static void LogEnvVars(DotNetCliCommand command)
ProcessStartInfo startInfo = BuildStartInfo(
command.CliPath, command.GenerateResult.ArtifactsPaths.BuildArtifactsDirectoryPath, command.Arguments, command.EnvironmentVariables);

if (startInfo.EnvironmentVariables.Keys.Count > 0)
if (startInfo.Environment.Keys.Count > 0)
{
command.Logger.WriteLineInfo("// Environment Variables:");
foreach (string name in startInfo.EnvironmentVariables.Keys)
foreach (var entry in startInfo.Environment.OrderBy(x=>x.Key))
{
command.Logger.WriteLine($"\t[{name}] = \"{startInfo.EnvironmentVariables[name]}\"");
command.Logger.WriteLine($"\t[{entry.Key}] = \"{entry.Value}\"");
}
}
}
Expand Down Expand Up @@ -133,10 +133,10 @@ internal static ProcessStartInfo BuildStartInfo(string? customDotNetCliPath, str

if (environmentVariables != null)
foreach (var environmentVariable in environmentVariables)
startInfo.EnvironmentVariables[environmentVariable.Key] = environmentVariable.Value;
startInfo.Environment[environmentVariable.Key] = environmentVariable.Value;

if (customDotNetCliPath.IsNotBlank() && (environmentVariables == null || environmentVariables.All(envVar => envVar.Key != dotnetMultiLevelLookupEnvVarName)))
startInfo.EnvironmentVariables[dotnetMultiLevelLookupEnvVarName] = "0";
startInfo.Environment[dotnetMultiLevelLookupEnvVarName] = "0";

return startInfo;
}
Expand Down
Loading