From 94ee173d5899cfacfe8a10b197671b0629a20b3a Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Fri, 7 Feb 2025 11:34:01 +0100 Subject: [PATCH 1/3] Fix observe actor events telemetry name --- backend/bin/deal-observer-backend.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/bin/deal-observer-backend.js b/backend/bin/deal-observer-backend.js index 17a2c0a..eba8fe0 100644 --- a/backend/bin/deal-observer-backend.js +++ b/backend/bin/deal-observer-backend.js @@ -39,7 +39,6 @@ const pgPool = await createPgPool() const { recordTelemetry } = createInflux(INFLUXDB_TOKEN) const observeActorEventsLoop = async (makeRpcRequest, pgPool) => { - const LOOP_NAME = 'Observe actor events' while (true) { const start = Date.now() try { @@ -57,10 +56,10 @@ const observeActorEventsLoop = async (makeRpcRequest, pgPool) => { Sentry.captureException(e) } const dt = Date.now() - start - console.log(`Loop "${LOOP_NAME}" took ${dt}ms`) + console.log(`Loop "Observe actor events" took ${dt}ms`) if (INFLUXDB_TOKEN) { - recordTelemetry(`loop_${slug(LOOP_NAME, '_')}`, point => { + recordTelemetry('loop_builtin_actor_events', point => { point.intField('interval_ms', LOOP_INTERVAL) point.intField('duration_ms', dt) }) From 5f3529d27623c9e09e405b1c9279e593f9923523 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Fri, 7 Feb 2025 11:57:54 +0100 Subject: [PATCH 2/3] remove LOOP_NAME for consistency --- backend/bin/deal-observer-backend.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/bin/deal-observer-backend.js b/backend/bin/deal-observer-backend.js index eba8fe0..69a903b 100644 --- a/backend/bin/deal-observer-backend.js +++ b/backend/bin/deal-observer-backend.js @@ -80,7 +80,6 @@ const observeActorEventsLoop = async (makeRpcRequest, pgPool) => { * @param {number} args.sparkApiSubmitDealsBatchSize */ const sparkApiSubmitDealsLoop = async (pgPool, { sparkApiBaseUrl, sparkApiToken, sparkApiSubmitDealsBatchSize }) => { - const LOOP_NAME = 'Submit deals to spark-api' while (true) { const start = Date.now() try { @@ -102,10 +101,10 @@ const sparkApiSubmitDealsLoop = async (pgPool, { sparkApiBaseUrl, sparkApiToken, Sentry.captureException(e) } const dt = Date.now() - start - console.log(`Loop "${LOOP_NAME}" took ${dt}ms`) + console.log(`Loop "Submit deals to spark-api" took ${dt}ms`) if (INFLUXDB_TOKEN) { - recordTelemetry(`loop_${slug(LOOP_NAME, '_')}`, point => { + recordTelemetry('loop_submit_deals_to_sparkapi', point => { point.intField('interval_ms', LOOP_INTERVAL) point.intField('duration_ms', dt) }) @@ -117,7 +116,6 @@ const sparkApiSubmitDealsLoop = async (pgPool, { sparkApiBaseUrl, sparkApiToken, } export const lookUpPayloadCidsLoop = async (makeRpcRequest, getDealPayloadCid, pgPool) => { - const LOOP_NAME = 'Look up payload CIDs' while (true) { const start = Date.now() // Maximum number of deals to look up payload CIDs for in one loop iteration @@ -129,11 +127,11 @@ export const lookUpPayloadCidsLoop = async (makeRpcRequest, getDealPayloadCid, p Sentry.captureException(e) } const dt = Date.now() - start - console.log(`Loop "${LOOP_NAME}" took ${dt}ms`) + console.log(`Loop "Look up payload CIDs" took ${dt}ms`) // For local monitoring and debugging, we can omit sending data to InfluxDB if (INFLUXDB_TOKEN) { - recordTelemetry(`loop_${slug(LOOP_NAME, '_')}`, point => { + recordTelemetry('loop_look_up_payload_cids', point => { point.intField('interval_ms', LOOP_INTERVAL) point.intField('duration_ms', dt) }) From c8d817c9f7e7f1058477cb1691acf17d987b0375 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Fri, 7 Feb 2025 12:28:20 +0100 Subject: [PATCH 3/3] clean up --- backend/package.json | 3 +-- package-lock.json | 12 +----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/backend/package.json b/backend/package.json index ba6522d..a4ee525 100644 --- a/backend/package.json +++ b/backend/package.json @@ -22,7 +22,6 @@ "multiformats": "^13.3.1", "p-retry": "^6.2.1", "pg": "^8.13.1", - "pg-cursor": "^2.12.1", - "slug": "^10.0.0" + "pg-cursor": "^2.12.1" } } diff --git a/package-lock.json b/package-lock.json index ae93ab1..910e71e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,8 +49,7 @@ "multiformats": "^13.3.1", "p-retry": "^6.2.1", "pg": "^8.13.1", - "pg-cursor": "^2.12.1", - "slug": "^10.0.0" + "pg-cursor": "^2.12.1" }, "devDependencies": { "standard": "^17.1.2" @@ -5432,15 +5431,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/slug": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/slug/-/slug-10.0.0.tgz", - "integrity": "sha512-M8s2PWOUeSCdD4S1NH5lCzXg2zFV1fozrtfr0FSKl65x+EF1rUowj+/vyFlnHgxPxWzT+DL0VXKfYc1DHJoymg==", - "license": "MIT", - "bin": { - "slug": "cli.js" - } - }, "node_modules/sonic-boom": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",