Change remaining references for console logs

Signed-off-by: Shubham Sharma <[email protected]>

Author: shubham1172

src/actors/client/ActorClient/ActorClient.ts

@@ -15,6 +15,7 @@ import CommunicationProtocolEnum from '../../../enum/CommunicationProtocol.enum'
 import GRPCClient from '../../../implementation/Client/GRPCClient/GRPCClient';
 import HTTPClient from '../../../implementation/Client/HTTPClient/HTTPClient';
 import IClientActor from '../../../interfaces/Client/IClientActor';
+import { Logger } from '../../../logger/Logger';
 import { DaprClientOptions } from '../../../types/DaprClientOptions';
 import ActorClientGRPC from './ActorClientGRPC';
 import ActorClientHTTP from './ActorClientHTTP';
@@ -34,16 +35,18 @@ export default class ActorClient {
     this.communicationProtocol = communicationProtocol;
     this.options = options;
 
+    let logger = new Logger(this.options.loggerOptions);
+
     // Builder
     switch (communicationProtocol) {
       case CommunicationProtocolEnum.GRPC: {
-        const client = new GRPCClient(this.daprHost, this.daprPort, this.options);
+        const client = new GRPCClient(this.daprHost, this.daprPort, this.options, logger);
         this.actor = new ActorClientGRPC(client);
         break;
       }
       case CommunicationProtocolEnum.HTTP:
       default: {
-        const client = new HTTPClient(this.daprHost, this.daprPort, this.options);
+        const client = new HTTPClient(this.daprHost, this.daprPort, this.options, logger);
         this.actor = new ActorClientHTTP(client);
         break;
       }

src/actors/runtime/AbstractActor.ts

@@ -13,6 +13,7 @@ limitations under the License.
 
 import { Temporal } from "@js-temporal/polyfill";
 import DaprClient from "../../implementation/Client/DaprClient";
+import { Logger } from "../../logger/Logger";
 import ActorId from "../ActorId";
 import ActorClient from "../client/ActorClient/ActorClient";
 import ActorStateManager from "./ActorStateManager";
@@ -42,6 +43,10 @@ export default abstract class AbstractActor {
   private readonly actorClient: ActorClient;
   private readonly daprStateProvider: StateProvider;
   private readonly actorType: any; // set at constructor level
+  private readonly logger: Logger;
+
+  private readonly LOG_COMPONENT: string = "Actors";
+  private readonly LOG_AREA: string = "AbstractActor";
 
   /**
    * Instantiates a new Actor
@@ -52,7 +57,7 @@ export default abstract class AbstractActor {
   constructor(daprClient: DaprClient, id: ActorId) {
     this.daprClient = daprClient;
     this.actorClient = new ActorClient(daprClient.getDaprHost(), daprClient.getDaprPort(), daprClient.getCommunicationProtocol(), daprClient.getOptions());
-
+    this.logger = new Logger(daprClient.getOptions().loggerOptions)
     this.id = id;
 
     this.stateManager = new ActorStateManager(this);
@@ -201,7 +206,7 @@ export default abstract class AbstractActor {
   }
 
   async receiveReminder(_data: string): Promise<void> {
-    console.warn(JSON.stringify({
+    this.logger.warn(this.LOG_COMPONENT, this.LOG_AREA, JSON.stringify({
       error: "ACTOR_METHOD_NOT_IMPLEMENTED",
       errorMsg: `A reminder was created for the actor with id: ${this.id} but the method 'receiveReminder' was not implemented`,
     }));

src/actors/runtime/ActorManager.ts

@@ -87,7 +87,6 @@ export default class ActorManager<T extends AbstractActor> {
 
   async getActiveActor(actorId: ActorId): Promise<T> {
     if (!this.actors.has(actorId.getId())) {
-      // console.log(`Doesn't have active actor (${actorId.getId()}), activating it`);
       await this.activateActor(actorId);
     }
 

src/implementation/Client/DaprClient.ts

@@ -73,6 +73,9 @@ export default class DaprClient {
   readonly configuration: IClientConfiguration;
   readonly actor: IClientActorBuilder;
 
+  private readonly LOG_COMPONENT: string = "DaprClient";
+  private readonly LOG_AREA: string = "DaprClient";
+
   constructor(
     daprHost?: string
     , daprPort?: string
@@ -145,9 +148,9 @@ export default class DaprClient {
     let isHealthyRetryCount = 0;
     const isHealthyMaxRetryCount = 60; // 1s startup delay and we try max for 60s
 
-    console.log(`[Dapr-JS][Client] Awaiting Sidecar to be Started`);
+    this.logger.info(this.LOG_COMPONENT, this.LOG_AREA, `Awaiting Sidecar to be Started`);
     while (!isHealthy) {
-      console.log(`[Dapr-JS][Client] Waiting till Dapr Sidecar Started (#${isHealthyRetryCount})`);
+      this.logger.verbose(this.LOG_COMPONENT, this.LOG_AREA,`Waiting for the Dapr Sidecar to start, retry count: (#${isHealthyRetryCount})`);
       await NodeJSUtils.sleep(Settings.getDaprSidecarPollingDelayMs());
 
       // Implement API call manually as we need to enable calling without initialization
@@ -174,7 +177,7 @@ export default class DaprClient {
     await this.awaitSidecarStarted();
     await this.daprClient.start();
     await this.daprClient.setIsInitialized(true);
-    console.log(`[Dapr-JS][Client] Sidecar Started`);
+    this.logger.info(this.LOG_COMPONENT, this.LOG_AREA, "Sidecar Started");
   }
 
   getDaprClient(): IClient {

src/implementation/Client/GRPCClient/GRPCClient.ts

@@ -85,7 +85,7 @@ export default class GRPCClient implements IClient {
     return new Promise((resolve, reject) => {
       this.client.waitForReady(deadline, (err?) => {
         if (err) {
-          console.error(err);
+          this.logger.error(this.LOG_COMPONENT, this.LOG_AREA, `Error waiting for client to be ready: ${err}`);
           return reject();
         }
 

src/implementation/Client/HTTPClient/HTTPClient.ts

@@ -162,7 +162,6 @@ export default class HTTPClient implements IClient {
 
     this.logger.debug(this.LOG_COMPONENT, this.LOG_AREA, `Fetching ${params.method} ${urlFull} with body: (${params.body})`);
 
-    // console.log(`${params.method} - ${urlFull} (${params.body})`);
     const res = await fetch(urlFull, params);
 
     // Parse body

src/implementation/Server/DaprServer.ts

@@ -51,6 +51,9 @@ export default class DaprServer {
   readonly actor: IServerActor;
   readonly client: DaprClient;
 
+  private readonly LOG_COMPONENT: string = "DaprServer";
+  private readonly LOG_AREA: string = "DaprServer";
+
   constructor(
     serverHost?: string
     , serverPort?: string
@@ -117,7 +120,7 @@ export default class DaprServer {
     await this.client.start();
 
     // We are initialized
-    console.log(`[Dapr-JS][Server] Sidecar Started`);
+    this.logger.info(this.LOG_COMPONENT, this.LOG_AREA, "Sidecar Started");
   }
 
   async stop(): Promise<void> {

src/implementation/Server/HTTPServer/pubsub.ts

@@ -53,7 +53,7 @@ export default class HTTPServerPubSub implements IServerPubSub {
       }
 
       // Let Dapr know that the message was processed correctly
-      // console.log(`[Dapr API][PubSub][route-${topic}] Ack'ing the message`);
+      this.logger.debug(this.LOG_COMPONENT, this.LOG_AREA, `[route-${topic}] Ack'ing the message`);
       return res.send({ success: true });
     });
   }