Merge pull request #513 from hack-a-chain-software/develop

0xneves · web-flow · commit 90a4be1e9ded · 2025-10-09T11:01:04.000-03:00
Merge 'develop' into 'main'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## Sep 12 - Oct 9, 2025
+
+v1.1.1
+
+- fix: silencing error throw from retried functions
+- fix: closing idle connections on the db pool
+- fix: reduced sentry sample ratio
+- refactor: removed unused import and function
+- feat: tracking memory usage every thirty minutes
+
 ## Aug 13 - Sep 11, 2025
 
 - fix: remove unnecessary error throwing in dataloaders
diff --git a/indexer/package.json b/indexer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kadena-indexer/indexer",
   "description": "Indexer for the Kadena blockchain",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "main": "index.js",
   "author": "Hackachain team",
   "license": "ISC",
diff --git a/indexer/src/cache/init.ts b/indexer/src/cache/init.ts
@@ -76,10 +76,7 @@ export default async function initCache(context: ResolverContext) {
       };
       MEMORY_CACHE.set(HASH_RATE_AND_TOTAL_DIFFICULTY_KEY, newValue);
     } catch (err) {
-      console.error(
-        '[ERROR][CACHE][CONN_TIMEOUT] Failed to get hash rate and total difficulty',
-        err,
-      );
+      console.warn('[WARN][CACHE][DB] Failed to get hash rate and total difficulty', err);
     }
   }
 
@@ -94,7 +91,7 @@ export default async function initCache(context: ResolverContext) {
       const networkStatistics = await networkRepository.getNetworkStatistics();
       MEMORY_CACHE.set(NETWORK_STATISTICS_KEY, networkStatistics);
     } catch (err) {
-      console.error('[ERROR][CACHE][CONN_TIMEOUT] Failed to get network statistics', err);
+      console.warn('[WARN][CACHE][DB] Failed to get network statistics', err);
     }
   }
 
@@ -109,23 +106,20 @@ export default async function initCache(context: ResolverContext) {
       const nodeInfo = await networkRepository.getNodeInfo();
       MEMORY_CACHE.set(NODE_INFO_KEY, nodeInfo);
     } catch (err) {
-      console.error('[ERROR][CACHE][CONN_TIMEOUT] Failed to get node info', err);
+      console.warn('[WARN][CACHE][DB] Failed to get node info', err);
     }
   }
 
   /**
-   * Fetches and caches information about the blockchain node
-   *
-   * This includes node version, connectivity status, and other
-   * node-specific information that helps monitor the node's health.
+   * Fetches and caches information about number of blocks, transactions,
+   * and total gas used in each chain.
    */
-
   async function getCountersOfEachChain() {
     try {
       const counters = await networkRepository.getCountersOfEachChain();
       MEMORY_CACHE.set(COUNTERS_OF_EACH_CHAIN_KEY, counters);
     } catch (err) {
-      console.error('[ERROR][CACHE][CONN_TIMEOUT] Failed to get counters of each chain', err);
+      console.warn('[WARN][CACHE][DB] Failed to get counters of each chain', err);
     }
   }
 
