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

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

@@ -3,6 +3,7 @@ import IndexerMeta, { IndexerStatus } from './indexer-meta';
 import type PgClient from '../pg-client';
 import LogEntry, { LogLevel } from './log-entry';
 import { type PostgresConnectionParams } from '../pg-client';
+import IndexerConfig from '../indexer-config/indexer-config';
 
 describe('IndexerMeta', () => {
   let genericMockPgClient: PgClient;
@@ -23,16 +24,17 @@ describe('IndexerMeta', () => {
     port: 5432,
     database: 'test_database'
   };
-  const functionName = 'some_account/some_indexer';
-  const schemaName = functionName.replace(/[^a-zA-Z0-9]/g, '_');
+
+  const indexerConfig = new IndexerConfig('', '', 'some_account/some_indexer', 0, '', '', LogLevel.INFO);
+  const schemaName = indexerConfig.schemaName();
 
   describe('writeLog', () => {
     it('should insert a single log entry into the database', async () => {
       const date = new Date();
       jest.useFakeTimers({ now: date.getTime() });
       const formattedDate = date.toISOString().replace('T', ' ').replace('Z', '+00');
 
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.INFO, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const infoEntry = LogEntry.systemInfo('Info message');
       await indexerMeta.writeLogs([infoEntry]);
 
@@ -45,7 +47,7 @@ describe('IndexerMeta', () => {
       jest.useFakeTimers({ now: date.getTime() });
       const formattedDate = date.toISOString().replace('T', ' ').replace('Z', '+00');
 
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.INFO, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const errorEntry = LogEntry.systemError('Error message', 12345);
       await indexerMeta.writeLogs([errorEntry]);
 
@@ -56,13 +58,13 @@ describe('IndexerMeta', () => {
     it('should handle errors when inserting a single log entry', async () => {
       query.mockRejectedValueOnce(new Error('Failed to insert log'));
 
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.INFO, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const errorEntry = LogEntry.systemError('Error message', 12345);
       await expect(indexerMeta.writeLogs([errorEntry])).rejects.toThrow('Failed to insert log');
     });
 
     it('should insert a batch of log entries into the database', async () => {
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.INFO, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const debugEntry = LogEntry.systemDebug('Debug message');
       const infoEntry = LogEntry.systemInfo('Information message');
       const logEntries: LogEntry[] = [
@@ -79,7 +81,7 @@ describe('IndexerMeta', () => {
     it('should handle errors when inserting a batch of log entries', async () => {
       query.mockRejectedValueOnce(new Error('Failed to insert batch of logs'));
 
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.INFO, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const debugEntry = LogEntry.systemDebug('Debug message');
       const infoEntry = LogEntry.systemInfo('Information message');
       const logEntries: LogEntry[] = [
@@ -91,15 +93,15 @@ describe('IndexerMeta', () => {
     });
 
     it('should handle empty log entry', async () => {
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.INFO, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const logEntries: LogEntry[] = [];
       await indexerMeta.writeLogs(logEntries);
 
       expect(query).not.toHaveBeenCalled();
     });
 
     it('should skip log entries with levels lower than the logging level specified in the constructor', async () => {
-      const indexerMeta = new IndexerMeta(functionName, LogLevel.ERROR, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       const debugEntry = LogEntry.systemDebug('Debug message');
 
       await indexerMeta.writeLogs([debugEntry]);
@@ -108,15 +110,15 @@ describe('IndexerMeta', () => {
     });
 
     it('writes status for indexer', async () => {
-      const indexerMeta = new IndexerMeta(functionName, 5, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       await indexerMeta.setStatus(IndexerStatus.RUNNING);
       expect(query).toBeCalledWith(
         `INSERT INTO ${schemaName}.__metadata (attribute, value) VALUES ('STATUS', 'RUNNING') ON CONFLICT (attribute) DO UPDATE SET value = EXCLUDED.value RETURNING *`
       );
     });
 
     it('writes last processed block height for indexer', async () => {
-      const indexerMeta = new IndexerMeta(functionName, 5, mockDatabaseConnectionParameters, genericMockPgClient);
+      const indexerMeta = new IndexerMeta(indexerConfig, mockDatabaseConnectionParameters, genericMockPgClient);
       await indexerMeta.updateBlockheight(123);
       expect(query).toBeCalledWith(
         `INSERT INTO ${schemaName}.__metadata (attribute, value) VALUES ('LAST_PROCESSED_BLOCK_HEIGHT', '123') ON CONFLICT (attribute) DO UPDATE SET value = EXCLUDED.value RETURNING *`

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

@@ -4,6 +4,7 @@ import PgClient, { type PostgresConnectionParams } from '../pg-client';
 import { trace } from '@opentelemetry/api';
 import type LogEntry from './log-entry';
 import { LogLevel } from './log-entry';
+import type IndexerConfig from '../indexer-config/indexer-config';
 
 export enum IndexerStatus {
   PROVISIONING = 'PROVISIONING',
@@ -25,16 +26,15 @@ export default class IndexerMeta {
   private readonly loggingLevel: number;
 
   constructor (
-    functionName: string,
-    loggingLevel: number,
+    indexerConfig: IndexerConfig,
     databaseConnectionParameters: PostgresConnectionParams,
     pgClientInstance: PgClient | undefined = undefined
   ) {
     const pgClient = pgClientInstance ?? new PgClient(databaseConnectionParameters);
 
     this.pgClient = pgClient;
-    this.schemaName = functionName.replace(/[^a-zA-Z0-9]/g, '_');
-    this.loggingLevel = loggingLevel;
+    this.schemaName = indexerConfig.schemaName();
+    this.loggingLevel = indexerConfig.logLevel;
   }
 
   private shouldLog (logLevel: LogLevel): boolean {
@@ -58,7 +58,6 @@ export default class IndexerMeta {
         LogLevel[entry.level],
         entry.message
       ]);
-
       const query = format(this.logInsertQueryTemplate, this.schemaName, values);
       await this.pgClient.query(query);
     }, `Failed to insert ${entriesArray.length > 1 ? 'logs' : 'log'} into the ${this.schemaName}.__logs table`)