Review comments by @XavierGeerinck

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

Author: shubham1172

src/actors/client/ActorClient/ActorClient.ts

@@ -35,7 +35,7 @@ export default class ActorClient {
     this.communicationProtocol = communicationProtocol;
     this.options = options;
 
-    const logger = new Logger(this.options.loggerOptions);
+    const logger = new Logger(this.options.logger);
 
     // Builder
     switch (communicationProtocol) {

src/actors/runtime/AbstractActor.ts

@@ -57,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.logger = new Logger(daprClient.getOptions().logger)
     this.id = id;
 
     this.stateManager = new ActorStateManager(this);

src/implementation/Client/DaprClient.ts

@@ -88,7 +88,7 @@ export default class DaprClient {
     this.daprPort = daprPort ?? Settings.getDefaultPort(communicationProtocol);
     this.communicationProtocol = communicationProtocol;
     this.options = options;
-    this.logger = new Logger(this.options.loggerOptions);
+    this.logger = new Logger(this.options.logger);
 
     // Validation on port
     if (!/^[0-9]+$/.test(this.daprPort)) {

src/implementation/Server/DaprServer.ts

@@ -68,7 +68,7 @@ export default class DaprServer {
     this.serverPort = serverPort ?? Settings.getDefaultAppPort(communicationProtocol);
     this.daprHost = daprHost ?? Settings.getDefaultHost();
     this.daprPort = daprPort ?? Settings.getDefaultPort(communicationProtocol);
-    this.logger = new Logger(clientOptions.loggerOptions);
+    this.logger = new Logger(clientOptions.logger);
 
     // Create a client to interface with the sidecar from the server side
     this.client = new DaprClient(daprHost, daprPort, communicationProtocol, clientOptions);

src/index.ts

@@ -23,6 +23,7 @@ import { DaprClientOptions } from "./types/DaprClientOptions";
 import { LoggerOptions } from "./types/logger/LoggerOptions";
 import { LoggerService } from "./types/logger/LoggerService";
 import { ConsoleLoggerService } from "./logger/ConsoleLoggerService";
+import { LogLevel } from "./types/logger/LogLevel";
 
 export {
     DaprClient,
@@ -34,6 +35,7 @@ export {
     CommunicationProtocolEnum,
     Temporal,
     DaprClientOptions,
+    LogLevel,
     LoggerOptions,
     LoggerService,
     ConsoleLoggerService,

src/logger/Logger.ts

@@ -28,45 +28,45 @@ export class Logger {
      * @param options Logger options
      */
     constructor(options?: LoggerOptions) {
-        if (options !== undefined && options.logLevel !== undefined) {
-            this.logLevel = options.logLevel;
+        if (options !== undefined && options.level !== undefined) {
+            this.logLevel = options.level;
         } else {
-            this.logLevel = LogLevel.info;
+            this.logLevel = LogLevel.Info;
         }
 
-        if (options !== undefined && options.logService !== undefined) {
-            this.logService = options.logService;
+        if (options !== undefined && options.service !== undefined) {
+            this.logService = options.service;
         } else {
             this.logService = new ConsoleLoggerService();
         }
     }
 
     error(component: string, area: string, message: any, ...optionalParams: any[]): void {
-        if (this.logLevel >= LogLevel.error) {
+        if (this.logLevel >= LogLevel.Error) {
             this.logService.error(`[${component}, ${area}] ${message}`, ...optionalParams);
         }
     }
 
     warn(component: string, area: string, message: any, ...optionalParams: any[]): void {
-        if (this.logLevel >= LogLevel.warn) {
+        if (this.logLevel >= LogLevel.Warn) {
             this.logService.warn(`[${component}, ${area}] ${message}`, ...optionalParams);
         }
     }
 
     info(component: string, area: string, message: any, ...optionalParams: any[]): void {
-        if (this.logLevel >= LogLevel.info) {
+        if (this.logLevel >= LogLevel.Info) {
             this.logService.info(`[${component}, ${area}] ${message}`, ...optionalParams);
         }
     }
 
     verbose(component: string, area: string, message: any, ...optionalParams: any[]): void {
-        if (this.logLevel >= LogLevel.verbose) {
+        if (this.logLevel >= LogLevel.Verbose) {
             this.logService.verbose(`[${component}, ${area}] ${message}`, ...optionalParams);
         }
     }
 
     debug(component: string, area: string, message: any, ...optionalParams: any[]): void {
-        if (this.logLevel >= LogLevel.debug) {
+        if (this.logLevel >= LogLevel.Debug) {
             this.logService.debug(`[${component}, ${area}]: ${message}`, ...optionalParams);
         }
     }

src/types/DaprClientOptions.ts

@@ -15,5 +15,5 @@ import { LoggerOptions } from "./logger/LoggerOptions";
 
 export type DaprClientOptions = {
   isKeepAlive: boolean;
-  loggerOptions?: LoggerOptions;
+  logger?: LoggerOptions;
 }

src/types/logger/LogLevel.ts

@@ -15,9 +15,9 @@ limitations under the License.
  * LogLevel sets the level of logging that should be used.
  */
  export enum LogLevel {
-    error = 0,
-    warn = 1,
-    info = 2,
-    verbose = 3,
-    debug = 4,
+    Error = 0,
+    Warn = 1,
+    Info = 2,
+    Verbose = 3,
+    Debug = 4,
 }

src/types/logger/LoggerOptions.ts

@@ -18,6 +18,6 @@ import { LogLevel } from "./LogLevel"
  * LoggerOptions provides options for configuring the logger.
  */
 export type LoggerOptions = {
-    logLevel?: LogLevel
-    logService?: LoggerService
+    level?: LogLevel
+    service?: LoggerService
 }