diff --git a/indexer/src/config/database.ts b/indexer/src/config/database.ts
@@ -44,12 +44,14 @@ if (isSslEnabled) {
  * This provides a lower-level database access mechanism than Sequelize.
  *
  * When SSL is enabled, it uses the global certificate bundle for secure connections.
- *
- * TODO: [OPTIMIZATION] Consider implementing connection pooling metrics to monitor performance
- * and adjust pool settings accordingly.
  */
 export const rootPgPool = new Pool({
   connectionString: DB_CONNECTION,
+  max: 20, // Max connections
+  idleTimeoutMillis: 30000, // Close idle connections after 30s
+  connectionTimeoutMillis: 10000, // Fail if can't get connection in 10s
+  statement_timeout: 30000, // Cancel queries after 30s (PostgreSQL)
+  query_timeout: 30000, // Client-side query timeout
   ...(isSslEnabled && {
     ssl: {
       rejectUnauthorized: rejectUnauthorized,
diff --git a/indexer/src/index.ts b/indexer/src/index.ts
@@ -20,6 +20,7 @@ import { startStreaming } from './services/streaming';
 import { backfillPairEvents } from './services/pair';
 import { setupAssociations } from './models/setup-associations';
 import { PriceUpdaterService } from '@/services/price/price-updater.service';
+import { initializeMemoryMonitoring } from '@/utils/memory-usage';
 
 /**
  * Command-line interface configuration using Commander.
@@ -49,8 +50,9 @@ const options = program.opts();
  */
 async function main() {
   try {
-    console.info('Starting v1.1.0');
+    console.info('Starting v1.1.1');
     initializeErrorMonitoring();
+    initializeMemoryMonitoring();
     setupAssociations();
     PriceUpdaterService.getInstance();
 
diff --git a/indexer/src/kadena-server/plugins/instrument.ts b/indexer/src/kadena-server/plugins/instrument.ts
@@ -21,8 +21,8 @@ if (!SENTRY_DSN || SENTRY_DSN.trim() === '') {
     environment: SENTRY_ENVIRONMENT,
     release: SENTRY_RELEASE,
     sendDefaultPii: true,
-    tracesSampleRate: 1.0,
-    profileSessionSampleRate: 1.0,
+    tracesSampleRate: 0.05,
+    profileSessionSampleRate: 0.05,
     profileLifecycle: 'trace',
     integrations: [
       nodeProfilingIntegration(),
diff --git a/indexer/src/kadena-server/plugins/sentry-plugin.ts b/indexer/src/kadena-server/plugins/sentry-plugin.ts
@@ -10,41 +10,17 @@ import { ResolverContext } from '../config/apollo-server-config';
 export function createSentryPlugin(): ApolloServerPlugin<ResolverContext> {
   return {
     async requestDidStart({ request, contextValue }) {
-      Sentry.startSpan(
-        {
-          name: request.operationName || 'anonymous',
-          op: 'graphql.query',
-          attributes: {
-            'random-test': 'test',
-            'operation.type': 'graphql.query',
-            'operation.name': request.operationName || 'anonymous',
-          },
+      // Log incoming queries to Sentry as breadcrumbs (no manual spans or profiler here)
+      Sentry.addBreadcrumb({
+        category: 'graphql.query',
+        message: request.operationName || 'Anonymous GraphQL operation',
+        level: 'info',
+        data: {
+          query: request.query,
+          variables: request.variables,
+          operationType: request.operationName ? 'named' : 'anonymous',
         },
-        span => {
-          // Set operation attributes
-          span.setAttributes({
-            'operation.details.type': 'graphql.query',
-            'operation.details.name': request.operationName || 'anonymous',
-            'operation.details.timestamp': new Date().toISOString(),
-            'operation.details.query': request.query,
-          });
-
-          // Optionally log all incoming queries to Sentry as breadcrumbs
-          // Breadcrumbs create a historical trail that persists (query history)
-          Sentry.profiler.startProfiler();
-          Sentry.addBreadcrumb({
-            category: 'graphql.query',
-            message: request.operationName || 'Anonymous GraphQL operation',
-            level: 'info',
-            data: {
-              query: request.query,
-              variables: request.variables,
-              operationType: request.operationName ? 'named' : 'anonymous',
-            },
-          });
-          Sentry.profiler.stopProfiler();
-        },
-      );
+      });
       return {
         async didEncounterErrors({ errors, operation, operationName, request }) {
           // Skip Apollo-specific errors that are intentionally thrown
diff --git a/indexer/src/kadena-server/server.ts b/indexer/src/kadena-server/server.ts
@@ -43,7 +43,6 @@ import {
 } from 'graphql';
 
 import initCache from '../cache/init';
-import { getArrayEnvString } from '../utils/helpers';
 import {
   directiveEstimator,
   fieldExtensionsEstimator,
diff --git a/indexer/src/services/monitoring.ts b/indexer/src/services/monitoring.ts
@@ -72,7 +72,7 @@ export function initializeErrorMonitoring(): void {
     ]
       .filter(Boolean)
       .join(', ');
-    console.warn(`[WARN][MONITORING] Monitoring not initialized. Missing env: ${missing}`);
+    console.error(`[WARN][MONITORING][ENV] Monitoring not initialized. Missing env: ${missing}`);
     return; // Monitoring disabled; keep local logging only
   }
 
diff --git a/indexer/src/services/price/price-updater.service.ts b/indexer/src/services/price/price-updater.service.ts
@@ -1,5 +1,3 @@
-import axios from 'axios';
-
 import { PriceService } from './price.service';
 
 export class PriceUpdaterService {
@@ -23,11 +21,26 @@ export class PriceUpdaterService {
 
   private async updatePrice(): Promise<void> {
     try {
-      const response = await axios.get(this.DIA_API_URL);
-      const price = response.data.Price;
-      this.priceService.setKdaUsdPrice(price);
+      const response = await fetch(this.DIA_API_URL, {
+        headers: {
+          Accept: 'application/json',
+          'User-Agent': 'node-fetch',
+        },
+      });
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status} - ${response.statusText}`);
+      }
+
+      const data = await response.json();
+
+      if (data?.Price === undefined) {
+        throw new Error('Price field is missing in API response');
+      }
+
+      this.priceService.setKdaUsdPrice(data.Price);
     } catch (error) {
-      console.error('[ERROR][INT][INT_API] Failed to update KDA/USD price:', error);
+      console.warn('[WARN][INT][INT_API] Failed to update KDA/USD price:', error);
     }
   }
 
diff --git a/indexer/src/utils/helpers.ts b/indexer/src/utils/helpers.ts
@@ -40,18 +40,6 @@ export function getRequiredEnvString(key: string): string {
   return value;
 }
 
-/**
- * Retrieves an optional environment variable as a string array.
- * The environment variable is expected to be a comma-separated string.
- *
- * @param key - The name of the environment variable to retrieve.
- * @returns The value of the environment variable as a string array, or an empty array if the variable is not set.
- */
-export function getArrayEnvString(key: string): string[] {
-  const value = process.env[key] ?? '';
-  return value.split(',').filter(item => item.trim() !== '');
-}
-
 /**
  * Checks if a value is null or undefined.
  *
diff --git a/indexer/src/utils/memory-usage.ts b/indexer/src/utils/memory-usage.ts
@@ -0,0 +1,13 @@
+export const initializeMemoryMonitoring = () => {
+  const memoryMonitoringInterval = 1000 * 60 * 30; // 30 minutes
+  setInterval(monitorMemoryUsage, memoryMonitoringInterval);
+};
+
+const monitorMemoryUsage = () => {
+  const mem = process.memoryUsage();
+  const heapUsedMB = mem.heapUsed / 1024 / 1024;
+  const heapInfo = `Heap: ${heapUsedMB.toFixed(2)}MB / ${(mem.heapTotal / 1024 / 1024).toFixed(2)}MB`;
+  const externalInfo = `External: ${(mem.external / 1024 / 1024).toFixed(2)}MB`;
+  const rssInfo = `RSS: ${(mem.rss / 1024 / 1024).toFixed(2)}MB`;
+  console.info(`[INFO][MEMORY] ${heapInfo} | ${externalInfo} | ${rssInfo}`);
+};

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kadena-indexer/indexer",`
`3`	`3`	`"description": "Indexer for the Kadena blockchain",`
`4`		`- "version": "1.0.0",`
	`4`	`+ "version": "1.1.1",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"author": "Hackachain team",`
`7`	`7`	`"license": "ISC",`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,7 @@ export default async function initCache(context: ResolverContext) {`
`76`	`76`	`};`
`77`	`77`	`MEMORY_CACHE.set(HASH_RATE_AND_TOTAL_DIFFICULTY_KEY, newValue);`
`78`	`78`	`} catch (err) {`
`79`		`- console.error(`
`80`		`- '[ERROR][CACHE][CONN_TIMEOUT] Failed to get hash rate and total difficulty',`
`81`		`- err,`
`82`		`- );`
	`79`	`+ console.warn('[WARN][CACHE][DB] Failed to get hash rate and total difficulty', err);`
`83`	`80`	`}`
`84`	`81`	`}`
`85`	`82`
`@@ -94,7 +91,7 @@ export default async function initCache(context: ResolverContext) {`
`94`	`91`	`const networkStatistics = await networkRepository.getNetworkStatistics();`
`95`	`92`	`MEMORY_CACHE.set(NETWORK_STATISTICS_KEY, networkStatistics);`
`96`	`93`	`} catch (err) {`
`97`		`- console.error('[ERROR][CACHE][CONN_TIMEOUT] Failed to get network statistics', err);`
	`94`	`+ console.warn('[WARN][CACHE][DB] Failed to get network statistics', err);`
`98`	`95`	`}`
`99`	`96`	`}`
`100`	`97`
`@@ -109,23 +106,20 @@ export default async function initCache(context: ResolverContext) {`
`109`	`106`	`const nodeInfo = await networkRepository.getNodeInfo();`
`110`	`107`	`MEMORY_CACHE.set(NODE_INFO_KEY, nodeInfo);`
`111`	`108`	`} catch (err) {`
`112`		`- console.error('[ERROR][CACHE][CONN_TIMEOUT] Failed to get node info', err);`
	`109`	`+ console.warn('[WARN][CACHE][DB] Failed to get node info', err);`
`113`	`110`	`}`
`114`	`111`	`}`
`115`	`112`
`116`	`113`	`/**`
`117`		`- * Fetches and caches information about the blockchain node`
`118`		`- *`
`119`		`- * This includes node version, connectivity status, and other`
`120`		`- * node-specific information that helps monitor the node's health.`
	`114`	`+ * Fetches and caches information about number of blocks, transactions,`
	`115`	`+ * and total gas used in each chain.`
`121`	`116`	`*/`
`122`		`-`
`123`	`117`	`async function getCountersOfEachChain() {`
`124`	`118`	`try {`
`125`	`119`	`const counters = await networkRepository.getCountersOfEachChain();`
`126`	`120`	`MEMORY_CACHE.set(COUNTERS_OF_EACH_CHAIN_KEY, counters);`
`127`	`121`	`} catch (err) {`
`128`		`- console.error('[ERROR][CACHE][CONN_TIMEOUT] Failed to get counters of each chain', err);`
	`122`	`+ console.warn('[WARN][CACHE][DB] Failed to get counters of each chain', err);`
`129`	`123`	`}`
`130`	`124`	`}`
`131`	`125`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export function initializeErrorMonitoring(): void {`
`72`	`72`	`]`
`73`	`73`	`.filter(Boolean)`
`74`	`74`	`.join(', ');`
`75`		- console.warn(`[WARN][MONITORING] Monitoring not initialized. Missing env: ${missing}`);
	`75`	+ console.error(`[WARN][MONITORING][ENV] Monitoring not initialized. Missing env: ${missing}`);
`76`	`76`	`return; // Monitoring disabled; keep local logging only`
`77`	`77`	`}`
`78`	`78`