@cap-js-community/event-queue 1.9.0-beta.0 → 1.9.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.9.0-beta.0",
+  "version": "1.9.0-beta.2",
   "description": "An event queue that enables secure transactional processing of asynchronous and periodic events, featuring instant event processing with Redis Pub/Sub and load distribution across all application instances.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/EventQueueProcessorBase.js

@@ -852,7 +852,7 @@ class EventQueueProcessorBase {
   // eslint-disable-next-line no-unused-vars
   async beforeProcessingEvents() {}
 
-  async isOutdatedAndKeepalive() {
+  async isOutdatedAndKeepAlive() {
     if (this.__keepAliveViolated) {
       return true;
     }

package/src/config.js

@@ -18,7 +18,7 @@ const MIN_INTERVAL_SEC = 10;
 const DEFAULT_LOAD = 1;
 const DEFAULT_PRIORITY = Priorities.Medium;
 const DEFAULT_INCREASE_PRIORITY = true;
-const DEFAULT_KEEP_ALIVE_INTERVAL_MIN = 1;
+const DEFAULT_KEEP_ALIVE_INTERVAL = 60;
 const DEFAULT_MAX_FACTOR_STUCK_2_KEEP_ALIVE_INTERVAL = 3.5;
 const SUFFIX_PERIODIC = "_PERIODIC";
 const COMMAND_BLOCK = "EVENT_QUEUE_EVENT_BLOCK";
@@ -386,7 +386,7 @@ class Config {
     event.load = event.load ?? DEFAULT_LOAD;
     event.priority = event.priority ?? DEFAULT_PRIORITY;
     event.increasePriorityOverTime = event.increasePriorityOverTime ?? DEFAULT_INCREASE_PRIORITY;
-    event.keepAliveInterval = (event.keepAliveInterval ?? DEFAULT_KEEP_ALIVE_INTERVAL_MIN) * 60 * 1000;
+    event.keepAliveInterval = (event.keepAliveInterval ?? DEFAULT_KEEP_ALIVE_INTERVAL) * 1000;
     event.keepAliveMaxInProgressTime = event.keepAliveInterval * DEFAULT_MAX_FACTOR_STUCK_2_KEEP_ALIVE_INTERVAL;
   }
 

package/src/processEventQueue.js

@@ -159,6 +159,7 @@ const processPeriodicEvent = async (context, eventTypeInstance) => {
         `eventQueue-periodic-process-${eventTypeInstance.eventType}##${eventTypeInstance.eventSubType}`,
         async (tx) => {
           await trace(eventTypeInstance.context, "process-periodic-event", async () => {
+            eventTypeInstance.continuesKeepAlive();
             eventTypeInstance.processEventContext = tx.context;
             eventTypeInstance.setTxForEventProcessing(queueEntry.ID, cds.tx(tx.context));
             try {
@@ -170,6 +171,7 @@ const processPeriodicEvent = async (context, eventTypeInstance) => {
               await tx.rollback();
               return;
             } finally {
+              eventTypeInstance.stopKeepAlive();
               eventTypeInstance.endPerformanceTracerPeriodicEvents();
             }
             if (
@@ -198,6 +200,8 @@ const processPeriodicEvent = async (context, eventTypeInstance) => {
       eventType: eventTypeInstance?.eventType,
       eventSubType: eventTypeInstance?.eventSubType,
     });
+  } finally {
+    await eventTypeInstance.keepAlivePromise;
   }
 };
 
@@ -314,7 +318,7 @@ const _checkEventIsBlocked = async (baseInstance) => {
 
 const _processEvent = async (eventTypeInstance, processContext, key, queueEntries, payload) => {
   try {
-    const eventOutdated = await eventTypeInstance.isOutdatedAndKeepalive(queueEntries);
+    const eventOutdated = await eventTypeInstance.isOutdatedAndKeepAlive(queueEntries);
     if (eventOutdated) {
       // NOTE: return empty status map to comply with the interface
       return {};

package/src/shared/openTelemetry.js

@@ -13,11 +13,14 @@ const config = require("../config");
 const COMPONENT_NAME = "/shared/openTelemetry";
 
 const trace = async (context, label, fn, { attributes = {}, newRootSpan = false } = {}) => {
-  if (!config.enableCAPTelemetry || !otel || !cds._telemetry?.tracer) {
+  const tracerProvider = otel?.trace.getTracerProvider();
+  // Check if a real provider is registered
+  if (!config.enableCAPTelemetry || !tracerProvider || tracerProvider === otel.trace.NOOP_TRACER_PROVIDER) {
     return fn();
   }
 
-  const span = cds._telemetry.tracer.startSpan(`eventqueue-${label}`, {
+  const tracer = otel.trace.getTracer("eventqueue");
+  const span = tracer.startSpan(`eventqueue-${label}`, {
     kind: otel.SpanKind.INTERNAL,
     root: newRootSpan,
   });