awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 01:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(telemetry): addressed PR suggestions

Browse Source
This commit is contained in:
carlosmonastyrski
2025-06-26 21:18:07 -03:00
parent 61274243e2
commit 0f04890d8f
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/e2e-test/mocks/keystore.ts
+5 -2
View File
@@ -8,6 +8,9 @@ import { Lock } from "@app/lib/red-lock";
export const mockKeyStore = (): TKeyStoreFactory => { export const mockKeyStore = (): TKeyStoreFactory => {
const store: Record<string, string | number | Buffer> = {}; const store: Record<string, string | number | Buffer> = {};
const getRegex = (pattern: string) =>
new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`);
return { return {
setItem: async (key, value) => { setItem: async (key, value) => {
store[key] = value; store[key] = value;
@@ -23,7 +26,7 @@ export const mockKeyStore = (): TKeyStoreFactory => {
return 1; return 1;
}, },
deleteItems: async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }) => { deleteItems: async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }) => {
const regex = new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`); const regex = getRegex(pattern);
let totalDeleted = 0; let totalDeleted = 0;
const keys = Object.keys(store); const keys = Object.keys(store);
@@ -64,7 +67,7 @@ export const mockKeyStore = (): TKeyStoreFactory => {
return values; return values;
}, },
getKeysByPattern: async (pattern) => { getKeysByPattern: async (pattern) => {
const regex = new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`); const regex = getRegex(pattern);
const keys = Object.keys(store); const keys = Object.keys(store);
return keys.filter((key) => regex.test(key)); return keys.filter((key) => regex.test(key));
}, },
backend/src/keystore/keystore.ts
+4 -1
View File
@@ -114,7 +114,10 @@ export const keyStoreFactory = (redisConfigKeys: TRedisConfigKeys): TKeyStoreFac
const deleteItem = async (key: string) => redis.del(key); const deleteItem = async (key: string) => redis.del(key);
const deleteItemsByKeyIn = async (keys: string[]) => redis.del(keys); const deleteItemsByKeyIn = async (keys: string[]) => {
if (keys.length === 0) return 0;
return redis.del(keys);
};
const deleteItems = async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }: TDeleteItems) => { const deleteItems = async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }: TDeleteItems) => {
let cursor = "0"; let cursor = "0";
backend/src/keystore/memory.ts
+4 -2
View File
@@ -8,6 +8,8 @@ import { TKeyStoreFactory } from "./keystore";
export const inMemoryKeyStore = (): TKeyStoreFactory => { export const inMemoryKeyStore = (): TKeyStoreFactory => {
const store: Record<string, string | number | Buffer> = {}; const store: Record<string, string | number | Buffer> = {};
const getRegex = (pattern: string) =>
new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`);
return { return {
setItem: async (key, value) => { setItem: async (key, value) => {
@@ -24,7 +26,7 @@ export const inMemoryKeyStore = (): TKeyStoreFactory => {
return 1; return 1;
}, },
deleteItems: async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }) => { deleteItems: async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }) => {
const regex = new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`); const regex = getRegex(pattern);
let totalDeleted = 0; let totalDeleted = 0;
const keys = Object.keys(store); const keys = Object.keys(store);
@@ -61,7 +63,7 @@ export const inMemoryKeyStore = (): TKeyStoreFactory => {
}, },
waitTillReady: async () => {}, waitTillReady: async () => {},
getKeysByPattern: async (pattern) => { getKeysByPattern: async (pattern) => {
const regex = new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`); const regex = getRegex(pattern);
const keys = Object.keys(store); const keys = Object.keys(store);
return keys.filter((key) => regex.test(key)); return keys.filter((key) => regex.test(key));
}, },
backend/src/services/telemetry/telemetry-queue.ts
+2 -2
View File
@@ -79,7 +79,7 @@ export const telemetryQueueServiceFactory = ({
await queueService.stopRepeatableJob( await queueService.stopRepeatableJob(
QueueName.TelemetryAggregatedEvents, QueueName.TelemetryAggregatedEvents,
QueueJobs.TelemetryAggregatedEvents, QueueJobs.TelemetryAggregatedEvents,
{ pattern: "*/2 * * * *", utc: true }, { pattern: "*/5 * * * *", utc: true },
QueueName.TelemetryAggregatedEvents // just a job id QueueName.TelemetryAggregatedEvents // just a job id
); );
@@ -92,7 +92,7 @@ export const telemetryQueueServiceFactory = ({
// Start aggregated events job (runs every five minutes) // Start aggregated events job (runs every five minutes)
await queueService.queue(QueueName.TelemetryAggregatedEvents, QueueJobs.TelemetryAggregatedEvents, undefined, { await queueService.queue(QueueName.TelemetryAggregatedEvents, QueueJobs.TelemetryAggregatedEvents, undefined, {
jobId: QueueName.TelemetryAggregatedEvents, jobId: QueueName.TelemetryAggregatedEvents,
repeat: { pattern: "*/2 * * * *", utc: true } repeat: { pattern: "*/5 * * * *", utc: true }
}); });
} }
}; };