Merge branch 'feature/monitoring' into feature/static-dependency-factory

Author: rpanic

packages/persistance/src/PrismaDatabaseConnection.ts

@@ -3,6 +3,7 @@ import {
   sequencerModule,
   SequencerModule,
   StorageDependencyMinimumDependencies,
+  Tracer,
 } from "@proto-kit/sequencer";
 import { DependencyFactory, OmitKeys } from "@proto-kit/common";
 
@@ -38,6 +39,10 @@ export class PrismaDatabaseConnection
   extends SequencerModule<PrismaDatabaseConfig>
   implements DependencyFactory, PrismaConnection
 {
+  public constructor(private readonly tracer: Tracer) {
+    super();
+  }
+
   private initializedClient: PrismaClient | undefined = undefined;
 
   public get prismaClient(): PrismaClient {
@@ -53,7 +58,7 @@ export class PrismaDatabaseConnection
   > {
     return {
       asyncStateService: {
-        useFactory: () => new PrismaStateService(this, "batch"),
+        useFactory: () => new PrismaStateService(this, "batch", this.tracer),
       },
       batchStorage: {
         useClass: PrismaBatchStore,
@@ -65,7 +70,7 @@ export class PrismaDatabaseConnection
         useClass: PrismaBlockStorage,
       },
       unprovenStateService: {
-        useFactory: () => new PrismaStateService(this, "block"),
+        useFactory: () => new PrismaStateService(this, "block", this.tracer),
       },
       settlementStorage: {
         useClass: PrismaSettlementStorage,

packages/persistance/src/PrismaRedisDatabase.ts

@@ -4,6 +4,7 @@ import {
   StorageDependencyMinimumDependencies,
   Database,
   closeable,
+  Tracer,
 } from "@proto-kit/sequencer";
 import { ChildContainerProvider } from "@proto-kit/common";
 import { PrismaClient } from "@prisma/client";
@@ -20,6 +21,7 @@ import {
   RedisConnectionModule,
   RedisTransaction,
 } from "./RedisConnection";
+import { inject } from "tsyringe";
 
 export interface PrismaRedisCombinedConfig {
   prisma: PrismaDatabaseConfig;
@@ -36,10 +38,10 @@ export class PrismaRedisDatabase
 
   public redis: RedisConnectionModule;
 
-  public constructor() {
+  public constructor(@inject("Tracer") tracer: Tracer) {
     super();
-    this.prisma = new PrismaDatabaseConnection();
-    this.redis = new RedisConnectionModule();
+    this.prisma = new PrismaDatabaseConnection(tracer);
+    this.redis = new RedisConnectionModule(tracer);
   }
 
   public get prismaClient(): PrismaClient {

packages/persistance/src/RedisConnection.ts

@@ -2,6 +2,7 @@ import { createClient, RedisClientType } from "redis";
 import {
   SequencerModule,
   StorageDependencyMinimumDependencies,
+  Tracer,
 } from "@proto-kit/sequencer";
 import { DependencyFactory } from "@proto-kit/common";
 import isArray from "lodash/isArray";
@@ -26,6 +27,10 @@ export class RedisConnectionModule
   extends SequencerModule<RedisConnectionConfig>
   implements DependencyFactory, RedisConnection
 {
+  public constructor(private readonly tracer: Tracer) {
+    super();
+  }
+
   private client?: RedisClientType;
 
   public get redisClient(): RedisClientType {
@@ -43,13 +48,15 @@ export class RedisConnectionModule
   > {
     return {
       asyncMerkleStore: {
-        useFactory: () => new RedisMerkleTreeStore(this),
+        useFactory: () => new RedisMerkleTreeStore(this, this.tracer),
       },
       unprovenMerkleStore: {
-        useFactory: () => new RedisMerkleTreeStore(this, "unproven"),
+        useFactory: () =>
+          new RedisMerkleTreeStore(this, this.tracer, "unproven"),
       },
       blockTreeStore: {
-        useFactory: () => new RedisMerkleTreeStore(this, "blockHash"),
+        useFactory: () =>
+          new RedisMerkleTreeStore(this, this.tracer, "blockHash"),
       },
     };
   }

packages/persistance/src/services/prisma/PrismaStateService.ts

@@ -1,4 +1,9 @@
-import { AsyncStateService, StateEntry } from "@proto-kit/sequencer";
+import {
+  AsyncStateService,
+  StateEntry,
+  Tracer,
+  trace,
+} from "@proto-kit/sequencer";
 import { Field } from "o1js";
 import { Prisma } from "@prisma/client";
 import { noop } from "@proto-kit/common";
@@ -19,12 +24,15 @@ export class PrismaStateService implements AsyncStateService {
   /**
    * @param connection
    * @param mask A indicator to which masking level the values belong
+   * @param tracer
    */
   public constructor(
     private readonly connection: PrismaConnection,
-    private readonly mask: string
+    private readonly mask: string,
+    public readonly tracer: Tracer
   ) {}
 
+  @trace("db.state.commit")
   public async commit(): Promise<void> {
     const { prismaClient } = this.connection;
 

packages/persistance/src/services/prisma/PrismaTransactionStorage.ts

@@ -1,5 +1,10 @@
 import { inject, injectable } from "tsyringe";
-import { PendingTransaction, TransactionStorage } from "@proto-kit/sequencer";
+import {
+  PendingTransaction,
+  trace,
+  Tracer,
+  TransactionStorage,
+} from "@proto-kit/sequencer";
 
 import type { PrismaConnection } from "../../PrismaDatabaseConnection";
 
@@ -9,9 +14,11 @@ import { TransactionMapper } from "./mappers/TransactionMapper";
 export class PrismaTransactionStorage implements TransactionStorage {
   public constructor(
     @inject("Database") private readonly connection: PrismaConnection,
-    private readonly transactionMapper: TransactionMapper
+    private readonly transactionMapper: TransactionMapper,
+    @inject("Tracer") public readonly tracer: Tracer
   ) {}
 
+  @trace("db.txs.get")
   public async getPendingUserTransactions(): Promise<PendingTransaction[]> {
     const { prismaClient } = this.connection;
 

packages/persistance/src/services/redis/RedisMerkleTreeStore.ts

@@ -2,6 +2,8 @@ import {
   AsyncMerkleTreeStore,
   MerkleTreeNode,
   MerkleTreeNodeQuery,
+  trace,
+  Tracer,
 } from "@proto-kit/sequencer";
 import { log, noop } from "@proto-kit/common";
 
@@ -12,6 +14,7 @@ export class RedisMerkleTreeStore implements AsyncMerkleTreeStore {
 
   public constructor(
     private readonly connection: RedisConnection,
+    public readonly tracer: Tracer,
     private readonly mask: string = "base"
   ) {}
 
@@ -23,6 +26,7 @@ export class RedisMerkleTreeStore implements AsyncMerkleTreeStore {
     noop();
   }
 
+  @trace("db.tree.commit")
   public async commit(): Promise<void> {
     const start = Date.now();
     const array: [string, string][] = this.cache.map(
@@ -45,6 +49,7 @@ export class RedisMerkleTreeStore implements AsyncMerkleTreeStore {
     this.cache = [];
   }
 
+  @trace("db.tree.read")
   public async getNodesAsync(
     nodes: MerkleTreeNodeQuery[]
   ): Promise<(bigint | undefined)[]> {

packages/sequencer/src/index.ts

@@ -102,5 +102,6 @@ export * from "./settlement/transactions/MinaTransactionSender";
 export * from "./settlement/transactions/MinaTransactionSimulator";
 export * from "./settlement/transactions/MinaSimulationService";
 export * from "./logging/Tracer";
+export * from "./logging/trace";
 export * from "./logging/ConsoleLoggingFactory";
 export * from "./logging/ConsoleTracer";