Skip to content

Commit 4f5a02d

Browse files
committed
fix(satp-hermes-3801): fix monitoring service
closes #3801 Signed-off-by: Rafael Belchior <[email protected]>
1 parent 3e94b11 commit 4f5a02d

File tree

7 files changed

+70
-238
lines changed

7 files changed

+70
-238
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,6 @@ tools/docker/geth-testnet/data-geth1/
7373
.history/
7474
.manual-geth-artillery-config.yaml
7575
packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/fixtures/go/asset-transfer-private-data/chaincode-go/chaincode-go
76+
77+
78+
*.sqlite3

packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/get-block/cacti-block-formatters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export function formatCactiFullBlockResponse(
6464
JSON.stringify(blockEvent),
6565
);
6666
}
67-
const blockNumber = header ? fabricLongToNumber(header.number) : -1;
67+
const blockNumber = header ? Number(header.number) : -1;
6868
const blockHash =
6969
"0x" + Buffer.from(blockEvent.header?.data_hash ?? "").toString("hex");
7070
const previousBlockHash =

packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ export class PluginLedgerConnectorFabric
16891689
}
16901690

16911691
return {
1692-
height: fabricLongToNumber(decodedResponse.height),
1692+
height: Number(decodedResponse.height),
16931693
currentBlockHash:
16941694
"0x" + Buffer.from(decodedResponse.currentBlockHash).toString("hex"),
16951695
previousBlockHash:

packages/cactus-plugin-satp-hermes/src/main/typescript/services/gateway/satp-manager.ts

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ import { ISATPLoggerConfig, SATPLogger } from "../../logging";
8585
import { NetworkId } from "../network-identification/chainid-list";
8686
import { LedgerType } from "@hyperledger/cactus-core-api";
8787
import { MonitorService } from "../monitoring/monitor";
88-
import { KnexMonitorRepository } from "../monitoring/monitor-repository";
8988

9089
export interface ISATPManagerOptions {
9190
logLevel?: LogLevelDesc;
@@ -168,21 +167,11 @@ export class SATPManager {
168167

169168
this.dbLogger = new SATPLogger(satpLoggerConfig);
170169
this.logger.debug(`${fnTag} dbLogger initialized: ${!!this.dbLogger}`);
171-
172-
const monitorRepo = new KnexMonitorRepository();
173170
this.monitorService = MonitorService.createOrGetMonitorService({
174-
repo: monitorRepo,
175-
});
176-
this.monitorService.init().then(() => {
177-
this.monitorService.exportLogs();
178-
this.monitorService.createMetric("satp.active_sessions");
179-
this.monitorService.createMetric("satp.transfer.count");
180-
this.monitorService.createMetric("satp.transfer.success");
181-
this.monitorService.createMetric("satp.transfer.failure");
182-
this.logger.info(`${fnTag} Monitoring service initialized`);
183-
}).catch(error => {
184-
this.logger.error(`${fnTag} Failed to initialize monitoring service: ${error}`);
171+
logLevel: options.logLevel,
185172
});
173+
174+
void this.initializeMonitorService();
186175

187176
const serviceClasses = [
188177
Stage0ServerService as unknown as SATPServiceInstance,
@@ -216,7 +205,20 @@ export class SATPManager {
216205

217206
this.orchestrator.addHandlers(this.satpHandlers);
218207
}
219-
208+
private async initializeMonitorService(): Promise<void> {
209+
const fnTag = `${this.className}#initializeMonitorService()`;
210+
try {
211+
await this.monitorService.init();
212+
await this.monitorService.createMetric("satp.active_sessions");
213+
await this.monitorService.createMetric("satp.transfer.count");
214+
await this.monitorService.createMetric("satp.transfer.success");
215+
await this.monitorService.createMetric("satp.transfer.failure");
216+
this.logger.info(`${fnTag} Monitoring service initialized`);
217+
} catch (error) {
218+
// Log error but don't throw - allow service to continue without monitoring
219+
this.logger.warn(`${fnTag} Failed to initialize monitoring service: ${error}`);
220+
}
221+
}
220222
public get pubKey(): string {
221223
return this._pubKey;
222224
}
@@ -270,7 +272,7 @@ export class SATPManager {
270272
const span = this.monitorService.startSpan(fnTag);
271273
try {
272274
const activeSessionsCount = this.sessions.size;
273-
void this.monitorService.incrementMetric("satp.active_sessions", activeSessionsCount);
275+
void this.monitorService.incrementCounter("satp.active_sessions", activeSessionsCount);
274276
this.logger.debug(`${fnTag} active sessions: ${activeSessionsCount}`);
275277
return this.sessions;
276278
} catch (error) {
@@ -1077,4 +1079,6 @@ export class SATPManager {
10771079
throw new TransactError(fnTag, error);
10781080
}
10791081
}
1082+
1083+
10801084
}

packages/cactus-plugin-satp-hermes/src/main/typescript/services/monitoring/monitor-repository.ts

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)