fix: queue info with optimized queue runner (#405)

Co-authored-by: D045778 <johannes.vogel@sap.com>
Co-authored-by: Johannes Vogel <31311694+johannes-vogel@users.noreply.github.com>

Author: sjvans

lib/metrics/queue.js

@@ -9,33 +9,25 @@ const PERSISTENT_QUEUE_DB_NAME = 'cds.outbox.Messages'
 async function collectLatestQueueInfo(queueEntity, serviceName, maxAttempts) {
   const coldEntriesRow = await SELECT.one
     .columns([{ func: 'count', args: [{ val: 1 }], as: 'cold_count' }])
-    .from(queueEntity)
-    .where({
-      target: serviceName,
-      attempts: { '>=': maxAttempts }
-    })
+    .from(queueEntity).where`target = ${serviceName} or contains(msg, ${'"service":"' + serviceName})`.where({
+    attempts: { '>=': maxAttempts }
+  })
 
   const remaingEntriesInfoRow = await SELECT.one
     .columns([
       { func: 'count', args: [{ val: 1 }], as: 'remaining_count' },
       { func: 'min', args: [{ ref: ['timestamp'] }], as: 'min_timestamp' },
       { func: 'max', args: [{ ref: ['timestamp'] }], as: 'max_timestamp' }
     ])
-    .from(queueEntity)
-    .where({
-      target: serviceName,
-      attempts: { '<': maxAttempts }
-    })
+    .from(queueEntity).where`target = ${serviceName} or contains(msg, ${'"service":"' + serviceName})`.where({
+    attempts: { '<': maxAttempts }
+  })
 
   const remainingEntries = remaingEntriesInfoRow?.['remaining_count'] ?? 0
 
-  const medianStorageTimeRow = await SELECT.one
-    .columns([{ ref: ['timestamp'], as: 'med_timestamp' }])
-    .from(queueEntity)
-    .where({
-      target: serviceName,
-      attempts: { '<': maxAttempts }
-    })
+  const medianStorageTimeRow = await SELECT.one.columns([{ ref: ['timestamp'], as: 'med_timestamp' }]).from(queueEntity)
+    .where`target = ${serviceName} or contains(msg, ${'"service":"' + serviceName})`
+    .where({ attempts: { '<': maxAttempts } })
     .orderBy({ ref: ['timestamp'], sort: 'asc' })
     .limit(1, Math.floor(remainingEntries / 2))