Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

debug: extending sessions

Carl-Gerhard Lindesvärde149dad35070
diff --git a/apps/worker/src/jobs/events.incoming-event.ts b/apps/worker/src/jobs/events.incoming-event.ts
index 30a49f379..3a3ec1823 100644
--- a/apps/worker/src/jobs/events.incoming-event.ts
+++ b/apps/worker/src/jobs/events.incoming-event.ts
@@ -218,8 +218,7 @@ export async function incomingEvent(
projectId,
deviceId,
}).catch((error) => {
- logger.error('Error finding and extending session end job', { error });
- throw error;
+ logger.warn('Failed to extend session end job', { error });
});
} else {
await createEventAndNotify(
diff --git a/apps/worker/src/utils/session-handler.ts b/apps/worker/src/utils/session-handler.ts
index 84a891f5a..119f59477 100644
--- a/apps/worker/src/utils/session-handler.ts
+++ b/apps/worker/src/utils/session-handler.ts
@@ -1,6 +1,7 @@
import type { IServiceCreateEventPayload } from '@openpanel/db';
import { sessionsQueue } from '@openpanel/queue';
import { LRUCache } from '@openpanel/redis';
+import { logger as baseLogger } from '@/utils/logger';
export const SESSION_TIMEOUT = 1000 * 60 * 30;
@@ -34,8 +35,32 @@ export async function extendSessionEndJob({
return;
}
- await job.changeDelay(SESSION_TIMEOUT);
- CHANGE_DELAY_THROTTLE_MAP.set(`${projectId}:${deviceId}`, Date.now());
+ const state = await job.getState();
+ if (state !== 'delayed') {
+ baseLogger.warn(
+ 'Session end job is not in delayed state, skipping extend',
+ {
+ jobId,
+ state,
+ }
+ );
+ return;
+ }
+
+ // Narrow TOCTOU window: state could flip from delayed → waiting between
+ // the getState() check above and this call.
+ try {
+ await job.changeDelay(SESSION_TIMEOUT);
+ CHANGE_DELAY_THROTTLE_MAP.set(`${projectId}:${deviceId}`, Date.now());
+ } catch (error) {
+ baseLogger.warn(
+ 'Session end job moved out of delayed state during extend',
+ {
+ jobId,
+ error,
+ }
+ );
+ }
}
const getSessionEndJobId = (projectId: string, deviceId: string) =>