Rsclub2_2/kst4contest
1
0
Fork 0
mirror of https://github.com/praktimarc/kst4contest.git synced 2026-09-16 06:05:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Align private metrics with GoAccess request panel

Browse Source
This commit is contained in:
Marc Froehlich
2026-09-14 23:01:06 +02:00
parent 89422d18ad
commit a8f12876ec
3 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/test/analytics-generator.test.js
+23 -3
View File
@@ -153,7 +153,10 @@ function fakeGoAccess(reports, calls, failureId) {
const sourceLines = fs.readFileSync(invocation.args[0], "utf8").trim().split(/\r?\n/);
invocation.inputLines = sourceLines;
const lines = invocation.metricKind === "websiteClassifier"
? sourceLines.filter(line => !line.includes("UnknownScanner/1.0"))
? sourceLines.filter(line => {
const fields = line.split("\t");
return fields[6] !== "404" && !line.includes("UnknownScanner/1.0");
})
: sourceLines;
const paths = {};
for (const line of lines) {
@@ -196,6 +199,18 @@ test("uses GoAccess client classification before aggregating website paths and c
requestPath: "/scanner/",
userAgent: "UnknownScanner/1.0"
}));
fs.appendFileSync(testFixture.registry.sites[0].analyticsLog, analyticsLine({
requestPath: "/missing/",
status: 404
}));
fs.appendFileSync(testFixture.registry.sites[0].analyticsLog, analyticsLine({
requestPath: "/cached/",
status: 304
}));
fs.appendFileSync(testFixture.registry.sites[0].analyticsLog, analyticsLine({
requestPath: "/page.html",
userAgent: "Mozilla/5.0 Chrome/140.0"
}));
try {
generateReports({
registryPath: testFixture.registryPath,
@@ -209,13 +224,18 @@ test("uses GoAccess client classification before aggregating website paths and c
});
const state = JSON.parse(fs.readFileSync(testFixture.registry.privateMetrics.statePath, "utf8"));
assert.equal(state.sites.alpha.website.daily["2026-09-11"].pageViews, 2);
assert.equal(state.sites.alpha.website.daily["2026-09-11"].pageViews, 4);
assert.equal(state.sites.alpha.website.daily["2026-09-11"].paths["/scanner/"], undefined);
assert.equal(state.sites.alpha.website.daily["2026-09-11"].paths["/missing/"], undefined);
assert.equal(state.sites.alpha.website.daily["2026-09-11"].paths["/cached/"], 1);
assert.equal(state.sites.alpha.website.daily["2026-09-11"].paths["/page.html"], 1);
const classifierCall = calls.find(call => call.metricKind === "websiteClassifier");
const aggregationCall = calls.find(call => call.metricKind === "website");
assert.equal(classifierCall.inputLines.some(line => line.includes("UnknownScanner/1.0")), true);
assert.equal(classifierCall.inputLines.every(line => line.split("\t")[4].startsWith("/__client/")), true);
assert.equal(classifierCall.inputLines.every(line => line.split("\t")[4].startsWith("/__request/")), true);
assert.equal(classifierCall.inputLines.some(line => line.split("\t")[4].endsWith(".html")), true);
assert.equal(aggregationCall.inputLines.some(line => line.includes("UnknownScanner/1.0")), false);
assert.equal(aggregationCall.inputLines.some(line => line.split("\t")[6] === "404"), false);
} finally {
testFixture.cleanup();
}
website/test/private-metrics.test.js
+1 -1
View File
@@ -116,7 +116,7 @@ test("keeps absolute countries including Switzerland, United Kingdom and unknown
general: { total_requests: 10, valid_requests: 2 },
geolocation: { data: [{ data: "Germany", hits: { count: 2 } }] },
requests: { data: [{ data: "/", hits: { count: 1 } }] }
}, "website"), /valid-request count differs from the request-panel definition/);
}, "website"), /valid-request count 2 differs from request-panel total 1/);
const updates = aggregateGoAccessReport({
general: { total_requests: 9, valid_requests: 2 },