Skip to content

Optimize ActivityRegistry.Find to prefer tenant-specific descriptors without performance regression #7227

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
sfmskywalker merged 5 commits into from
Jan 31, 2026
+181 −1
Merged

Optimize ActivityRegistry.Find to prefer tenant-specific descriptors without performance regression #7227

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c062b7
Initial plan
Copilot Jan 31, 2026
49b01d8
Optimize Find(string type) to prefer tenant-specific descriptors with…
Copilot Jan 31, 2026
203e2ef
Apply review feedback: combine if statements and add comprehensive un…
Copilot Jan 31, 2026
b1bd4fa
Refactor tests for DRYness using theories and helper methods
Copilot Jan 31, 2026
70d096f
Clean up extra whitespace in test file
Copilot Jan 31, 2026
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
28 changes: 27 additions & 1 deletion src/modules/Elsa.Workflows.Core/Services/ActivityRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,33 @@ public IEnumerable<ActivityDescriptor> ListByProvider(Type providerType)
}

/// <inheritdoc />
public ActivityDescriptor? Find(string type) => _activityDescriptors.Values.Where(x => (x.TenantId == tenantAccessor.TenantId || x.TenantId == null) && x.TypeName == type).MaxBy(x => x.Version);
public ActivityDescriptor? Find(string type)
{
var tenantId = tenantAccessor.TenantId;
ActivityDescriptor? tenantSpecific = null;
ActivityDescriptor? tenantAgnostic = null;

// Single-pass iteration to find both tenant-specific and tenant-agnostic descriptors
foreach (var descriptor in _activityDescriptors.Values)
{
if (descriptor.TypeName != type)
continue;

if (descriptor.TenantId == tenantId)
{
if (tenantSpecific == null || descriptor.Version > tenantSpecific.Version)
tenantSpecific = descriptor;
}
else if (descriptor.TenantId == null)
{
if (tenantAgnostic == null || descriptor.Version > tenantAgnostic.Version)
tenantAgnostic = descriptor;
}

Copilot AI Jan 31, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 'if' statements can be combined.

Suggested change
if (descriptor.TenantId == tenantId)
{
if (tenantSpecific == null || descriptor.Version > tenantSpecific.Version)
tenantSpecific = descriptor;
}
else if (descriptor.TenantId == null)
{
if (tenantAgnostic == null || descriptor.Version > tenantAgnostic.Version)
tenantAgnostic = descriptor;
}
if (descriptor.TenantId == tenantId && (tenantSpecific == null || descriptor.Version > tenantSpecific.Version))
tenantSpecific = descriptor;
else if (descriptor.TenantId == null && (tenantAgnostic == null || descriptor.Version > tenantAgnostic.Version))
tenantAgnostic = descriptor;

Copilot uses AI. Check for mistakes.

Copilot AI Jan 31, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Applied in commit 203e2ef. The nested if statements have been combined into single-line conditionals for improved readability.

}
Comment thread
sfmskywalker marked this conversation as resolved.

// Prefer tenant-specific over tenant-agnostic
return tenantSpecific ?? tenantAgnostic;
}
Comment thread
sfmskywalker marked this conversation as resolved.

/// <inheritdoc />
public ActivityDescriptor? Find(string type, int version) => _activityDescriptors.GetValueOrDefault((tenantAccessor.TenantId, type, version)) ?? _activityDescriptors.GetValueOrDefault((null, type, version));
Expand Down
Loading