Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.8" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
<PackageVersion Include="xunit" Version="2.4.2" />
Expand Down
37 changes: 20 additions & 17 deletions tests/Temporalio.SimpleBench/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,34 @@

// Build command
var cmd = new RootCommand("Simple bench runner");
var workflowCountOption = new Option<int>("--workflow-count", "Number of workflows")
var workflowCountOption = new Option<int>("--workflow-count")
{
IsRequired = true,
Description = "Number of workflows",
Required = true,
};
cmd.AddOption(workflowCountOption);
var maxCachedWorkflowsOption = new Option<int>("--max-cached-workflows", "Number of workflows cached")
cmd.Options.Add(workflowCountOption);
var maxCachedWorkflowsOption = new Option<int>("--max-cached-workflows")
{
IsRequired = true,
Description = "Number of workflows cached",
Required = true,
};
cmd.AddOption(maxCachedWorkflowsOption);
var maxConcurrentOption = new Option<int>("--max-concurrent", "Number of concurrent workflows/activities")
cmd.Options.Add(maxCachedWorkflowsOption);
var maxConcurrentOption = new Option<int>("--max-concurrent")
{
IsRequired = true,
Description = "Number of concurrent workflows/activities",
Required = true,
};
cmd.AddOption(maxConcurrentOption);
cmd.Options.Add(maxConcurrentOption);
using var loggerFactory = LoggerFactory.Create(builder =>
builder.AddSimpleConsole().SetMinimumLevel(LogLevel.Information));
var logger = loggerFactory.CreateLogger<Program>();

// Set handler
cmd.SetHandler(async ctx =>
cmd.SetAction(async (parseResult, cancellationToken) =>
{
var workflowCount = ctx.ParseResult.GetValueForOption(workflowCountOption);
var maxCachedWorkflows = ctx.ParseResult.GetValueForOption(maxCachedWorkflowsOption);
var maxConcurrent = ctx.ParseResult.GetValueForOption(maxConcurrentOption);
var workflowCount = parseResult.GetValue(workflowCountOption);
var maxCachedWorkflows = parseResult.GetValue(maxCachedWorkflowsOption);
var maxConcurrent = parseResult.GetValue(maxConcurrentOption);

// Start server
logger.LogInformation("Starting local environment");
Expand Down Expand Up @@ -63,12 +66,12 @@
}.
AddActivity(BenchActivities.BenchActivity).
AddWorkflow<BenchWorkflow>());
using var cancelSource = CancellationTokenSource.CreateLinkedTokenSource(ctx.GetCancellationToken());
var workerTask = Task.Run(() => worker.ExecuteAsync(cancelSource.Token));
using var cancelSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var workerTask = Task.Run(() => worker.ExecuteAsync(cancelSource.Token), cancelSource.Token);

// Wait for all workflows
var resultWatch = new Stopwatch();
var memoryTask = Task.Run(() => MemoryTracker.TrackMaxMemoryBytesAsync(cancelSource.Token));
var memoryTask = Task.Run(() => MemoryTracker.TrackMaxMemoryBytesAsync(cancelSource.Token), cancelSource.Token);
resultWatch.Start();
foreach (var handle in handles)
{
Expand Down Expand Up @@ -99,7 +102,7 @@
});

// Run command
await cmd.InvokeAsync(args);
await cmd.Parse(args).InvokeAsync();

namespace Temporalio.SimpleBench
{
Expand Down
6 changes: 3 additions & 3 deletions tests/Temporalio.SimpleBench/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
},
"System.CommandLine": {
"type": "Direct",
"requested": "[2.0.0-beta4.22272.1, )",
"resolved": "2.0.0-beta4.22272.1",
"contentHash": "1uqED/q2H0kKoLJ4+hI2iPSBSEdTuhfCYADeJrAqERmiGQ2NNacYKRNEQ+gFbU4glgVyK8rxI+ZOe1onEtr/Pg=="
"requested": "[2.0.8, )",
"resolved": "2.0.8",
"contentHash": "FbpgF8p/ClXnoXEWLjQB34kNh5rsLewEgIgLyVzLDucAOQ4cNs7ec9Cam7gdKPruSb6zp4Mx8htZGTL4/5PJPg=="
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
Expand Down
Loading