From 509ebf26c1e610158b5a8acb74fd8d1bd8f9d961 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:33:41 -0600 Subject: [PATCH 01/14] Only discard events older than the fixed version (#2700) --- .../Pipeline/030_CheckForRegressionAction.cs | 2 +- .../Pipeline/EventPipelineTests.cs | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs index f7a8c79a62..902434ddb9 100644 --- a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs +++ b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs @@ -53,7 +53,7 @@ public override async Task ProcessBatchAsync(ICollection contexts) var version = _semanticVersionParser.Parse(versionGroup.Key, versionCache) ?? _semanticVersionParser.Default; if (version < fixedInVersion) { - foreach (var ctx in stackGroup.Where(s => s.Organization.HasPremiumFeatures)) + foreach (var ctx in versionGroup.Where(s => s.Organization.HasPremiumFeatures)) { _logger.LogDebug("Discarding fixed stack event: Version {Version} is older than fixed in version {FixedInVersion}", version, fixedInVersion); ctx.IsDiscarded = true; diff --git a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs index 9b42e36895..16b91c6ca6 100644 --- a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs +++ b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs @@ -960,6 +960,43 @@ public async Task EnsureVersionedRegressionAsync() Assert.Equal("1.0.1-rc3", regressedEvent.GetVersion()); } + [Fact] + public async Task EnsureOnlyOlderVersionEventsAreDiscardedWhenBatchRegressesAsync() + { + // Arrange + var utcNow = DateTime.UtcNow; + var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); + organization.HasPremiumFeatures = true; + var project = _projectData.GenerateSampleProject(); + var ev = _eventData.GenerateEvent(projectId: TestConstants.ProjectId, organizationId: TestConstants.OrganizationId, occurrenceDate: utcNow); + var context = new EventContext(ev, organization, project); + await _pipeline.RunAsync(context); + await RefreshDataAsync(); + + ev = await _eventRepository.GetByIdAsync(ev.Id); + Assert.NotNull(ev); + + var stack = await _stackRepository.GetByIdAsync(ev.StackId); + Assert.NotNull(stack); + stack.MarkFixed(new SemanticVersion(1, 0, 1), TimeProvider); + await _stackRepository.SaveAsync(stack, o => o.Cache()); + + var olderContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: TestConstants.ProjectId, organizationId: TestConstants.OrganizationId, occurrenceDate: utcNow.AddMinutes(-2), semver: "1.0.0"), organization, project); + var newerContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: TestConstants.ProjectId, organizationId: TestConstants.OrganizationId, occurrenceDate: utcNow.AddMinutes(-1), semver: "1.0.2"), organization, project); + await RefreshDataAsync(); + + // Act + await _pipeline.RunAsync([olderContext, newerContext]); + + // Assert + Assert.False(olderContext.HasError, olderContext.ErrorMessage); + Assert.False(newerContext.HasError, newerContext.ErrorMessage); + Assert.True(olderContext.IsDiscarded); + Assert.False(newerContext.IsDiscarded); + Assert.True(newerContext.IsRegression); + Assert.True(newerContext.IsProcessed); + } + [Theory] [InlineData(true)] [InlineData(false)] From 6db5cff7a3965071e88f5af8afa3acc09bf61740 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:34:53 -0600 Subject: [PATCH 02/14] Align stack notification throttle window to 15 minutes (#2703) --- src/Exceptionless.Core/Jobs/EventNotificationsJob.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Exceptionless.Core/Jobs/EventNotificationsJob.cs b/src/Exceptionless.Core/Jobs/EventNotificationsJob.cs index 8890398ce2..0f164dcabd 100644 --- a/src/Exceptionless.Core/Jobs/EventNotificationsJob.cs +++ b/src/Exceptionless.Core/Jobs/EventNotificationsJob.cs @@ -78,9 +78,9 @@ protected override async Task ProcessQueueEntryAsync(QueueEntryContex { if (shouldLog) _logger.LogTrace("Loaded project: name={ProjectName}", project.Name); - // after the first 2 occurrences, don't send a notification for the same stack more then once every 30 minutes + // after the first 2 occurrences, don't send a notification for the same stack more then once every 15 minutes var lastTimeSentUtc = await _cache.GetAsync(String.Concat("notify:stack-throttle:", ev.StackId), DateTime.MinValue); - if (wi is { TotalOccurrences: > 2, IsRegression: false } && lastTimeSentUtc != DateTime.MinValue && lastTimeSentUtc > _timeProvider.GetUtcNow().UtcDateTime.AddMinutes(-30)) + if (wi is { TotalOccurrences: > 2, IsRegression: false } && lastTimeSentUtc != DateTime.MinValue && lastTimeSentUtc > _timeProvider.GetUtcNow().UtcDateTime.AddMinutes(-15)) { if (shouldLog) _logger.LogInformation("Skipping message because of stack throttling: last sent={LastSentUtc} occurrences={TotalOccurrences}", lastTimeSentUtc, wi.TotalOccurrences); return JobResult.Success; From 601088f916f89478b5e677d8b75598b7bc91ec7f Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:34:53 -0600 Subject: [PATCH 03/14] Link plan-limit and throttling emails to the current FAQ (#2704) --- src/Exceptionless.Core/Mail/Mailer.cs | 4 ++-- .../Templates/ProjectDailySummary.razor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Exceptionless.Core/Mail/Mailer.cs b/src/Exceptionless.Core/Mail/Mailer.cs index 85933fb25a..bf1cb48a6b 100644 --- a/src/Exceptionless.Core/Mail/Mailer.cs +++ b/src/Exceptionless.Core/Mail/Mailer.cs @@ -207,8 +207,8 @@ public async Task SendOrganizationNoticeAsync(User user, Organization organizati : $"[{organization.Name}] Events are currently being throttled."; string upgradeUrl = _appUrls.OrganizationUpgrade(organization.Id); string learnMoreUrl = isOverMonthlyLimit - ? "https://github.com/exceptionless/Exceptionless/wiki/Frequently-Asked-Questions#q-what-happens-if-the-organization-plan-limit-is-reached" - : "https://github.com/exceptionless/Exceptionless/wiki/Frequently-Asked-Questions#q-why-is-my-organization-throttled"; + ? "https://exceptionless.com/docs/FAQ/#what-happens-if-the-organization-plan-limit-is-reached" + : "https://exceptionless.com/docs/FAQ/#why-is-my-organization-throttled"; var message = new OrganizationNoticeEmail( subject, organization.Name, diff --git a/src/Exceptionless.EmailTemplates/Templates/ProjectDailySummary.razor b/src/Exceptionless.EmailTemplates/Templates/ProjectDailySummary.razor index 340f4a4d60..cbc33cf3af 100644 --- a/src/Exceptionless.EmailTemplates/Templates/ProjectDailySummary.razor +++ b/src/Exceptionless.EmailTemplates/Templates/ProjectDailySummary.razor @@ -27,7 +27,7 @@ @if (Model.Blocked != 0) { -

@Model.Blocked events were discarded due to throttling. Upgrade now to increase your limits. Click here to learn more about throttling.

+

@Model.Blocked events were discarded due to throttling. Upgrade now to increase your limits. Click here to learn more about throttling.

Upgrade Plan
} From 93db0e342d9973f9f1a6e3eac3bc95c8b03c3e62 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:35:03 -0600 Subject: [PATCH 04/14] Report the JavaScript client as current in MCP setup and Exie (#2705) --- src/Exceptionless.Web/Assistant/AssistantSystemPrompt.cs | 2 +- src/Exceptionless.Web/Mcp/ExceptionlessMcpTools.cs | 2 +- tests/Exceptionless.Tests/Assistant/AssistantServiceTests.cs | 2 +- tests/Exceptionless.Tests/Mcp/ExceptionlessMcpToolsTests.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Exceptionless.Web/Assistant/AssistantSystemPrompt.cs b/src/Exceptionless.Web/Assistant/AssistantSystemPrompt.cs index 8dd4249dc5..3276df163e 100644 --- a/src/Exceptionless.Web/Assistant/AssistantSystemPrompt.cs +++ b/src/Exceptionless.Web/Assistant/AssistantSystemPrompt.cs @@ -13,7 +13,7 @@ public static string Create(string context) => $""" PERIOD RULE: for which errors happened in a period, or the top, most frequent, or most common errors in one, call count_events once per project with groupBy stack, the time, and filter type:error. It counts the events inside the period, ranks stacks by how often they occurred, names each with its title, gives its webUrl, and includes first_occurrence, so an error is new when that falls inside the period. search_stacks matches stacks by their last occurrence and sorts by all-time totals, so a stack that happened in a past period and again since would be missed; use search_stacks only to find stacks by status, tag, title, or other stack fields. - CLIENT SETUP RULE: for any question about configuring, installing, connecting, or sending first events from a client, call get_project_setup once. Use the current project by default. When there is no current project and the user identifies one by name, pass that exact projectName to get_project_setup so it resolves the project within the current organization. If no project is identified, call list_projects once, ask which project they want to configure, and call suggest_followups with up to three of those projects as prompts that name the project, such as "How do I configure a client for Billing API?". Do not call get_stack for setup, and call list_projects only when no project is identified. Use the returned Client Setup webUrl verbatim and only describe the clients and support status returned by that tool. Never invent packages or advertise Python, Java, Ruby, or PHP clients. Treat JavaScript / Node.js as legacy; describe React Native and Expo as supported only when returned by the tool. + CLIENT SETUP RULE: for any question about configuring, installing, connecting, or sending first events from a client, call get_project_setup once. Use the current project by default. When there is no current project and the user identifies one by name, pass that exact projectName to get_project_setup so it resolves the project within the current organization. If no project is identified, call list_projects once, ask which project they want to configure, and call suggest_followups with up to three of those projects as prompts that name the project, such as "How do I configure a client for Billing API?". Do not call get_stack for setup, and call list_projects only when no project is identified. Use the returned Client Setup webUrl verbatim and only describe the clients and support status returned by that tool. Never invent packages or advertise Python, Java, Ruby, or PHP clients. Describe JavaScript / Node.js, React Native, and Expo as supported only when returned by the tool. After using tools, always provide a complete final answer in the same response. Never end by merely saying what you will inspect or do next. If the available tools cannot retrieve something, clearly state that limitation and give the most useful answer supported by the available data. diff --git a/src/Exceptionless.Web/Mcp/ExceptionlessMcpTools.cs b/src/Exceptionless.Web/Mcp/ExceptionlessMcpTools.cs index 1b7a66970b..9ad46c7197 100644 --- a/src/Exceptionless.Web/Mcp/ExceptionlessMcpTools.cs +++ b/src/Exceptionless.Web/Mcp/ExceptionlessMcpTools.cs @@ -258,7 +258,7 @@ public async Task> GetProjectSetupAsync( new McpProjectSetupClient(".NET", "current"), new McpProjectSetupClient("React Native", "current"), new McpProjectSetupClient("Expo", "current"), - new McpProjectSetupClient("JavaScript / Node.js", "legacy") + new McpProjectSetupClient("JavaScript / Node.js", "current") ], ["Use the project's Client Setup page for the server URL, API key, and current installation instructions."])); } diff --git a/tests/Exceptionless.Tests/Assistant/AssistantServiceTests.cs b/tests/Exceptionless.Tests/Assistant/AssistantServiceTests.cs index d2d307d96f..6ce9d9f800 100644 --- a/tests/Exceptionless.Tests/Assistant/AssistantServiceTests.cs +++ b/tests/Exceptionless.Tests/Assistant/AssistantServiceTests.cs @@ -203,7 +203,7 @@ [new AssistantChatMessage("user", "Say hello")], Assert.Contains("pass that exact projectName to get_project_setup", handler.RequestBody); Assert.Contains("Do not call get_stack for setup, and call list_projects only when no project is identified", handler.RequestBody); Assert.Contains("Never invent packages or advertise Python, Java, Ruby, or PHP clients", handler.RequestBody); - Assert.Contains("describe React Native and Expo as supported only when returned by the tool", handler.RequestBody); + Assert.Contains("Describe JavaScript / Node.js, React Native, and Expo as supported only when returned by the tool", handler.RequestBody); Assert.Contains("do not call list_projects, call each needed project-scoped tool only once", handler.RequestBody); Assert.Contains("Defaults to the current page project id when omitted", handler.RequestBody); Assert.Contains("This tool has no stack id filter", handler.RequestBody); diff --git a/tests/Exceptionless.Tests/Mcp/ExceptionlessMcpToolsTests.cs b/tests/Exceptionless.Tests/Mcp/ExceptionlessMcpToolsTests.cs index fd4a18c820..fddb6e9457 100644 --- a/tests/Exceptionless.Tests/Mcp/ExceptionlessMcpToolsTests.cs +++ b/tests/Exceptionless.Tests/Mcp/ExceptionlessMcpToolsTests.cs @@ -407,7 +407,7 @@ public async Task GetProjectSetupAsync_Project_ReturnsOnlyVerifiedClientSupport( client => { Assert.Equal("JavaScript / Node.js", client.Name); - Assert.Equal("legacy", client.Status); + Assert.Equal("current", client.Status); }); Assert.DoesNotContain(setup.Clients, client => client.Name is "Python" or "Java" or "Ruby" or "PHP"); } From 1688e059d7fbd7d433495f3338142273f3dc108b Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:47:06 -0600 Subject: [PATCH 05/14] Preserve token id case in the created Location header (#2699) --- src/Exceptionless.Web/Api/Handlers/TokenHandler.cs | 2 +- .../Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs b/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs index aef15d8f04..9ca8998e32 100644 --- a/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs +++ b/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs @@ -201,7 +201,7 @@ private async Task> CreateTokenImplAsync(NewToken value) var model = await AddModelAsync(mapped); var viewModel = mapper.MapToViewToken(model); AfterResultMap([viewModel]); - string location = linkGenerator.GetUriByName(HttpContext, "GetTokenById", new { id = model.Id }) + string location = linkGenerator.GetUriByName(HttpContext, "GetTokenById", new { id = model.Id }, options: new LinkOptions { LowercaseUrls = false }) ?? throw new InvalidOperationException("Unable to generate token location."); return Result.Created(viewModel, location); } diff --git a/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs index 9756b5ddf0..83bf8bff87 100644 --- a/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs +++ b/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs @@ -90,6 +90,11 @@ public async Task PostAsync_NewToken_ReturnsAbsoluteLocation() Assert.True(response.Headers.Location.IsAbsoluteUri); Assert.Equal("localhost", response.Headers.Location.Host); Assert.StartsWith("/api/v2/tokens/", response.Headers.Location.AbsolutePath); + + // Token ids are case sensitive, so the location must preserve their case. + var viewToken = await response.DeserializeAsync(); + Assert.NotNull(viewToken); + Assert.EndsWith("/" + viewToken.Id, response.Headers.Location.AbsolutePath, StringComparison.Ordinal); } [Fact] From 88694efd26bd77d2f8b29c461c90444e1f8a2006 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:47:14 -0600 Subject: [PATCH 06/14] Reword the discard stack dialog to say only future events are dropped (#2701) --- .../dialogs/mark-stack-discarded-dialog.svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-discarded-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-discarded-dialog.svelte index d9f2ab89d3..3dd6971727 100644 --- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-discarded-dialog.svelte +++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-discarded-dialog.svelte @@ -45,13 +45,15 @@ {#if stackTitle}{stackTitle}
{/if} - Are you sure you want to discard all current + Are you sure you want to discard future events for {#if count === 1} - stack events + this stack? {:else} - stacks events + stacks? {/if} - and discard any future events? + Existing events are kept. To remove them, delete the + {#if count === 1}stack{:else}stacks{/if} + instead.
All future occurrences will be discarded and will not count against your event limit. From 4555f5fc1affac9dd61281edfd7cda525fef29f3 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Wed, 4 Nov 2026 13:47:14 -0600 Subject: [PATCH 07/14] Show the upgrade dialog when Slack settings changes return a plan limit (#2702) --- .../(app)/project/[projectId]/integrations/+page.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte index d5603bd9b2..8b68199907 100644 --- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte +++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte @@ -132,7 +132,11 @@ try { await updateSlackNotificationSettingsResponse.mutateAsync(settings); toastId = toast.success('Successfully updated Slack notification settings.'); - } catch { + } catch (error) { + if (showBillingDialogOnUpgradeProblem(error, organization.current, () => updateSlackNotificationSettings(settings))) { + return; + } + toastId = toast.error('Error updating Slack notification settings. Please try again.'); } } From fdff0c6d16cd6ac4ad871e48955dc899d36af143 Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Sun, 15 Nov 2026 21:24:25 -0600 Subject: [PATCH 08/14] Complete mixed-version regression handling and notification coverage --- .../Pipeline/030_CheckForRegressionAction.cs | 12 +++-- .../Pipeline/EventPipelineTests.cs | 44 ++++++++++++++++--- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs index 902434ddb9..8032f412c6 100644 --- a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs +++ b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs @@ -63,9 +63,11 @@ public override async Task ProcessBatchAsync(ICollection contexts) continue; } - regressedVersion = version; - regressedContext = versionGroup.First(); - break; + if (regressedContext is null) + { + regressedVersion = version; + regressedContext = versionGroup.First(); + } } } @@ -73,11 +75,13 @@ public override async Task ProcessBatchAsync(ICollection contexts) continue; _logger.LogDebug("Marking stack and events as regressed in version: {Version}", regressedVersion); - stack.Status = StackStatus.Regressed; await _stackRepository.MarkAsRegressedAsync(stack.Id); foreach (var ctx in stackGroup) + { + ctx.Stack!.Status = StackStatus.Regressed; ctx.IsRegression = ctx == regressedContext; + } } catch (Exception ex) { diff --git a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs index 16b91c6ca6..7d59d11edb 100644 --- a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs +++ b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs @@ -15,6 +15,7 @@ using Exceptionless.Core.Utility; using Exceptionless.DateTimeExtensions; using Exceptionless.Tests.Utility; +using Foundatio.Queues; using Foundatio.Repositories; using Foundatio.Repositories.Extensions; using Foundatio.Serializer; @@ -960,19 +961,22 @@ public async Task EnsureVersionedRegressionAsync() Assert.Equal("1.0.1-rc3", regressedEvent.GetVersion()); } - [Fact] - public async Task EnsureOnlyOlderVersionEventsAreDiscardedWhenBatchRegressesAsync() + [Theory] + [InlineData(-3, "1.0.1")] + [InlineData(-1, "1.0.2")] + public async Task RunAsync_MixedVersionsForFixedStack_DiscardsOnlyOlderVersionEvents(int olderEventMinutes, string regressedVersion) { // Arrange - var utcNow = DateTime.UtcNow; + var utcNow = TimeProvider.GetUtcNow(); var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); organization.HasPremiumFeatures = true; var project = _projectData.GenerateSampleProject(); - var ev = _eventData.GenerateEvent(projectId: TestConstants.ProjectId, organizationId: TestConstants.OrganizationId, occurrenceDate: utcNow); + var ev = _eventData.GenerateEvent(projectId: project.Id, organizationId: organization.Id, occurrenceDate: utcNow.AddMinutes(-5)); var context = new EventContext(ev, organization, project); await _pipeline.RunAsync(context); await RefreshDataAsync(); + Assert.False(context.HasError, context.ErrorMessage); ev = await _eventRepository.GetByIdAsync(ev.Id); Assert.NotNull(ev); @@ -981,20 +985,46 @@ public async Task EnsureOnlyOlderVersionEventsAreDiscardedWhenBatchRegressesAsyn stack.MarkFixed(new SemanticVersion(1, 0, 1), TimeProvider); await _stackRepository.SaveAsync(stack, o => o.Cache()); - var olderContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: TestConstants.ProjectId, organizationId: TestConstants.OrganizationId, occurrenceDate: utcNow.AddMinutes(-2), semver: "1.0.0"), organization, project); - var newerContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: TestConstants.ProjectId, organizationId: TestConstants.OrganizationId, occurrenceDate: utcNow.AddMinutes(-1), semver: "1.0.2"), organization, project); + project.NotificationSettings[TestConstants.UserId] = new NotificationSettings { ReportEventRegressions = true }; + var notificationQueue = GetService>(); + var olderContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: project.Id, organizationId: organization.Id, occurrenceDate: utcNow.AddMinutes(olderEventMinutes), semver: "1.0.0"), organization, project); + var newerContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: project.Id, organizationId: organization.Id, occurrenceDate: utcNow.AddMinutes(-2), semver: regressedVersion), organization, project); + var latestContext = new EventContext(_eventData.GenerateEvent(stackId: ev.StackId, projectId: project.Id, organizationId: organization.Id, occurrenceDate: utcNow, semver: "1.0.3"), organization, project); await RefreshDataAsync(); // Act - await _pipeline.RunAsync([olderContext, newerContext]); + await _pipeline.RunAsync([latestContext, olderContext, newerContext]); // Assert Assert.False(olderContext.HasError, olderContext.ErrorMessage); Assert.False(newerContext.HasError, newerContext.ErrorMessage); + Assert.False(latestContext.HasError, latestContext.ErrorMessage); Assert.True(olderContext.IsDiscarded); + Assert.True(olderContext.IsCancelled); + Assert.False(olderContext.IsProcessed); + Assert.False(olderContext.IsRegression); Assert.False(newerContext.IsDiscarded); Assert.True(newerContext.IsRegression); Assert.True(newerContext.IsProcessed); + Assert.False(latestContext.IsDiscarded); + Assert.False(latestContext.IsRegression); + Assert.True(latestContext.IsProcessed); + Assert.Equal(StackStatus.Regressed, newerContext.Stack?.Status); + Assert.Equal(StackStatus.Regressed, latestContext.Stack?.Status); + + var savedEvent = await _eventRepository.GetByIdAsync(newerContext.Event.Id); + Assert.NotNull(savedEvent); + Assert.Equal(regressedVersion, savedEvent.GetVersion()); + var savedStack = await _stackRepository.GetByIdAsync(stack.Id); + Assert.Equal(StackStatus.Regressed, savedStack?.Status); + + var queueStats = await notificationQueue.GetQueueStatsAsync(); + Assert.Equal(1, queueStats.Queued); + var notification = await notificationQueue.DequeueAsync(TestCancellationToken); + Assert.NotNull(notification); + Assert.Equal(newerContext.Event.Id, notification.Value.EventId); + Assert.True(notification.Value.IsRegression); + await notification.CompleteAsync(); } [Theory] From 15f75f642dee57c83a1c621f977d7ce954b5367c Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Sun, 15 Nov 2026 21:24:26 -0600 Subject: [PATCH 09/14] Verify case-sensitive token locations resolve to the created token --- .../Api/Handlers/TokenHandler.cs | 1 + .../Api/Endpoints/TokenEndpointTests.cs | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs b/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs index 9ca8998e32..10f363b892 100644 --- a/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs +++ b/src/Exceptionless.Web/Api/Handlers/TokenHandler.cs @@ -201,6 +201,7 @@ private async Task> CreateTokenImplAsync(NewToken value) var model = await AddModelAsync(mapped); var viewModel = mapper.MapToViewToken(model); AfterResultMap([viewModel]); + // Token ids are case sensitive, so override the global lowercase URL setting for this link. string location = linkGenerator.GetUriByName(HttpContext, "GetTokenById", new { id = model.Id }, options: new LinkOptions { LowercaseUrls = false }) ?? throw new InvalidOperationException("Unable to generate token location."); return Result.Created(viewModel, location); diff --git a/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs index 83bf8bff87..d8a0a67eba 100644 --- a/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs +++ b/tests/Exceptionless.Tests/Api/Endpoints/TokenEndpointTests.cs @@ -66,7 +66,7 @@ public async Task PostAsync_NewToken_MapsAllPropertiesToToken() } [Fact] - public async Task PostAsync_NewToken_ReturnsAbsoluteLocation() + public async Task PostAsync_NewToken_ReturnsRetrievableAbsoluteLocation() { // Arrange var token = new NewToken @@ -77,7 +77,7 @@ public async Task PostAsync_NewToken_ReturnsAbsoluteLocation() }; // Act - var response = await SendRequestAsync(r => r + using var response = await SendRequestAsync(r => r .Post() .AsGlobalAdminUser() .AppendPath("tokens") @@ -95,6 +95,17 @@ public async Task PostAsync_NewToken_ReturnsAbsoluteLocation() var viewToken = await response.DeserializeAsync(); Assert.NotNull(viewToken); Assert.EndsWith("/" + viewToken.Id, response.Headers.Location.AbsolutePath, StringComparison.Ordinal); + + // Act + var locatedToken = await SendRequestAsAsync(r => r + .AsGlobalAdminUser() + .BaseUri(response.Headers.Location) + .StatusCodeShouldBeOk() + ); + + // Assert + Assert.NotNull(locatedToken); + Assert.Equal(viewToken.Id, locatedToken.Id); } [Fact] From acedd28d30ebb5491c8bf3972457ad2a6296209e Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Sun, 15 Nov 2026 21:24:27 -0600 Subject: [PATCH 10/14] Keep Slack upgrade retries scoped to the current settings request --- .../[projectId]/integrations/+page.svelte | 28 ++- .../integrations-page.svelte.test.ts | 209 ++++++++++++++++++ 2 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/integrations-page.svelte.test.ts diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte index 8b68199907..e9a255543d 100644 --- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte +++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte @@ -4,6 +4,7 @@ import Plus from '@lucide/svelte/icons/plus'; import Zapier from '@lucide/svelte/icons/zap'; import { createTable } from '@tanstack/svelte-table'; + import { onDestroy } from 'svelte'; import { toast } from 'svelte-sonner'; import type { NotificationSettings } from '#features/projects/models.ts'; @@ -36,6 +37,7 @@ let toastId = $state(); let showAddWebhookDialog = $state(false); let showRemoveSlackDialog = $state(false); + let slackSettingsRequestId = 0; const projectId = $derived(page.params.projectId || ''); const projectQuery = getProjectQuery({ route: { @@ -127,13 +129,30 @@ } async function updateSlackNotificationSettings(settings: NotificationSettings) { + const requestId = ++slackSettingsRequestId; + const requestProjectId = projectId; + const requestOrganizationId = organization.current; + const isCurrentRequest = () => requestId === slackSettingsRequestId && projectId === requestProjectId && organization.current === requestOrganizationId; + toast.dismiss(toastId); try { await updateSlackNotificationSettingsResponse.mutateAsync(settings); - toastId = toast.success('Successfully updated Slack notification settings.'); + if (isCurrentRequest()) { + toastId = toast.success('Successfully updated Slack notification settings.'); + } } catch (error) { - if (showBillingDialogOnUpgradeProblem(error, organization.current, () => updateSlackNotificationSettings(settings))) { + if (!isCurrentRequest()) { + return; + } + + if ( + showBillingDialogOnUpgradeProblem(error, requestOrganizationId, () => { + if (isCurrentRequest()) { + return updateSlackNotificationSettings(settings); + } + }) + ) { return; } @@ -141,6 +160,11 @@ } } + onDestroy(() => { + // Invalidate pending responses and billing retries when this page is left. + slackSettingsRequestId++; + }); + const DEFAULT_PARAMS = { limit: DEFAULT_LIMIT }; diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/integrations-page.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/integrations-page.svelte.test.ts new file mode 100644 index 0000000000..86b9ad7dc6 --- /dev/null +++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/integrations-page.svelte.test.ts @@ -0,0 +1,209 @@ +import { page } from '$app/state'; +import { ProblemDetails } from '@foundatiofx/fetchclient'; +import { cleanup, fireEvent, render, screen } from '@testing-library/svelte'; +import { tick } from 'svelte'; +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; + +import type { NotificationSettings } from '#features/projects/models.ts'; + +import { upgradeRequiredDialog } from '#features/billing/upgrade-required.svelte.ts'; +import { organization } from '#features/organizations/context.svelte.ts'; + +import IntegrationsPage from './+page.svelte'; + +const mocks = vi.hoisted(() => ({ + save: vi.fn<(settings: NotificationSettings) => Promise>(), + toast: { dismiss: vi.fn(), error: vi.fn(), success: vi.fn() } +})); + +vi.mock('$app/env/public', () => ({ PUBLIC_SLACK_APPID: 'slack-app-id' })); +vi.mock('$app/state', async () => { + const { SvelteMap } = await import('svelte/reactivity'); + const state = new SvelteMap([['projectId', 'project-a']]); + return { + page: { + params: { + get projectId() { + return state.get('projectId')!; + }, + set projectId(value: string) { + state.set('projectId', value); + } + } + } + }; +}); +vi.mock('svelte-sonner', () => ({ toast: mocks.toast })); +vi.mock('@tanstack/svelte-table', () => ({ createTable: () => ({}) })); +vi.mock('#features/auth/index.svelte.ts', () => ({ slackOAuthLogin: vi.fn() })); +vi.mock('#features/billing/index.ts', async () => { + const { showBillingDialogOnUpgradeProblem } = await import('#features/billing/upgrade-required.svelte.ts'); + return { showBillingDialogOnUpgradeProblem }; +}); +vi.mock('#features/organizations/context.svelte.ts', () => ({ organization: { current: 'organization-a' } })); +vi.mock('#features/projects/api.svelte.ts', () => ({ + deleteSlack: () => ({ mutateAsync: vi.fn() }), + getProjectIntegrationNotificationSettings: () => ({ data: { send_daily_summary: false } }), + getProjectQuery: () => ({ data: { has_slack_integration: true } }), + postSlack: () => ({ mutateAsync: vi.fn() }), + putProjectIntegrationNotificationSettings: () => ({ mutateAsync: mocks.save }) +})); +vi.mock('#features/shared/api/api.svelte.ts', () => ({ DEFAULT_LIMIT: 10 })); +vi.mock('#features/webhooks/api.svelte.ts', () => ({ + getProjectWebhooksQuery: () => ({ data: [], isLoading: false }), + postWebhook: () => ({ mutateAsync: vi.fn() }) +})); +vi.mock('#features/webhooks/components/table/options.svelte.ts', () => ({ getTableOptions: () => ({}) })); +vi.mock('#features/webhooks/components/table/webhooks-data-table.svelte', () => ({ default: vi.fn() })); +vi.mock('#shared/query-params/index.ts', async () => { + const { SvelteMap } = await import('svelte/reactivity'); + return { + createQueryParameters: () => { + const state = new SvelteMap([['limit', 10]]); + return { + get limit() { + return state.get('limit')!; + }, + set limit(value: number) { + state.set('limit', value); + } + }; + } + }; +}); + +function planLimitProblem() { + const problem = new ProblemDetails(); + problem.status = 426; + problem.title = 'Please upgrade your plan to enable slack integration.'; + return problem; +} + +async function toggleSetting(index: number) { + await fireEvent.click(screen.getAllByRole('switch')[index]!); + await vi.advanceTimersByTimeAsync(500); + await tick(); +} + +describe('Slack notification settings', () => { + beforeEach(() => { + vi.useFakeTimers(); + mocks.save.mockReset().mockResolvedValue(true); + page.params.projectId = 'project-a'; + organization.current = 'organization-a'; + upgradeRequiredDialog.reset(); + }); + + afterEach(() => { + cleanup(); + upgradeRequiredDialog.reset(); + vi.useRealTimers(); + }); + + it('updateSlackNotificationSettings_UpgradeSucceeds_RetriesOriginalSettings', async () => { + // Arrange + mocks.save.mockRejectedValueOnce(planLimitProblem()); + render(IntegrationsPage); + + // Act + await toggleSetting(0); + const retry = upgradeRequiredDialog.retryCallback; + await retry?.(); + + // Assert + expect(retry).toBeTypeOf('function'); + expect(upgradeRequiredDialog.organizationId).toBe('organization-a'); + expect(mocks.save).toHaveBeenCalledTimes(2); + expect(mocks.save.mock.calls[1]?.[0]).toEqual(mocks.save.mock.calls[0]?.[0]); + expect(mocks.toast.success).toHaveBeenCalledWith('Successfully updated Slack notification settings.'); + expect(mocks.toast.error).not.toHaveBeenCalled(); + }); + + it.each(['Project', 'Organization'] as const)( + 'updateSlackNotificationSettings_PendingResponseAfter%sChanges_DoesNotOpenUpgradeDialog', + async (changedContext) => { + // Arrange + const pending = Promise.withResolvers(); + mocks.save.mockReturnValueOnce(pending.promise); + render(IntegrationsPage); + await toggleSetting(0); + + // Act + if (changedContext === 'Project') { + page.params.projectId = 'project-b'; + } else { + organization.current = 'organization-b'; + } + await tick(); + pending.reject(planLimitProblem()); + await vi.advanceTimersByTimeAsync(0); + + // Assert + expect(upgradeRequiredDialog.open).toBe(false); + expect(mocks.toast.error).not.toHaveBeenCalled(); + } + ); + + it.each(['ProjectChanges', 'OrganizationChanges', 'Unmount'] as const)( + 'updateSlackNotificationSettings_RetryAfter%s_DoesNotSave', + async (changedContext) => { + // Arrange + mocks.save.mockRejectedValueOnce(planLimitProblem()); + const { unmount } = render(IntegrationsPage); + await toggleSetting(0); + const retry = upgradeRequiredDialog.retryCallback; + + // Act + if (changedContext === 'ProjectChanges') { + page.params.projectId = 'project-b'; + } else if (changedContext === 'OrganizationChanges') { + organization.current = 'organization-b'; + } else { + await unmount(); + } + await tick(); + await retry?.(); + + // Assert + expect(retry).toBeTypeOf('function'); + expect(mocks.save).toHaveBeenCalledOnce(); + expect(mocks.toast.success).not.toHaveBeenCalled(); + } + ); + + it('updateSlackNotificationSettings_OlderFailureArrivesLast_RetriesLatestSettings', async () => { + // Arrange + const older = Promise.withResolvers(); + mocks.save.mockReturnValueOnce(older.promise).mockRejectedValueOnce(planLimitProblem()); + render(IntegrationsPage); + await toggleSetting(0); + await toggleSetting(1); + + // Act + older.reject(planLimitProblem()); + await vi.advanceTimersByTimeAsync(0); + await upgradeRequiredDialog.retryCallback?.(); + + // Assert + expect(mocks.save).toHaveBeenCalledTimes(3); + expect(mocks.save.mock.calls[2]?.[0]).toEqual(mocks.save.mock.calls[1]?.[0]); + expect(mocks.save.mock.calls[2]?.[0]).toMatchObject({ report_critical_errors: true, report_new_errors: true }); + }); + + it('updateSlackNotificationSettings_NewerSaveStarts_DoesNotRetryOlderSettings', async () => { + // Arrange + mocks.save.mockRejectedValueOnce(planLimitProblem()); + render(IntegrationsPage); + await toggleSetting(0); + const retry = upgradeRequiredDialog.retryCallback; + + // Act + await toggleSetting(1); + await retry?.(); + + // Assert + expect(retry).toBeTypeOf('function'); + expect(mocks.save).toHaveBeenCalledTimes(2); + expect(mocks.save.mock.calls[1]?.[0]).toMatchObject({ report_critical_errors: true, report_new_errors: true }); + }); +}); From aef3bff4a60a3cc50d1993d79dfabc70a61ca036 Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Mon, 16 Nov 2026 08:31:52 -0600 Subject: [PATCH 11/14] Reuse stack instances per batch and correct notification counts --- .../Pipeline/010_AssignToStackAction.cs | 47 ++++++++---- .../Pipeline/060_UpdateStatsAction.cs | 4 +- .../Pipeline/EventPipelineTests.cs | 72 +++++++++++++++++++ 3 files changed, 107 insertions(+), 16 deletions(-) diff --git a/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs b/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs index c0d067e00f..180cd30749 100644 --- a/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs +++ b/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs @@ -35,6 +35,17 @@ public AssignToStackAction(IStackRepository stackRepository, FormattingPluginMan public override async Task ProcessBatchAsync(ICollection contexts) { var stacks = new Dictionary(); + var stacksById = new Dictionary(); + + StackInfo TrackStack(Stack stack, bool isNew = false) + { + if (stacksById.TryGetValue(stack.Id, out var existing)) + return existing; + + var info = new StackInfo { IsNew = isNew, ShouldSave = false, Stack = stack }; + stacksById.Add(stack.Id, info); + return info; + } foreach (var ctx in contexts) { @@ -58,7 +69,11 @@ public override async Task ProcessBatchAsync(ICollection contexts) { ctx.Stack = await _stackRepository.GetStackBySignatureHashAsync(ctx.Event.ProjectId, signatureHash); if (ctx.Stack is not null) - stacks.Add(signatureHash, new StackInfo { IsNew = false, ShouldSave = false, Stack = ctx.Stack }); + { + var info = TrackStack(ctx.Stack); + ctx.Stack = info.Stack; + stacks.Add(signatureHash, info); + } } // create new stack in distributed lock @@ -70,7 +85,9 @@ public override async Task ProcessBatchAsync(ICollection contexts) var newStack = await _stackRepository.GetStackBySignatureHashAsync(ctx.Event.ProjectId, signatureHash); if (newStack is not null) { - ctx.Stack = newStack; + var info = TrackStack(newStack); + ctx.Stack = info.Stack; + stacks.Add(signatureHash, info); return; } @@ -99,7 +116,7 @@ public override async Task ProcessBatchAsync(ICollection contexts) ctx.Stack = stack; await _stackRepository.AddAsync(stack, o => o.Cache()); - stacks.Add(signatureHash, new StackInfo { IsNew = true, ShouldSave = false, Stack = ctx.Stack }); + stacks.Add(signatureHash, TrackStack(stack, isNew: true)); }, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10)); if (!success) @@ -111,7 +128,14 @@ public override async Task ProcessBatchAsync(ICollection contexts) } else { - ctx.Stack = await _stackRepository.GetByIdAsync(ctx.Event.StackId, o => o.Cache()); + if (!stacksById.TryGetValue(ctx.Event.StackId, out var info)) + { + var stack = await _stackRepository.GetByIdAsync(ctx.Event.StackId, o => o.Cache()); + if (stack is not null) + info = TrackStack(stack); + } + + ctx.Stack = info?.Stack; if (ctx.Stack is null || ctx.Stack.ProjectId != ctx.Event.ProjectId) { ctx.SetError("Invalid StackId."); @@ -119,11 +143,7 @@ public override async Task ProcessBatchAsync(ICollection contexts) } ctx.SignatureHash = ctx.Stack.SignatureHash; - - if (!stacks.ContainsKey(ctx.Stack.SignatureHash)) - stacks.Add(ctx.Stack.SignatureHash, new StackInfo { IsNew = false, ShouldSave = false, Stack = ctx.Stack }); - else - stacks[ctx.Stack.SignatureHash].Stack = ctx.Stack; + stacks[ctx.Stack.SignatureHash] = info!; } if (ctx.Stack!.Status == StackStatus.Discarded) @@ -142,17 +162,14 @@ public override async Task ProcessBatchAsync(ICollection contexts) ctx.Stack.Tags.AddRange(newTags); ctx.Stack.Tags.RemoveExcessTags(); - if (!stacks.ContainsKey(ctx.Stack.SignatureHash)) - stacks.Add(ctx.Stack.SignatureHash, new StackInfo { IsNew = false, ShouldSave = true, Stack = ctx.Stack }); - else - stacks[ctx.Stack.SignatureHash].ShouldSave = true; + stacksById[ctx.Stack.Id].ShouldSave = true; } } ctx.Event.IsFirstOccurrence = ctx.IsNew; } - var addedStacks = stacks.Where(s => s.Value.IsNew).Select(kvp => kvp.Value.Stack).ToList(); + var addedStacks = stacksById.Values.Where(s => s.IsNew).Select(s => s.Stack).ToList(); if (addedStacks.Count > 0) { await _publisher.PublishAsync(new EntityChanged @@ -167,7 +184,7 @@ await _publisher.PublishAsync(new EntityChanged }); } - var stacksToSave = stacks.Where(s => s.Value.ShouldSave).Select(kvp => kvp.Value.Stack).ToList(); + var stacksToSave = stacksById.Values.Where(s => s.ShouldSave).Select(s => s.Stack).ToList(); if (stacksToSave.Count > 0) await _stackRepository.SaveAsync(stacksToSave, o => o.Cache().Notifications(false)); // notification will get sent later in the update stats step diff --git a/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs b/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs index 327e79cbc3..34016b1733 100644 --- a/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs +++ b/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs @@ -40,6 +40,7 @@ private async Task IncrementEventCountersAsync(IGrouping s await _stackService.IncrementStackUsageAsync(stackContexts[0].Event.OrganizationId, stackContexts[0].Event.ProjectId, stackGroup.Key, minDate, maxDate, count); // Update stacks in memory since they are used in notifications. + int? updatedTotalOccurrences = null; foreach (var ctx in stackContexts) { if (ctx.Stack is null) @@ -51,7 +52,8 @@ private async Task IncrementEventCountersAsync(IGrouping s if (ctx.Stack.LastOccurrence < maxDate) ctx.Stack.LastOccurrence = maxDate; - ctx.Stack.TotalOccurrences += count; + updatedTotalOccurrences ??= ctx.Stack.TotalOccurrences + count; + ctx.Stack.TotalOccurrences = updatedTotalOccurrences.Value; } } catch (Exception ex) diff --git a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs index 7d59d11edb..fee7b2b65f 100644 --- a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs +++ b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs @@ -777,6 +777,78 @@ public async Task EnsureSingleGlobalErrorStackAsync() Assert.Equal(2, contexts.Count(c => !c.IsRegression)); } + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task RunAsync_ExistingStackBatch_AggregatesTagsAndOccurrenceCounts(bool useExplicitStackId) + { + // Arrange + var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); + var project = _projectData.GenerateSampleProject(); + var source = Guid.NewGuid().ToString(); + var utcNow = TimeProvider.GetUtcNow(); + var initialEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, occurrenceDate: utcNow.AddMinutes(-3), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + var initialContext = await _pipeline.RunAsync(initialEvent, organization, project); + var stackId = initialContext.Stack!.Id; + await RefreshDataAsync(); + + var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: useExplicitStackId ? stackId : null, occurrenceDate: utcNow.AddMinutes(-2), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + firstEvent.Tags = new TagSet { "first-tag" }; + var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: useExplicitStackId ? stackId : null, occurrenceDate: utcNow.AddMinutes(-1), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + secondEvent.Tags = new TagSet { "second-tag" }; + + // Act + var contexts = await _pipeline.RunAsync([firstEvent, secondEvent], organization, project); + await RefreshDataAsync(); + + // Assert + Assert.All(contexts, context => Assert.False(context.HasError, context.ErrorMessage)); + Assert.All(contexts, context => Assert.True(context.IsProcessed)); + Assert.Same(contexts.First().Stack, contexts.Last().Stack); + Assert.Equal(3, contexts.First().Stack!.TotalOccurrences); + + var savedStack = await _stackRepository.GetByIdAsync(stackId, o => o.Cache()); + Assert.NotNull(savedStack); + Assert.Equal(new[] { "first-tag", "second-tag" }, savedStack.Tags.Order(StringComparer.Ordinal).ToArray()); + } + + [Fact] + public async Task RunAsync_DifferentStackIdsWithSameSignature_PreservesBothStacks() + { + // Arrange + var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); + var project = _projectData.GenerateSampleProject(); + var stackData = GetService(); + var signatureHash = Guid.NewGuid().ToString("N"); + var firstStack = stackData.GenerateStack(generateId: true, organizationId: organization.Id, projectId: project.Id, type: Event.KnownTypes.Log, signatureHash: signatureHash); + var secondStack = stackData.GenerateStack(generateId: true, organizationId: organization.Id, projectId: project.Id, type: Event.KnownTypes.Log, signatureHash: signatureHash); + firstStack.Tags.Clear(); + secondStack.Tags.Clear(); + await _stackRepository.AddAsync(firstStack, o => o.ImmediateConsistency().Cache()); + await _stackRepository.AddAsync(secondStack, o => o.ImmediateConsistency().Cache()); + + var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: firstStack.Id, generateTags: false, generateData: false, type: Event.KnownTypes.Log); + firstEvent.Tags = new TagSet { "first-tag" }; + var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: secondStack.Id, generateTags: false, generateData: false, type: Event.KnownTypes.Log); + secondEvent.Tags = new TagSet { "second-tag" }; + await RefreshDataAsync(); + + // Act + var contexts = await _pipeline.RunAsync([firstEvent, secondEvent], organization, project); + await RefreshDataAsync(); + + // Assert + Assert.All(contexts, context => Assert.False(context.HasError, context.ErrorMessage)); + Assert.NotSame(contexts.First().Stack, contexts.Last().Stack); + Assert.Equal(firstStack.Id, contexts.First().Event.StackId); + Assert.Equal(secondStack.Id, contexts.Last().Event.StackId); + + var savedFirstStack = await _stackRepository.GetByIdAsync(firstStack.Id, o => o.Cache()); + var savedSecondStack = await _stackRepository.GetByIdAsync(secondStack.Id, o => o.Cache()); + Assert.Contains("first-tag", savedFirstStack!.Tags); + Assert.Contains("second-tag", savedSecondStack!.Tags); + } + [Fact] public async Task EnsureSingleRegressionAsync() { From efa476cc4824765f715e0dd8210f1af25cc5bb4c Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Mon, 16 Nov 2026 08:39:16 -0600 Subject: [PATCH 12/14] Use recent event dates in duplicate-stack coverage --- tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs index fee7b2b65f..c37c1e2a1f 100644 --- a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs +++ b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs @@ -827,9 +827,10 @@ public async Task RunAsync_DifferentStackIdsWithSameSignature_PreservesBothStack await _stackRepository.AddAsync(firstStack, o => o.ImmediateConsistency().Cache()); await _stackRepository.AddAsync(secondStack, o => o.ImmediateConsistency().Cache()); - var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: firstStack.Id, generateTags: false, generateData: false, type: Event.KnownTypes.Log); + var utcNow = TimeProvider.GetUtcNow(); + var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: firstStack.Id, occurrenceDate: utcNow.AddMinutes(-2), generateTags: false, generateData: false, type: Event.KnownTypes.Log); firstEvent.Tags = new TagSet { "first-tag" }; - var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: secondStack.Id, generateTags: false, generateData: false, type: Event.KnownTypes.Log); + var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: secondStack.Id, occurrenceDate: utcNow.AddMinutes(-1), generateTags: false, generateData: false, type: Event.KnownTypes.Log); secondEvent.Tags = new TagSet { "second-tag" }; await RefreshDataAsync(); @@ -839,6 +840,7 @@ public async Task RunAsync_DifferentStackIdsWithSameSignature_PreservesBothStack // Assert Assert.All(contexts, context => Assert.False(context.HasError, context.ErrorMessage)); + Assert.All(contexts, context => Assert.True(context.IsProcessed)); Assert.NotSame(contexts.First().Stack, contexts.Last().Stack); Assert.Equal(firstStack.Id, contexts.First().Event.StackId); Assert.Equal(secondStack.Id, contexts.Last().Event.StackId); From 127eedd264145c72497b7354025e9833e66888d4 Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Mon, 16 Nov 2026 21:08:16 -0600 Subject: [PATCH 13/14] Simplify batch stack ownership and update shared counts once --- .../Pipeline/010_AssignToStackAction.cs | 54 ++++----- .../Pipeline/060_UpdateStatsAction.cs | 22 ++-- .../Pipeline/EventPipelineTests.cs | 103 +++++++++++++++--- 3 files changed, 114 insertions(+), 65 deletions(-) diff --git a/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs b/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs index 180cd30749..a601261b3a 100644 --- a/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs +++ b/src/Exceptionless.Core/Pipeline/010_AssignToStackAction.cs @@ -34,19 +34,9 @@ public AssignToStackAction(IStackRepository stackRepository, FormattingPluginMan public override async Task ProcessBatchAsync(ICollection contexts) { - var stacks = new Dictionary(); + var stacksBySignatureHash = new Dictionary(); var stacksById = new Dictionary(); - StackInfo TrackStack(Stack stack, bool isNew = false) - { - if (stacksById.TryGetValue(stack.Id, out var existing)) - return existing; - - var info = new StackInfo { IsNew = isNew, ShouldSave = false, Stack = stack }; - stacksById.Add(stack.Id, info); - return info; - } - foreach (var ctx in contexts) { if (String.IsNullOrEmpty(ctx.Event.StackId)) @@ -61,19 +51,13 @@ StackInfo TrackStack(Stack stack, bool isNew = false) string signatureHash = ctx.StackSignatureData.Values.ToSHA1(); ctx.SignatureHash = signatureHash; - if (stacks.TryGetValue(signatureHash, out var value)) + if (stacksBySignatureHash.TryGetValue(signatureHash, out var value)) { ctx.Stack = value.Stack; } else { ctx.Stack = await _stackRepository.GetStackBySignatureHashAsync(ctx.Event.ProjectId, signatureHash); - if (ctx.Stack is not null) - { - var info = TrackStack(ctx.Stack); - ctx.Stack = info.Stack; - stacks.Add(signatureHash, info); - } } // create new stack in distributed lock @@ -85,9 +69,7 @@ StackInfo TrackStack(Stack stack, bool isNew = false) var newStack = await _stackRepository.GetStackBySignatureHashAsync(ctx.Event.ProjectId, signatureHash); if (newStack is not null) { - var info = TrackStack(newStack); - ctx.Stack = info.Stack; - stacks.Add(signatureHash, info); + ctx.Stack = newStack; return; } @@ -115,8 +97,6 @@ StackInfo TrackStack(Stack stack, bool isNew = false) ctx.Stack = stack; await _stackRepository.AddAsync(stack, o => o.Cache()); - - stacks.Add(signatureHash, TrackStack(stack, isNew: true)); }, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10)); if (!success) @@ -128,14 +108,9 @@ StackInfo TrackStack(Stack stack, bool isNew = false) } else { - if (!stacksById.TryGetValue(ctx.Event.StackId, out var info)) - { - var stack = await _stackRepository.GetByIdAsync(ctx.Event.StackId, o => o.Cache()); - if (stack is not null) - info = TrackStack(stack); - } - - ctx.Stack = info?.Stack; + ctx.Stack = stacksById.TryGetValue(ctx.Event.StackId, out var existing) + ? existing.Stack + : await _stackRepository.GetByIdAsync(ctx.Event.StackId, o => o.Cache()); if (ctx.Stack is null || ctx.Stack.ProjectId != ctx.Event.ProjectId) { ctx.SetError("Invalid StackId."); @@ -143,9 +118,18 @@ StackInfo TrackStack(Stack stack, bool isNew = false) } ctx.SignatureHash = ctx.Stack.SignatureHash; - stacks[ctx.Stack.SignatureHash] = info!; } + // New stacks have an ID after AddAsync; share one instance per ID for the rest of the batch. + if (!stacksById.TryGetValue(ctx.Stack!.Id, out var stackInfo)) + { + stackInfo = new StackInfo { IsNew = ctx.IsNew, ShouldSave = false, Stack = ctx.Stack }; + stacksById.Add(ctx.Stack.Id, stackInfo); + } + + ctx.Stack = stackInfo.Stack; + stacksBySignatureHash[ctx.SignatureHash!] = stackInfo; + if (ctx.Stack!.Status == StackStatus.Discarded) { ctx.IsDiscarded = true; @@ -162,7 +146,7 @@ StackInfo TrackStack(Stack stack, bool isNew = false) ctx.Stack.Tags.AddRange(newTags); ctx.Stack.Tags.RemoveExcessTags(); - stacksById[ctx.Stack.Id].ShouldSave = true; + stackInfo.ShouldSave = true; } } @@ -200,10 +184,10 @@ public override Task ProcessAsync(EventContext ctx) return Task.CompletedTask; } - private record StackInfo + private sealed class StackInfo { public required bool IsNew { get; init; } public required bool ShouldSave { get; set; } - public required Stack Stack { get; set; } + public required Stack Stack { get; init; } } } diff --git a/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs b/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs index 34016b1733..e01c0eae32 100644 --- a/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs +++ b/src/Exceptionless.Core/Pipeline/060_UpdateStatsAction.cs @@ -39,22 +39,18 @@ private async Task IncrementEventCountersAsync(IGrouping s var maxDate = stackContexts.Max(s => s.Event.Date.UtcDateTime); await _stackService.IncrementStackUsageAsync(stackContexts[0].Event.OrganizationId, stackContexts[0].Event.ProjectId, stackGroup.Key, minDate, maxDate, count); - // Update stacks in memory since they are used in notifications. - int? updatedTotalOccurrences = null; - foreach (var ctx in stackContexts) - { - if (ctx.Stack is null) - continue; + // Contexts with the same stack ID share an instance; update it once for notifications. + var stack = stackContexts[0].Stack; + if (stack is null) + return; - if (ctx.Stack.FirstOccurrence > minDate) - ctx.Stack.FirstOccurrence = minDate; + if (stack.FirstOccurrence > minDate) + stack.FirstOccurrence = minDate; - if (ctx.Stack.LastOccurrence < maxDate) - ctx.Stack.LastOccurrence = maxDate; + if (stack.LastOccurrence < maxDate) + stack.LastOccurrence = maxDate; - updatedTotalOccurrences ??= ctx.Stack.TotalOccurrences + count; - ctx.Stack.TotalOccurrences = updatedTotalOccurrences.Value; - } + stack.TotalOccurrences += count; } catch (Exception ex) { diff --git a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs index c37c1e2a1f..bcff4fdc98 100644 --- a/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs +++ b/tests/Exceptionless.Tests/Pipeline/EventPipelineTests.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using System.Globalization; using System.Text; +using Exceptionless.Core; using Exceptionless.Core.Billing; using Exceptionless.Core.Extensions; using Exceptionless.Core.Models; @@ -9,18 +10,22 @@ using Exceptionless.Core.Pipeline; using Exceptionless.Core.Plugins.EventParser; using Exceptionless.Core.Plugins.EventProcessor; +using Exceptionless.Core.Plugins.Formatting; using Exceptionless.Core.Queues.Models; using Exceptionless.Core.Repositories; using Exceptionless.Core.Repositories.Configuration; using Exceptionless.Core.Utility; using Exceptionless.DateTimeExtensions; using Exceptionless.Tests.Utility; +using Foundatio.Lock; +using Foundatio.Messaging; using Foundatio.Queues; using Foundatio.Repositories; using Foundatio.Repositories.Extensions; using Foundatio.Serializer; using Foundatio.Storage; using McSherry.SemanticVersioning; +using Moq; using Xunit; using DataDictionary = Exceptionless.Core.Models.DataDictionary; @@ -730,21 +735,39 @@ public async Task RemoveTagsExceedingLimitsWhileKeepingKnownTags() Assert.Contains(Event.KnownTags.Critical, stack.Tags); } - [Fact] - public async Task EnsureSingleNewStackAsync() + [Theory] + [InlineData(1)] + [InlineData(2)] + public async Task RunAsync_NewStackBatch_AssignsAndReusesDistinctStackIds(int stackCount) { - string source = Guid.NewGuid().ToString(); - var contexts = new List { - new(new PersistentEvent { ProjectId = TestConstants.ProjectId, OrganizationId = TestConstants.OrganizationId, Message = "Test Sample", Source = source, Date = DateTime.UtcNow, Type = Event.KnownTypes.Log }, _organizationData.GenerateSampleOrganization(_billingManager, _plans), _projectData.GenerateSampleProject()), - new(new PersistentEvent { ProjectId = TestConstants.ProjectId, OrganizationId = TestConstants.OrganizationId, Message = "Test Sample", Source = source, Date = DateTime.UtcNow, Type = Event.KnownTypes.Log }, _organizationData.GenerateSampleOrganization(_billingManager, _plans), _projectData.GenerateSampleProject()), - }; + // Arrange + var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); + var project = _projectData.GenerateSampleProject(); + var utcNow = TimeProvider.GetUtcNow(); + var contexts = new List(); + for (int i = 0; i < stackCount; i++) + { + string source = Guid.NewGuid().ToString(); + contexts.AddRange(Enumerable.Range(0, 2).Select(_ => new EventContext( + _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, occurrenceDate: utcNow, generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source), organization, project))); + } + // Act await _pipeline.RunAsync(contexts); - Assert.True(contexts.All(c => !c.HasError)); - Assert.True(contexts.All(c => c.Stack?.Id == contexts.First().Stack?.Id)); - Assert.Equal(1, contexts.Count(c => c.IsNew)); - Assert.Equal(1, contexts.Count(c => !c.IsNew)); - Assert.Equal(2, contexts.Count(c => !c.IsRegression)); + + // Assert + Assert.All(contexts, context => Assert.False(context.HasError, context.ErrorMessage)); + Assert.All(contexts, context => Assert.True(context.IsProcessed)); + Assert.All(contexts, context => Assert.False(String.IsNullOrEmpty(context.Stack?.Id))); + Assert.Equal(stackCount, contexts.Select(context => context.Stack!.Id).Distinct().Count()); + Assert.Equal(stackCount, contexts.Count(context => context.IsNew)); + Assert.Equal(stackCount, contexts.Count(context => !context.IsNew)); + Assert.All(contexts, context => Assert.False(context.IsRegression)); + foreach (var stackContexts in contexts.GroupBy(context => context.Event.Source)) + { + Assert.Same(stackContexts.First().Stack, stackContexts.Last().Stack); + Assert.Equal(2, stackContexts.First().Stack!.TotalOccurrences); + } } [Fact] @@ -778,9 +801,11 @@ public async Task EnsureSingleGlobalErrorStackAsync() } [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task RunAsync_ExistingStackBatch_AggregatesTagsAndOccurrenceCounts(bool useExplicitStackId) + [InlineData(false, false)] + [InlineData(true, true)] + [InlineData(false, true)] + [InlineData(true, false)] + public async Task RunAsync_ExistingStackBatch_AggregatesTagsAndOccurrenceCounts(bool firstUsesExplicitStackId, bool secondUsesExplicitStackId) { // Arrange var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); @@ -792,9 +817,9 @@ public async Task RunAsync_ExistingStackBatch_AggregatesTagsAndOccurrenceCounts( var stackId = initialContext.Stack!.Id; await RefreshDataAsync(); - var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: useExplicitStackId ? stackId : null, occurrenceDate: utcNow.AddMinutes(-2), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: firstUsesExplicitStackId ? stackId : null, occurrenceDate: utcNow.AddMinutes(-2), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); firstEvent.Tags = new TagSet { "first-tag" }; - var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: useExplicitStackId ? stackId : null, occurrenceDate: utcNow.AddMinutes(-1), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, stackId: secondUsesExplicitStackId ? stackId : null, occurrenceDate: utcNow.AddMinutes(-1), generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); secondEvent.Tags = new TagSet { "second-tag" }; // Act @@ -812,6 +837,50 @@ public async Task RunAsync_ExistingStackBatch_AggregatesTagsAndOccurrenceCounts( Assert.Equal(new[] { "first-tag", "second-tag" }, savedStack.Tags.Order(StringComparer.Ordinal).ToArray()); } + [Fact] + public async Task ProcessBatchAsync_StackFoundInsideCreationLock_ReusesStackForRemainingEvents() + { + // Arrange + var organization = _organizationData.GenerateSampleOrganization(_billingManager, _plans); + var project = _projectData.GenerateSampleProject(); + var source = Guid.NewGuid().ToString(); + var signatureHash = new[] { Event.KnownTypes.Log, source }.ToSHA1(); + var stackData = GetService(); + var stack = stackData.GenerateStack(generateId: true, organizationId: organization.Id, projectId: project.Id, type: Event.KnownTypes.Log, signatureHash: signatureHash); + stack.Tags.Clear(); + await _stackRepository.AddAsync(stack, o => o.ImmediateConsistency().Cache()); + + int signatureReads = 0; + var repository = new Mock(MockBehavior.Strict); + repository.Setup(r => r.GetStackBySignatureHashAsync(project.Id, signatureHash)).Returns(() => + ++signatureReads == 1 ? Task.FromResult(null) : _stackRepository.GetByIdAsync(stack.Id, o => o.Cache())); + repository.Setup(r => r.SaveAsync(It.IsAny>(), It.IsAny>())) + .Returns((IEnumerable stacks, CommandOptionsDescriptor options) => _stackRepository.SaveAsync(stacks, options)); + + var formatting = GetService(); + var publisher = GetService(); + var options = GetService(); + var lockProvider = GetService(); + var action = new AssignToStackAction(repository.Object, formatting, publisher, options, lockProvider, Log); + var utcNow = TimeProvider.GetUtcNow(); + var firstEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, occurrenceDate: utcNow, generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + var secondEvent = _eventData.GenerateEvent(organizationId: organization.Id, projectId: project.Id, occurrenceDate: utcNow, generateTags: false, generateData: false, type: Event.KnownTypes.Log, source: source); + secondEvent.Tags = new TagSet { "second-tag" }; + var contexts = new[] { new EventContext(firstEvent, organization, project), new EventContext(secondEvent, organization, project) }; + + // Act + await action.ProcessBatchAsync(contexts); + + // Assert + Assert.All(contexts, context => Assert.False(context.HasError, context.ErrorMessage)); + Assert.All(contexts, context => Assert.False(context.IsNew)); + Assert.All(contexts, context => Assert.Equal(stack.Id, context.Event.StackId)); + Assert.Same(contexts[0].Stack, contexts[1].Stack); + Assert.Equal(2, signatureReads); + var savedStack = await _stackRepository.GetByIdAsync(stack.Id, o => o.Cache()); + Assert.Contains("second-tag", savedStack!.Tags); + } + [Fact] public async Task RunAsync_DifferentStackIdsWithSameSignature_PreservesBothStacks() { From bda7feceea0b86eaa0d49205223f844a9f872b1f Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Mon, 16 Nov 2026 21:11:16 -0600 Subject: [PATCH 14/14] Update the shared stack regression status once --- .../Pipeline/030_CheckForRegressionAction.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs index 8032f412c6..bdb0d7b1d7 100644 --- a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs +++ b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs @@ -76,12 +76,10 @@ public override async Task ProcessBatchAsync(ICollection contexts) _logger.LogDebug("Marking stack and events as regressed in version: {Version}", regressedVersion); await _stackRepository.MarkAsRegressedAsync(stack.Id); + stack.Status = StackStatus.Regressed; foreach (var ctx in stackGroup) - { - ctx.Stack!.Status = StackStatus.Regressed; ctx.IsRegression = ctx == regressedContext; - } } catch (Exception ex) {