Skip to content

Remove compressedTimings #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove compressedTimings #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ab2a9
Remove compressedTimings
hansott May 16, 2025
d19dbee
Merge branch 'main' of github.com:AikidoSec/node-RASP into drop-compr…
hansott May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions library/agent/Agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ export class Agent {
);
private routes: Routes = new Routes(200);
private rateLimiter: RateLimiter = new RateLimiter(5000, 120 * 60 * 1000);
private statistics = new InspectionStatistics({
maxPerfSamplesInMemory: 5000,
maxCompressedStatsInMemory: 100,
});
private statistics = new InspectionStatistics();
private middlewareInstalled = false;
private attackLogger = new AttackLogger(1000);

Expand Down Expand Up @@ -352,12 +349,10 @@ export class Agent {
const now = performance.now();
const diff = now - this.lastHeartbeat;
const shouldSendHeartbeat = diff > this.sendHeartbeatEveryMS;
const hasCompressedStats = this.statistics.hasCompressedStats();
const canSendInitialStats =
!this.serviceConfig.hasReceivedAnyStats() && !this.statistics.isEmpty();
const shouldReportInitialStats =
!this.reportedInitialStats &&
(hasCompressedStats || canSendInitialStats);
!this.reportedInitialStats && canSendInitialStats;

if (shouldSendHeartbeat || shouldReportInitialStats) {
this.heartbeat();
Expand Down Expand Up @@ -555,7 +550,6 @@ export class Agent {
}

async flushStats(timeoutInMS: number) {
this.statistics.forceCompress();
await this.sendHeartbeat(timeoutInMS);
}

Expand Down
149 changes: 8 additions & 141 deletions library/agent/InspectionStatistics.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import { InspectionStatistics } from "./InspectionStatistics";
t.test("it resets stats", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});
const stats = new InspectionStatistics();

stats.onInspectedCall({
withoutContext: false,
Expand All @@ -30,7 +27,6 @@ t.test("it resets stats", async () => {
interceptorThrewError: 0,
withoutContext: 0,
total: 1,
compressedTimings: [],
},
},
startedAt: 0,
Expand Down Expand Up @@ -77,12 +73,7 @@ t.test("it resets stats", async () => {
t.test("it keeps track of amount of calls", async () => {
const clock = FakeTimers.install();

const maxPerfSamplesInMemory = 50;
const maxCompressedStatsInMemory = 5;
const stats = new InspectionStatistics({
maxPerfSamplesInMemory: maxPerfSamplesInMemory,
maxCompressedStatsInMemory: maxCompressedStatsInMemory,
});
const stats = new InspectionStatistics();

t.same(stats.getStats(), {
operations: {},
Expand Down Expand Up @@ -123,7 +114,6 @@ t.test("it keeps track of amount of calls", async () => {
interceptorThrewError: 0,
withoutContext: 0,
total: 1,
compressedTimings: [],
},
},
startedAt: 0,
Expand Down Expand Up @@ -163,7 +153,6 @@ t.test("it keeps track of amount of calls", async () => {
interceptorThrewError: 0,
withoutContext: 1,
total: 2,
compressedTimings: [],
},
},
startedAt: 0,
Expand Down Expand Up @@ -196,7 +185,6 @@ t.test("it keeps track of amount of calls", async () => {
interceptorThrewError: 1,
withoutContext: 1,
total: 3,
compressedTimings: [],
},
},
startedAt: 0,
Expand Down Expand Up @@ -236,7 +224,6 @@ t.test("it keeps track of amount of calls", async () => {
interceptorThrewError: 1,
withoutContext: 1,
total: 4,
compressedTimings: [],
},
},
startedAt: 0,
Expand Down Expand Up @@ -276,7 +263,6 @@ t.test("it keeps track of amount of calls", async () => {
interceptorThrewError: 1,
withoutContext: 1,
total: 5,
compressedTimings: [],
},
},
startedAt: 0,
Expand All @@ -296,22 +282,8 @@ t.test("it keeps track of amount of calls", async () => {
},
});

t.same(stats.hasCompressedStats(), false);

clock.tick(1000);

for (let i = 0; i < maxPerfSamplesInMemory; i++) {
stats.onInspectedCall({
withoutContext: false,
kind: "nosql_op",
operation: "mongodb.query",
blocked: false,
durationInMs: i * 0.1,
attackDetected: false,
});
}

t.same(stats.hasCompressedStats(), true);
t.same(stats.getStats(), {
operations: {
"mongodb.query": {
Expand All @@ -322,20 +294,7 @@ t.test("it keeps track of amount of calls", async () => {
},
interceptorThrewError: 1,
withoutContext: 1,
total: 55,
compressedTimings: [
{
averageInMS: 2.1719999999999997,
percentiles: {
"50": 2.1,
"75": 3.4000000000000004,
"90": 4.1000000000000005,
"95": 4.4,
"99": 4.6000000000000005,
},
compressedAt: 1000,
},
],
total: 5,
},
},
startedAt: 0,
Expand All @@ -355,42 +314,13 @@ t.test("it keeps track of amount of calls", async () => {
},
});

t.ok(
// @ts-expect-error Stats is private
stats.operations["mongodb.query"].durations.length < maxPerfSamplesInMemory
);

for (
let i = 0;
i < maxPerfSamplesInMemory * maxCompressedStatsInMemory * 2;
i++
) {
stats.onInspectedCall({
withoutContext: false,
kind: "nosql_op",
operation: "mongodb.query",
blocked: false,
durationInMs: i * 0.1,
attackDetected: false,
});
}

t.same(
// @ts-expect-error Stats is private
stats.operations["mongodb.query"].compressedTimings.length,
maxCompressedStatsInMemory
);

clock.uninstall();
});

t.test("it keeps track of requests", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});
const stats = new InspectionStatistics();

t.same(stats.getStats(), {
operations: {},
Expand Down Expand Up @@ -502,60 +432,10 @@ t.test("it keeps track of requests", async () => {
clock.uninstall();
});

t.test("it force compresses stats", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});

t.same(stats.getStats(), {
operations: {},
startedAt: 0,
requests: {
total: 0,
aborted: 0,
attacksDetected: {
total: 0,
blocked: 0,
},
},
userAgents: {
breakdown: {},
},
ipAddresses: {
breakdown: {},
},
});

stats.onRequest();

stats.onInspectedCall({
withoutContext: false,
kind: "nosql_op",
operation: "mongodb.query",
blocked: false,
durationInMs: 0.1,
attackDetected: false,
});

t.same(stats.hasCompressedStats(), false);

stats.forceCompress();

t.same(stats.hasCompressedStats(), true);

clock.uninstall();
});

t.test("it keeps track of aborted requests", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});
const stats = new InspectionStatistics();

stats.onAbortedRequest();

Expand Down Expand Up @@ -584,10 +464,7 @@ t.test("it keeps track of aborted requests", async () => {
t.test("it keeps track of matched IPs and user agents", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});
const stats = new InspectionStatistics();

stats.onIPAddressMatches(["known_threat_actors/public_scanners"]);
stats.onUserAgentMatches(["ai_data_scrapers"]);
Expand Down Expand Up @@ -650,10 +527,7 @@ t.test("it keeps track of matched IPs and user agents", async () => {
t.test("it keeps track of multiple operations of the same kind", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});
const stats = new InspectionStatistics();

stats.onInspectedCall({
withoutContext: false,
Expand Down Expand Up @@ -684,7 +558,6 @@ t.test("it keeps track of multiple operations of the same kind", async () => {
interceptorThrewError: 0,
withoutContext: 0,
total: 1,
compressedTimings: [],
},
"mongodb.insert": {
kind: "nosql_op",
Expand All @@ -695,7 +568,6 @@ t.test("it keeps track of multiple operations of the same kind", async () => {
interceptorThrewError: 0,
withoutContext: 0,
total: 1,
compressedTimings: [],
},
},
startedAt: 0,
Expand Down Expand Up @@ -745,7 +617,6 @@ t.test("it keeps track of multiple operations of the same kind", async () => {
interceptorThrewError: 0,
withoutContext: 1,
total: 2,
compressedTimings: [],
},
"mongodb.insert": {
kind: "nosql_op",
Expand All @@ -756,7 +627,6 @@ t.test("it keeps track of multiple operations of the same kind", async () => {
interceptorThrewError: 0,
withoutContext: 0,
total: 2,
compressedTimings: [],
},
},
startedAt: 0,
Expand All @@ -782,10 +652,7 @@ t.test("it keeps track of multiple operations of the same kind", async () => {
t.test("it handles empty operation strings", async () => {
const clock = FakeTimers.install();

const stats = new InspectionStatistics({
maxPerfSamplesInMemory: 50,
maxCompressedStatsInMemory: 5,
});
const stats = new InspectionStatistics();

// Test onInspectedCall with empty operation
stats.onInspectedCall({
Expand Down
Loading