Made some adaptations

Author: rpanic

packages/api/src/metrics/OpenTelemetryServer.ts

@@ -13,10 +13,11 @@ import { PrometheusExporter } from "@opentelemetry/exporter-prometheus";
 import { RuntimeNodeInstrumentation } from "@opentelemetry/instrumentation-runtime-node";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
 import { inject } from "tsyringe";
-import { DependencyFactory, DependencyRecord } from "@proto-kit/common";
+import { DependencyFactory, DependencyRecord, log } from "@proto-kit/common";
 
 import { SequencerInstrumentation } from "./SequencerInstrumentation";
 import { OpenTelemetryTracer } from "./OpenTelemetryTracer";
+import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
 
 export type OpenTelemetryServerConfig = {
   metrics?: {
@@ -91,5 +92,10 @@ export class OpenTelemetryServer
     });
 
     sdk.start();
+
+    // TODO Write logger to directly integrate with our logging library
+    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
+
+    log.info("OpenTelemetryServer started");
   }
 }

packages/common/src/config/ModuleContainer.ts

@@ -410,6 +410,12 @@ export class ModuleContainer<
         !this.container.isRegistered(key) ||
         declaration.forceOverwrite === true
       ) {
+        if (this.container.isRegistered(key) && declaration.forceOverwrite) {
+          log.warn(
+            `You are trying to overwrite dependency ${key}, which is already registered. This is currently not supported. Try to define your dependency earlier.`
+          );
+        }
+
         // Find correct provider type and call respective register
         if (isValueProvider(declaration)) {
           this.container.register(key, declaration);

packages/deployment/src/queue/InstantiatedBullQueue.ts

@@ -25,7 +25,7 @@ export class InstantiatedBullQueue implements InstantiatedQueue {
   }
 
   public async addTask(payload: TaskPayload): Promise<{ taskId: string }> {
-    log.debug("Adding task: ", payload);
+    log.trace("Adding task: ", payload);
     const job = await this.queue.add(this.name, payload, {
       attempts: this.options.retryAttempts ?? 2,
     });
@@ -37,7 +37,7 @@ export class InstantiatedBullQueue implements InstantiatedQueue {
       await this.events.waitUntilReady();
 
       this.events.on("completed", async (result) => {
-        log.debug("Completed task: ", result);
+        log.trace("Completed task: ", result);
         try {
           await this.listeners.executeListeners(
             // eslint-disable-next-line @typescript-eslint/consistent-type-assertions

packages/sequencer/src/protocol/production/sequencing/BlockProducerModule.ts

@@ -1,5 +1,5 @@
 import { inject } from "tsyringe";
-import { log } from "@proto-kit/common";
+import { injectOptional, log } from "@proto-kit/common";
 import {
   MethodIdResolver,
   MethodParameterEncoder,
@@ -41,7 +41,8 @@ export class BlockProducerModule extends SequencerModule<BlockConfig> {
 
   public constructor(
     @inject("Mempool") private readonly mempool: Mempool,
-    private readonly messageService: IncomingMessagesService,
+    @injectOptional("IncomingMessagesService")
+    private readonly messageService: IncomingMessagesService | undefined,
     @inject("UnprovenStateService")
     private readonly unprovenStateService: AsyncStateService,
     @inject("UnprovenMerkleStore")
@@ -171,6 +172,8 @@ export class BlockProducerModule extends SequencerModule<BlockConfig> {
     return undefined;
   }
 
+  // TODO Move to different service, to remove dependency on mempool and messagequeue
+  //  Idea: Create a service that aggregates a bunch of different sources
   @trace("block.collect_inputs")
   private async collectProductionData(): Promise<{
     txs: PendingTransaction[];
@@ -199,7 +202,10 @@ export class BlockProducerModule extends SequencerModule<BlockConfig> {
       };
     }
 
-    const messages = await this.messageService.getPendingMessages();
+    let messages: PendingTransaction[] = [];
+    if (this.messageService !== undefined) {
+      messages = await this.messageService.getPendingMessages();
+    }
 
     log.debug(
       `Block collected, ${txs.length} txs, ${messages.length} messages`

packages/sequencer/src/settlement/SettlementModule.ts

@@ -46,6 +46,7 @@ import { ProvenSettlementPermissions } from "./permissions/ProvenSettlementPermi
 import { SignedSettlementPermissions } from "./permissions/SignedSettlementPermissions";
 import { SettlementUtils } from "./utils/SettlementUtils";
 import { BridgingModule } from "./BridgingModule";
+import { IncomingMessagesService } from "./messages/IncomingMessagesService";
 
 export interface SettlementModuleConfig {
   feepayer: PrivateKey;
@@ -104,6 +105,9 @@ export class SettlementModule
       BridgingModule: {
         useClass: BridgingModule,
       },
+      IncomingMessagesService: {
+        useClass: IncomingMessagesService,
+      },
     };
   }
 

packages/sequencer/src/settlement/messages/IncomingMessagesService.ts

@@ -5,7 +5,7 @@ import { SettlementStorage } from "../../storage/repositories/SettlementStorage"
 import { MessageStorage } from "../../storage/repositories/MessageStorage";
 import { BlockStorage } from "../../storage/repositories/BlockStorage";
 import { PendingTransaction } from "../../mempool/PendingTransaction";
-import { SettlementModule } from "../SettlementModule";
+import type { SettlementModule } from "../SettlementModule";
 
 import { IncomingMessageAdapter } from "./IncomingMessageAdapter";
 

packages/sequencer/src/worker/worker/FlowTaskWorker.ts

@@ -93,7 +93,7 @@ export class FlowTaskWorker<Tasks extends Task<any, any>[]>
       log.debug(`Preparing task ${task.constructor.name}`);
       // eslint-disable-next-line no-await-in-loop
       await task.prepare();
-      log.trace(`${task.constructor.name} prepared`);
+      log.debug(`${task.constructor.name} prepared`);
     }
 
     const newWorkers = Object.fromEntries(

packages/stack/src/scripts/graphql/server.ts

@@ -196,6 +196,9 @@ export async function startServer() {
             url: "http://localhost:4318",
           },
         },
+        metrics: {
+          enabled: true,
+        },
       },
 
       Database: {