Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 3.8k
chore(logging): remove redis-progress-markers feature flag#5287
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -4,7 +4,6 @@ import { createLogger } from '@sim/logger' | ||
| import { describeError, toError } from '@sim/utils/errors' | ||
| import { and, eq, sql } from 'drizzle-orm' | ||
| import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' | ||
| import { isFeatureEnabled } from '@/lib/core/config/feature-flags' | ||
| import { isRetryableInfrastructureError } from '@/lib/core/errors/retryable-infrastructure' | ||
| import { executionLogger } from '@/lib/logs/execution/logger' | ||
| import { | ||
| @@ -136,13 +135,6 @@ export class LoggingSession { | ||
| private workflowState?: WorkflowState | ||
| private correlation?: NonNullable<ExecutionTrigger['data']>['correlation'] | ||
| private isResume = false | ||
| /** | ||
| * Whether per-block progress markers go to Redis (vs jsonb_set UPDATEs on the | ||
| * log row). Resolved once in {@link start} and cached so an execution never | ||
| * mixes write paths across its block callbacks. Defaults to the legacy SQL | ||
| * path until resolved. | ||
| */ | ||
| private useRedisMarkers = false | ||
| private completed = false | ||
| /** Synchronous flag to prevent concurrent completion attempts (race condition guard) */ | ||
| private completing = false | ||
| @@ -182,24 +174,12 @@ export class LoggingSession { | ||
| } | ||
| /** | ||
| * Resolve the per-block marker write path (Redis vs jsonb_set UPDATE) for this | ||
| * session. Defaults to the legacy SQL path if flag resolution fails. | ||
| */ | ||
| private async resolveRedisMarkerMode(): Promise<boolean> { | ||
| try { | ||
| return await isFeatureEnabled('redis-progress-markers') | ||
| } catch { | ||
| return false | ||
| } | ||
| } | ||
| /** | ||
| * Persist the last-started-block marker. Redis is the primary path when the | ||
| * flag is on; falls back to the durable jsonb_set UPDATE when Redis is | ||
| * unavailable or the write fails, so a marker is never dropped. | ||
| * Persist the last-started-block marker. Redis is the primary path; falls back | ||
| * to the durable jsonb_set UPDATE when Redis is unavailable or the write fails, | ||
| * so a marker is never dropped. | ||
| */ | ||
| private async persistLastStartedBlock(marker: ExecutionLastStartedBlock): Promise<void> { | ||
| if (this.useRedisMarkers && (await setLastStartedBlock(this.executionId, marker))) { | ||
| if (await setLastStartedBlock(this.executionId, marker)) { | ||
| return | ||
| } | ||
| try { | ||
| @@ -220,12 +200,12 @@ export class LoggingSession { | ||
| } | ||
| /** | ||
| * Persist the last-completed-block marker. Redis is the primary path when the | ||
| * flag is on; falls back to the durable jsonb_set UPDATE when Redis is | ||
| * unavailable or the write fails, so a marker is never dropped. | ||
| * Persist the last-completed-block marker. Redis is the primary path; falls | ||
| * back to the durable jsonb_set UPDATE when Redis is unavailable or the write | ||
| * fails, so a marker is never dropped. | ||
| */ | ||
| private async persistLastCompletedBlock(marker: ExecutionLastCompletedBlock): Promise<void> { | ||
| if (this.useRedisMarkers && (await setLastCompletedBlock(this.executionId, marker))) { | ||
| if (await setLastCompletedBlock(this.executionId, marker)) { | ||
| return | ||
| } | ||
| try { | ||
| @@ -308,7 +288,6 @@ export class LoggingSession { | ||
| isResume: this.isResume, | ||
waleedlatif1 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. waleedlatif1 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| level: params.level, | ||
| status: params.status, | ||
| readProgressMarkers: this.useRedisMarkers, | ||
| }) | ||
| // Release the admission reservation from preprocessing. Skipped on pause: a | ||
| @@ -356,8 +335,6 @@ export class LoggingSession { | ||
| } = params | ||
| try { | ||
| this.useRedisMarkers = await this.resolveRedisMarkerMode() | ||
| this.trigger = createTriggerObject(this.triggerType, triggerData) | ||
| this.correlation = triggerData?.correlation | ||
| this.environment = createEnvironmentObject( | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.