rename maxRetries to maxAttempts

Author: ericallam

apps/webapp/app/v3/runEngine.server.ts

@@ -78,7 +78,7 @@ function createRunEngine() {
       duration: env.RUN_ENGINE_RUN_LOCK_DURATION,
       automaticExtensionThreshold: env.RUN_ENGINE_RUN_LOCK_AUTOMATIC_EXTENSION_THRESHOLD,
       retryConfig: {
-        maxRetries: env.RUN_ENGINE_RUN_LOCK_MAX_RETRIES,
+        maxAttempts: env.RUN_ENGINE_RUN_LOCK_MAX_RETRIES,
         baseDelay: env.RUN_ENGINE_RUN_LOCK_BASE_DELAY,
         maxDelay: env.RUN_ENGINE_RUN_LOCK_MAX_DELAY,
         backoffMultiplier: env.RUN_ENGINE_RUN_LOCK_BACKOFF_MULTIPLIER,

internal-packages/run-engine/src/engine/index.ts

@@ -101,7 +101,7 @@ export class RunEngine {
       duration: options.runLock.duration ?? 5000,
       automaticExtensionThreshold: options.runLock.automaticExtensionThreshold ?? 1000,
       retryConfig: {
-        maxRetries: 10,
+        maxAttempts: 10,
         baseDelay: 100,
         maxDelay: 3000,
         backoffMultiplier: 1.8,

internal-packages/run-engine/src/engine/locking.ts

@@ -52,8 +52,8 @@ interface ManualLockContext {
 }
 
 export interface LockRetryConfig {
-  /** Maximum number of retry attempts (default: 10) */
-  maxRetries?: number;
+  /** Maximum number of locking attempts (default: 10) */
+  maxAttempts?: number;
   /** Initial delay in milliseconds (default: 200) */
   baseDelay?: number;
   /** Maximum delay cap in milliseconds (default: 5000) */
@@ -102,7 +102,7 @@ export class RunLocker {
 
     // Initialize retry configuration with defaults
     this.retryConfig = {
-      maxRetries: options.retryConfig?.maxRetries ?? 10,
+      maxAttempts: options.retryConfig?.maxAttempts ?? 10,
       baseDelay: options.retryConfig?.baseDelay ?? 200,
       maxDelay: options.retryConfig?.maxDelay ?? 5000,
       backoffMultiplier: options.retryConfig?.backoffMultiplier ?? 1.5,
@@ -206,7 +206,7 @@ export class RunLocker {
     const joinedResources = sortedResources.join(",");
 
     // Use configured retry settings with exponential backoff
-    const { maxRetries, baseDelay, maxDelay, backoffMultiplier, jitterFactor, maxTotalWaitTime } =
+    const { maxAttempts, baseDelay, maxDelay, backoffMultiplier, jitterFactor, maxTotalWaitTime } =
       this.retryConfig;
 
     // Track timing for total wait time limit
@@ -216,7 +216,7 @@ export class RunLocker {
     let lock: redlock.Lock | undefined;
     let lastError: Error | undefined;
 
-    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    for (let attempt = 0; attempt <= maxAttempts; attempt++) {
       const [error, acquiredLock] = await tryCatch(this.redlock.acquire(sortedResources, duration));
 
       if (!error && acquiredLock) {
@@ -254,7 +254,7 @@ export class RunLocker {
       }
 
       // If this is the last attempt, throw timeout error
-      if (attempt === maxRetries) {
+      if (attempt === maxAttempts) {
         this.logger.warn("[RunLocker] Lock acquisition exhausted all retries", {
           name,
           resources: sortedResources,
@@ -320,14 +320,14 @@ export class RunLocker {
       this.logger.error("[RunLocker] Lock was not acquired despite completing retry loop", {
         name,
         resources: sortedResources,
-        maxRetries,
+        maxAttempts,
         totalWaitTime: Math.round(totalWaitTime),
         lastError: lastError?.message,
       });
       throw new LockAcquisitionTimeoutError(
         sortedResources,
         Math.round(totalWaitTime),
-        maxRetries + 1,
+        maxAttempts + 1,
         `Lock acquisition on resources [${sortedResources.join(", ")}] failed unexpectedly`
       );
     }

internal-packages/run-engine/src/engine/tests/locking.test.ts

@@ -115,7 +115,7 @@ describe("RunLocker", () => {
       logger,
       tracer: trace.getTracer("RunLockTest"),
       retryConfig: {
-        maxRetries: 3,
+        maxAttempts: 3,
         baseDelay: 100,
         maxTotalWaitTime: 2000, // 2 second timeout for faster test
       },
@@ -246,7 +246,7 @@ describe("RunLocker", () => {
         logger,
         tracer: trace.getTracer("RunLockTest"),
         retryConfig: {
-          maxRetries: 2,
+          maxAttempts: 2,
           baseDelay: 50,
           maxDelay: 200,
           backoffMultiplier: 2.0,
@@ -258,7 +258,7 @@ describe("RunLocker", () => {
       try {
         // Verify configuration is set correctly
         const config = runLock.getRetryConfig();
-        expect(config.maxRetries).toBe(2);
+        expect(config.maxAttempts).toBe(2);
         expect(config.baseDelay).toBe(50);
         expect(config.maxDelay).toBe(200);
         expect(config.backoffMultiplier).toBe(2.0);
@@ -288,7 +288,7 @@ describe("RunLocker", () => {
         logger,
         tracer: trace.getTracer("RunLockTest"),
         retryConfig: {
-          maxRetries: 2,
+          maxAttempts: 2,
           baseDelay: 50,
           maxTotalWaitTime: 500, // Shorter timeout to ensure failure
         },
@@ -315,7 +315,7 @@ describe("RunLocker", () => {
           if (error instanceof LockAcquisitionTimeoutError) {
             expect(error.resources).toEqual(["test-error"]);
             expect(error.attempts).toBeGreaterThan(0);
-            expect(error.attempts).toBeLessThanOrEqual(3); // maxRetries + 1
+            expect(error.attempts).toBeLessThanOrEqual(3); // maxAttempts + 1
             expect(error.totalWaitTime).toBeGreaterThan(0);
             expect(error.totalWaitTime).toBeLessThanOrEqual(800); // Some tolerance
             expect(error.name).toBe("LockAcquisitionTimeoutError");
@@ -344,7 +344,7 @@ describe("RunLocker", () => {
 
     try {
       const config = runLock.getRetryConfig();
-      expect(config.maxRetries).toBe(10);
+      expect(config.maxAttempts).toBe(10);
       expect(config.baseDelay).toBe(200);
       expect(config.maxDelay).toBe(5000);
       expect(config.backoffMultiplier).toBe(1.5);
@@ -371,15 +371,15 @@ describe("RunLocker", () => {
         logger,
         tracer: trace.getTracer("RunLockTest"),
         retryConfig: {
-          maxRetries: 5,
+          maxAttempts: 5,
           maxTotalWaitTime: 10000,
           // Other values should use defaults
         },
       });
 
       try {
         const config = runLock.getRetryConfig();
-        expect(config.maxRetries).toBe(5); // Overridden
+        expect(config.maxAttempts).toBe(5); // Overridden
         expect(config.maxTotalWaitTime).toBe(10000); // Overridden
         expect(config.baseDelay).toBe(200); // Default
         expect(config.maxDelay).toBe(5000); // Default
@@ -643,7 +643,7 @@ describe("RunLocker", () => {
       duration: 3000,
       automaticExtensionThreshold: 300,
       retryConfig: {
-        maxRetries: 5,
+        maxAttempts: 5,
         baseDelay: 150,
       },
     });
@@ -654,7 +654,7 @@ describe("RunLocker", () => {
       expect(runLock.getAutomaticExtensionThreshold()).toBe(300);
 
       const retryConfig = runLock.getRetryConfig();
-      expect(retryConfig.maxRetries).toBe(5);
+      expect(retryConfig.maxAttempts).toBe(5);
       expect(retryConfig.baseDelay).toBe(150);
 
       // Test basic functionality with all custom configs
@@ -681,7 +681,7 @@ describe("RunLocker", () => {
         duration: 10000,
         automaticExtensionThreshold: 2000,
         retryConfig: {
-          maxRetries: 15,
+          maxAttempts: 15,
           baseDelay: 100,
           maxDelay: 3000,
           backoffMultiplier: 1.8,
@@ -696,7 +696,7 @@ describe("RunLocker", () => {
         expect(runLock.getAutomaticExtensionThreshold()).toBe(2000);
 
         const retryConfig = runLock.getRetryConfig();
-        expect(retryConfig.maxRetries).toBe(15);
+        expect(retryConfig.maxAttempts).toBe(15);
         expect(retryConfig.baseDelay).toBe(100);
         expect(retryConfig.maxDelay).toBe(3000);
         expect(retryConfig.backoffMultiplier).toBe(1.8);
@@ -722,22 +722,22 @@ describe("RunLocker", () => {
   redisTest("Test configuration edge cases", { timeout: 15_000 }, async ({ redisOptions }) => {
     const logger = new Logger("RunLockTest", "debug");
 
-    // Test with maxRetries = 0
+    // Test with maxAttempts = 0
     const redis1 = createRedisClient(redisOptions);
     const runLock1 = new RunLocker({
       redis: redis1,
       logger,
       tracer: trace.getTracer("RunLockTest"),
       retryConfig: {
-        maxRetries: 0,
+        maxAttempts: 0,
         baseDelay: 100,
         maxTotalWaitTime: 1000,
       },
     });
 
     try {
       const config = runLock1.getRetryConfig();
-      expect(config.maxRetries).toBe(0);
+      expect(config.maxAttempts).toBe(0);
 
       // Should work for successful acquisitions
       await runLock1.lock("test-lock", ["test-edge"], async () => {
@@ -754,7 +754,7 @@ describe("RunLocker", () => {
       logger,
       tracer: trace.getTracer("RunLockTest"),
       retryConfig: {
-        maxRetries: 2,
+        maxAttempts: 2,
         baseDelay: 1,
         maxDelay: 10,
         backoffMultiplier: 2.0,
@@ -785,7 +785,7 @@ describe("RunLocker", () => {
       logger,
       tracer: trace.getTracer("RunLockTest"),
       retryConfig: {
-        maxRetries: 100, // High retry count
+        maxAttempts: 100, // High retry count
         baseDelay: 100,
         maxTotalWaitTime: 500, // But low total wait time
       },
@@ -794,7 +794,7 @@ describe("RunLocker", () => {
     try {
       // Test that total wait time configuration is properly applied
       const config = runLock.getRetryConfig();
-      expect(config.maxRetries).toBe(100);
+      expect(config.maxAttempts).toBe(100);
       expect(config.maxTotalWaitTime).toBe(500);
       expect(config.baseDelay).toBe(100);
 
@@ -946,7 +946,7 @@ describe("RunLocker", () => {
         tracer: trace.getTracer("RunLockTest"),
         duration: 30000,
         retryConfig: {
-          maxRetries: 3,
+          maxAttempts: 3,
           baseDelay: 100,
           maxDelay: 500,
           backoffMultiplier: 2.0,