diff --git a/src/server/admin-log-investigation.ts b/src/server/admin-log-investigation.ts index 8a753d3..a7f2fb6 100644 --- a/src/server/admin-log-investigation.ts +++ b/src/server/admin-log-investigation.ts @@ -172,7 +172,7 @@ export async function investigateLogs(options: Options, correlation = false) { rows(base, `${filter} | sort by (_time) desc`, 1001, controller.signal), rows(base, '_time:5m (event:process_heartbeat OR event:queue_heartbeat OR event:job_completed OR event:job_failed) | sort by (_time) desc', 501, controller.signal), collector(controller.signal), - compareRelease ? rows(base, `_time:[${baselineStart}, ${options.start}) (severity:error OR severity:warn OR (service:nginx event:edge_request status:>=500 status:<600))${options.service ? ` service:${options.service}` : ""} NOT release:${options.release} NOT release:unknown NOT release:"" | sort by (_time) desc`, 1001, controller.signal) : Promise.resolve(undefined), + compareRelease ? rows(base, `_time:[${baselineStart}, ${options.start}) (severity:error OR severity:warn OR (service:nginx event:edge_request status:>=500 status:<600))${options.service ? ` service:${options.service}` : ""} NOT release:${options.release} NOT release:unknown NOT release:"" | sort by (_time) desc`, 1001, controller.signal).catch(() => ({ records: [], partial: true })) : Promise.resolve(undefined), ]); const latest = new Map(); for (const row of heartbeat.records) { diff --git a/test/admin-log-investigation.test.js b/test/admin-log-investigation.test.js index 0bbb002..ce24e61 100644 --- a/test/admin-log-investigation.test.js +++ b/test/admin-log-investigation.test.js @@ -40,6 +40,22 @@ describe('bounded admin log investigation', function () { expect(calls[0][1].body.get('limit')).to.equal('1001'); expect(calls[0][1].body.get('query')).to.include('service:worker release:abcdef1'); }); + for (const failure of ['oversized', 'unavailable']) it(`keeps current incidents when the optional baseline is ${failure}`, async () => { + process.env.ADMIN_LOG_URL = 'http://logging.test'; + global.fetch = async (url, options) => { + const query=options.body.get('query'); + if (query.includes('NOT release:')) { + if (failure === 'unavailable') throw new Error('backend unavailable'); + return new Response((JSON.stringify(event({release:'abcdef2'}))+'\n').repeat(10000)); + } + return new Response(query.includes('severity:error') ? JSON.stringify(event({})) : ''); + }; + const result=await investigateLogs(logOptions({release:'abcdef1'})); + expect(result.state).equal('stale'); + expect(result.groups).length(1); + expect(result.groups[0]).include({count:1,regression:'unknown'}); + expect(result.baseline).include({partial:true,captured:0}); + }); it('sanitizes legacy Redis history and does not invent correlation IDs', () => { const row = logContext.run({requestId:id}, () => safeRedisLog({ts:new Date().toISOString(),level:'error',module:'route',message:'secret',raw:[{message:'invalid_request',url:'private',stack:'secret',cookies:'secret',status:400}]})); expect(row.message).to.equal('invalid_request'); expect(JSON.stringify(row)).not.to.match(/private|secret|requestId/);