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
1 change: 0 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe("initializeExecutionContext", () => {
durableExecutionClient: mockDurableExecutionClient,
_stepData: {},
terminationManager: expect.any(Object),
activeOperationsTracker: expect.any(Object),

durableExecutionArn: mockDurableExecutionArn,
pendingCompletions: expect.any(Set),
getStepData: expect.any(Function),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { log } from "../../utils/logger/logger";
import { getStepData as getStepDataUtil } from "../../utils/step-id-utils/step-id-utils";
import { createDefaultLogger } from "../../utils/logger/default-logger";
import { ActiveOperationsTracker } from "../../utils/termination-helper/active-operations-tracker";

import { Context } from "aws-lambda";
import { DurableExecutionApiClient } from "../../durable-execution-api-client/durable-execution-api-client";
import { DurableExecutionInvocationInputWithClient } from "../../utils/durable-execution-invocation-input/durable-execution-invocation-input";
Expand Down Expand Up @@ -84,7 +84,7 @@ export const initializeExecutionContext = async (
durableExecutionClient,
_stepData: stepData,
terminationManager: new TerminationManager(),
activeOperationsTracker: new ActiveOperationsTracker(),

durableExecutionArn,
pendingCompletions: new Set<string>(),
getStepData(stepId: string): Operation | undefined {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const createCheckpoint = (
{},
context.durableExecutionClient,
context.terminationManager,
undefined,
token,
emitter,
logger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export const createTestCheckpointManager = (
context._stepData,
context.durableExecutionClient,
context.terminationManager,
context.activeOperationsTracker,
checkpointToken,
emitter,
logger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export function createTestDurableContext(options?: {
},
requestId: "mock-request-id",
tenantId: undefined,
activeOperationsTracker: undefined,
};

const mockLambdaContext: Context = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export class MockCheckpointManager extends CheckpointManager {
{},
{} as DurableExecutionClient,
{} as TerminationManager,
undefined,
"mock-token",
{} as EventEmitter,
{} as DurableLogger,
Expand Down
3 changes: 1 addition & 2 deletions packages/aws-durable-execution-sdk-js/src/types/core.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { TerminationManager } from "../termination-manager/termination-manager";
import { DurableExecutionClient } from "./durable-execution";
import { ErrorObject, Operation } from "@aws-sdk/client-lambda";
import { ActiveOperationsTracker } from "../utils/termination-helper/active-operations-tracker";

/**
* @internal
Expand Down Expand Up @@ -323,7 +322,7 @@ export interface ExecutionContext {
_stepData: Record<string, Operation>; // Private, use getStepData() instead
terminationManager: TerminationManager;
durableExecutionArn: string;
activeOperationsTracker?: ActiveOperationsTracker;

requestId: string;
tenantId: string | undefined;
pendingCompletions: Set<string>; // Track stepIds with pending SUCCEED/FAIL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ describe("CheckpointManager - Centralized Termination", () => {
{},
mockClient,
mockTerminationManager,
undefined,
"test-token",
mockStepDataEmitter,
{} as any,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ describe("Checkpoint Integration Tests", () => {
{},
mockState,
{ terminate: jest.fn() } as any,
undefined,
TEST_CONSTANTS.CHECKPOINT_TOKEN,
mockEmitter,
mockLogger,
Expand Down Expand Up @@ -90,7 +89,6 @@ describe("Checkpoint Integration Tests", () => {
{},
mockState,
{ terminate: jest.fn() } as any,
undefined,
TEST_CONSTANTS.CHECKPOINT_TOKEN,
mockEmitter,
mockLogger,
Expand Down Expand Up @@ -177,7 +175,6 @@ describe("Checkpoint Integration Tests", () => {
{},
mockState,
{ terminate: jest.fn() } as any,
undefined,
TEST_CONSTANTS.CHECKPOINT_TOKEN,
mockEmitter,
mockLogger,
Expand Down Expand Up @@ -217,7 +214,6 @@ describe("Checkpoint Integration Tests", () => {
{},
mockState,
{ terminate: jest.fn() } as any,
undefined,
TEST_CONSTANTS.CHECKPOINT_TOKEN,
mockEmitter,
mockLogger,
Expand Down Expand Up @@ -270,7 +266,6 @@ describe("Checkpoint Integration Tests", () => {
{},
mockState,
{ terminate: jest.fn() } as any,
undefined,
TEST_CONSTANTS.CHECKPOINT_TOKEN,
mockEmitter,
mockLogger,
Expand All @@ -284,7 +279,6 @@ describe("Checkpoint Integration Tests", () => {
{},
mockState2,
{ terminate: jest.fn() } as any,
undefined,
TEST_CONSTANTS.CHECKPOINT_TOKEN,
mockEmitter,
mockLogger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ interface QueuedCheckpoint {
reject: (error: Error) => void;
}

interface ActiveOperationsTracker {
increment(): void;
decrement(): void;
}

export class CheckpointManager implements Checkpoint {
private queue: QueuedCheckpoint[] = [];
private isProcessing = false;
Expand Down Expand Up @@ -64,7 +59,6 @@ export class CheckpointManager implements Checkpoint {
private stepData: Record<string, Operation>,
private storage: DurableExecutionClient,
private terminationManager: TerminationManager,
private activeOperationsTracker: ActiveOperationsTracker | undefined,
initialTaskToken: string,
private stepDataEmitter: EventEmitter,
private logger: DurableLogger,
Expand Down Expand Up @@ -154,10 +148,6 @@ export class CheckpointManager implements Checkpoint {
return new Promise(() => {}); // Never resolves during termination
}

if (this.activeOperationsTracker) {
this.activeOperationsTracker.increment();
}

return new Promise<void>((resolve, reject) => {
if (
data.Action === OperationAction.SUCCEED ||
Expand All @@ -170,15 +160,9 @@ export class CheckpointManager implements Checkpoint {
stepId,
data,
resolve: () => {
if (this.activeOperationsTracker) {
this.activeOperationsTracker.decrement();
}
resolve();
},
reject: (error: Error) => {
if (this.activeOperationsTracker) {
this.activeOperationsTracker.decrement();
}
reject(error);
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ describe("CheckpointManager Queue Completion", () => {
mockContext._stepData,
mockContext.state,
mockTerminationManager,
undefined,
"test-token",
mockEmitter,
mockLogger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const createCheckpoint = (
context._stepData,
context.durableExecutionClient,
context.terminationManager,
undefined,
token,
emitter,
logger,
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading