feat: Enable Logging functionality to both new and old Log Tables

runner/src/indexer-meta/indexer-meta.test.ts

@@ -25,7 +25,7 @@ describe('IndexerMeta', () => {
     database: 'test_database'
   };
 
-  const indexerConfig = new IndexerConfig('', '', 'some_account/some_indexer', 0, '', '', LogLevel.INFO);
+  const indexerConfig = new IndexerConfig('', 'some-account', 'some-indexer', 0, '', '', LogLevel.INFO);
   const schemaName = indexerConfig.schemaName();
 
   describe('writeLog', () => {

runner/src/indexer-meta/indexer-meta.ts

@@ -21,9 +21,8 @@ export default class IndexerMeta {
   tracer = trace.getTracer('queryapi-runner-indexer-logger');
 
   private readonly pgClient: PgClient;
-  private readonly schemaName: string;
+  private readonly indexerConfig: IndexerConfig;
   private readonly logInsertQueryTemplate: string = 'INSERT INTO %I.__logs (block_height, date, timestamp, type, level, message) VALUES %L';
-  private readonly loggingLevel: number;
 
   constructor (
     indexerConfig: IndexerConfig,
@@ -33,12 +32,11 @@ export default class IndexerMeta {
     const pgClient = pgClientInstance ?? new PgClient(databaseConnectionParameters);
 
     this.pgClient = pgClient;
-    this.schemaName = indexerConfig.schemaName();
-    this.loggingLevel = indexerConfig.logLevel;
+    this.indexerConfig = indexerConfig;
   }
 
   private shouldLog (logLevel: LogLevel): boolean {
-    return logLevel >= this.loggingLevel;
+    return logLevel >= this.indexerConfig.logLevel;
   }
 
   async writeLogs (
@@ -49,6 +47,7 @@ export default class IndexerMeta {
 
     const spanMessage = `write log for ${entriesArray.length === 1 ? 'single entry' : `batch of ${entriesArray.length}`} through postgres `;
     const writeLogSpan = this.tracer.startSpan(spanMessage);
+
     await wrapError(async () => {
       const values = entriesArray.map(entry => [
         entry.blockHeight,
@@ -58,9 +57,10 @@ export default class IndexerMeta {
         LogLevel[entry.level],
         entry.message
       ]);
-      const query = format(this.logInsertQueryTemplate, this.schemaName, values);
+
+      const query = format(this.logInsertQueryTemplate, this.indexerConfig.schemaName(), values);
       await this.pgClient.query(query);
-    }, `Failed to insert ${entriesArray.length > 1 ? 'logs' : 'log'} into the ${this.schemaName}.__logs table`)
+    }, `Failed to insert ${entriesArray.length > 1 ? 'logs' : 'log'} into the ${this.indexerConfig.schemaName()}.__logs table`)
       .finally(() => {
         writeLogSpan.end();
       });
@@ -69,10 +69,10 @@ export default class IndexerMeta {
   async setStatus (status: IndexerStatus): Promise<void> {
     const setStatusSpan = this.tracer.startSpan(`set status of indexer to ${status} through postgres`);
     const values = [[STATUS_ATTRIBUTE, status]];
-    const query = format(METADATA_TABLE_UPSERT, this.schemaName, values);
+    const query = format(METADATA_TABLE_UPSERT, this.indexerConfig.schemaName(), values);
 
     try {
-      await wrapError(async () => await this.pgClient.query(query), `Failed to update status for ${this.schemaName}`);
+      await wrapError(async () => await this.pgClient.query(query), `Failed to update status for ${this.indexerConfig.schemaName()}`);
     } finally {
       setStatusSpan.end();
     }
@@ -81,10 +81,10 @@ export default class IndexerMeta {
   async updateBlockheight (blockHeight: number): Promise<void> {
     const setLastProcessedBlockSpan = this.tracer.startSpan(`set last processed block to ${blockHeight} through postgres`);
     const values = [[LAST_PROCESSED_BLOCK_HEIGHT_ATTRIBUTE, blockHeight.toString()]];
-    const query = format(METADATA_TABLE_UPSERT, this.schemaName, values);
+    const query = format(METADATA_TABLE_UPSERT, this.indexerConfig.schemaName(), values);
 
     try {
-      await wrapError(async () => await this.pgClient.query(query), `Failed to update last processed block height for ${this.schemaName}`);
+      await wrapError(async () => await this.pgClient.query(query), `Failed to update last processed block height for ${this.indexerConfig.schemaName()}`);
     } finally {
       setLastProcessedBlockSpan.end();
     }