X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fperformance%2FPerformanceStatistics.ts;h=6471265efa45136e3bf03c75f43de1ea58b54163;hb=5d0498291974ec3a130ba4b1c4663d13d16992c5;hp=c25cde0d1816de3a6ef2fb826538cbff4026930a;hpb=d4c3e68a1a6321f2f43ef0521e121e827f3eb29b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/PerformanceStatistics.ts b/src/performance/PerformanceStatistics.ts
index c25cde0d..6471265e 100644
--- a/src/performance/PerformanceStatistics.ts
+++ b/src/performance/PerformanceStatistics.ts
@@ -4,15 +4,31 @@ import { type PerformanceEntry, PerformanceObserver, performance } from 'node:pe
 import type { URL } from 'node:url';
 import { parentPort } from 'node:worker_threads';
 
-import { MessageChannelUtils } from '../charging-station';
 import {
+  ConfigurationSection,
   type IncomingRequestCommand,
+  type LogConfiguration,
   MessageType,
   type RequestCommand,
   type Statistics,
-  type TimeSeries,
+  type StorageConfiguration,
+  type TimestampedData,
 } from '../types';
-import { CircularArray, Configuration, Constants, Utils, logger } from '../utils';
+import {
+  CircularArray,
+  Configuration,
+  Constants,
+  JSONStringifyWithMapSupport,
+  buildPerformanceStatisticsMessage,
+  extractTimeSeriesValues,
+  formatDurationSeconds,
+  generateUUID,
+  logPrefix,
+  logger,
+  median,
+  nthPercentile,
+  stdDeviation,
+} from '../utils';
 
 export class PerformanceStatistics {
   private static readonly instances: Map<string, PerformanceStatistics> = new Map<
@@ -24,7 +40,7 @@ export class PerformanceStatistics {
   private readonly objName: string;
   private performanceObserver!: PerformanceObserver;
   private readonly statistics: Statistics;
-  private displayInterval!: NodeJS.Timeout;
+  private displayInterval?: NodeJS.Timeout;
 
   private constructor(objId: string, objName: string, uri: URL) {
     this.objId = objId;
@@ -42,7 +58,7 @@ export class PerformanceStatistics {
   public static getInstance(
     objId: string,
     objName: string,
-    uri: URL
+    uri: URL,
   ): PerformanceStatistics | undefined {
     if (!PerformanceStatistics.instances.has(objId)) {
       PerformanceStatistics.instances.set(objId, new PerformanceStatistics(objId, objName, uri));
@@ -51,7 +67,7 @@ export class PerformanceStatistics {
   }
 
   public static beginMeasure(id: string): string {
-    const markId = `${id.charAt(0).toUpperCase()}${id.slice(1)}~${Utils.generateUUID()}`;
+    const markId = `${id.charAt(0).toUpperCase()}${id.slice(1)}~${generateUUID()}`;
     performance.mark(markId);
     return markId;
   }
@@ -64,45 +80,45 @@ export class PerformanceStatistics {
 
   public addRequestStatistic(
     command: RequestCommand | IncomingRequestCommand,
-    messageType: MessageType
+    messageType: MessageType,
   ): void {
     switch (messageType) {
       case MessageType.CALL_MESSAGE:
         if (
           this.statistics.statisticsData.has(command) &&
-          this.statistics.statisticsData.get(command)?.countRequest
+          this.statistics.statisticsData.get(command)?.requestCount
         ) {
-          this.statistics.statisticsData.get(command).countRequest++;
+          ++this.statistics.statisticsData.get(command)!.requestCount!;
         } else {
           this.statistics.statisticsData.set(command, {
             ...this.statistics.statisticsData.get(command),
-            countRequest: 1,
+            requestCount: 1,
           });
         }
         break;
       case MessageType.CALL_RESULT_MESSAGE:
         if (
           this.statistics.statisticsData.has(command) &&
-          this.statistics.statisticsData.get(command)?.countResponse
+          this.statistics.statisticsData.get(command)?.responseCount
         ) {
-          this.statistics.statisticsData.get(command).countResponse++;
+          ++this.statistics.statisticsData.get(command)!.responseCount!;
         } else {
           this.statistics.statisticsData.set(command, {
             ...this.statistics.statisticsData.get(command),
-            countResponse: 1,
+            responseCount: 1,
           });
         }
         break;
       case MessageType.CALL_ERROR_MESSAGE:
         if (
           this.statistics.statisticsData.has(command) &&
-          this.statistics.statisticsData.get(command)?.countError
+          this.statistics.statisticsData.get(command)?.errorCount
         ) {
-          this.statistics.statisticsData.get(command).countError++;
+          ++this.statistics.statisticsData.get(command)!.errorCount!;
         } else {
           this.statistics.statisticsData.set(command, {
             ...this.statistics.statisticsData.get(command),
-            countError: 1,
+            errorCount: 1,
           });
         }
         break;
@@ -115,11 +131,21 @@ export class PerformanceStatistics {
 
   public start(): void {
     this.startLogStatisticsInterval();
-    if (Configuration.getPerformanceStorage().enabled) {
+    if (
+      Configuration.getConfigurationSection<StorageConfiguration>(
+        ConfigurationSection.performanceStorage,
+      ).enabled
+    ) {
       logger.info(
         `${this.logPrefix()} storage enabled: type ${
-          Configuration.getPerformanceStorage().type
-        }, uri: ${Configuration.getPerformanceStorage().uri}`
+          Configuration.getConfigurationSection<StorageConfiguration>(
+            ConfigurationSection.performanceStorage,
+          ).type
+        }, uri: ${
+          Configuration.getConfigurationSection<StorageConfiguration>(
+            ConfigurationSection.performanceStorage,
+          ).uri
+        }`,
       );
     }
   }
@@ -141,7 +167,7 @@ export class PerformanceStatistics {
       const lastPerformanceEntry = performanceObserverList.getEntries()[0];
       // logger.debug(
       //   `${this.logPrefix()} '${lastPerformanceEntry.name}' performance entry: %j`,
-      //   lastPerformanceEntry
+      //   lastPerformanceEntry,
       // );
       this.addPerformanceEntryToStatistics(lastPerformanceEntry);
     });
@@ -151,28 +177,33 @@ export class PerformanceStatistics {
   private logStatistics(): void {
     logger.info(`${this.logPrefix()}`, {
       ...this.statistics,
-      statisticsData: Utils.JSONStringifyWithMapSupport(this.statistics.statisticsData),
+      statisticsData: JSONStringifyWithMapSupport(this.statistics.statisticsData),
     });
   }
 
   private startLogStatisticsInterval(): void {
-    const logStatisticsInterval = Configuration.getLogStatisticsInterval();
+    const logStatisticsInterval = Configuration.getConfigurationSection<LogConfiguration>(
+      ConfigurationSection.log,
+    ).enabled
+      ? Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log)
+          .statisticsInterval!
+      : 0;
     if (logStatisticsInterval > 0 && !this.displayInterval) {
       this.displayInterval = setInterval(() => {
         this.logStatistics();
       }, logStatisticsInterval * 1000);
       logger.info(
-        `${this.logPrefix()} logged every ${Utils.formatDurationSeconds(logStatisticsInterval)}`
+        `${this.logPrefix()} logged every ${formatDurationSeconds(logStatisticsInterval)}`,
       );
     } else if (this.displayInterval) {
       logger.info(
-        `${this.logPrefix()} already logged every ${Utils.formatDurationSeconds(
-          logStatisticsInterval
-        )}`
+        `${this.logPrefix()} already logged every ${formatDurationSeconds(logStatisticsInterval)}`,
       );
-    } else {
+    } else if (
+      Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log).enabled
+    ) {
       logger.info(
-        `${this.logPrefix()} log interval is set to ${logStatisticsInterval?.toString()}. Not logging statistics`
+        `${this.logPrefix()} log interval is set to ${logStatisticsInterval?.toString()}. Not logging statistics`,
       );
     }
   }
@@ -192,68 +223,58 @@ export class PerformanceStatistics {
     }
     // Update current statistics
     this.statistics.updatedAt = new Date();
-    this.statistics.statisticsData.get(entryName).countTimeMeasurement =
-      this.statistics.statisticsData.get(entryName)?.countTimeMeasurement
-        ? this.statistics.statisticsData.get(entryName).countTimeMeasurement + 1
-        : 1;
-    this.statistics.statisticsData.get(entryName).currentTimeMeasurement = entry.duration;
-    this.statistics.statisticsData.get(entryName).minTimeMeasurement =
-      this.statistics.statisticsData.get(entryName)?.minTimeMeasurement
-        ? this.statistics.statisticsData.get(entryName).minTimeMeasurement > entry.duration
-          ? entry.duration
-          : this.statistics.statisticsData.get(entryName).minTimeMeasurement
-        : entry.duration;
-    this.statistics.statisticsData.get(entryName).maxTimeMeasurement =
-      this.statistics.statisticsData.get(entryName)?.maxTimeMeasurement
-        ? this.statistics.statisticsData.get(entryName).maxTimeMeasurement < entry.duration
-          ? entry.duration
-          : this.statistics.statisticsData.get(entryName).maxTimeMeasurement
-        : entry.duration;
-    this.statistics.statisticsData.get(entryName).totalTimeMeasurement =
-      this.statistics.statisticsData.get(entryName)?.totalTimeMeasurement
-        ? this.statistics.statisticsData.get(entryName).totalTimeMeasurement + entry.duration
-        : entry.duration;
-    this.statistics.statisticsData.get(entryName).avgTimeMeasurement =
-      this.statistics.statisticsData.get(entryName).totalTimeMeasurement /
-      this.statistics.statisticsData.get(entryName).countTimeMeasurement;
-    this.statistics.statisticsData.get(entryName)?.timeMeasurementSeries instanceof CircularArray
+    this.statistics.statisticsData.get(entryName)!.timeMeasurementCount =
+      (this.statistics.statisticsData.get(entryName)?.timeMeasurementCount ?? 0) + 1;
+    this.statistics.statisticsData.get(entryName)!.currentTimeMeasurement = entry.duration;
+    this.statistics.statisticsData.get(entryName)!.minTimeMeasurement = Math.min(
+      entry.duration,
+      this.statistics.statisticsData.get(entryName)?.minTimeMeasurement ?? Infinity,
+    );
+    this.statistics.statisticsData.get(entryName)!.maxTimeMeasurement = Math.max(
+      entry.duration,
+      this.statistics.statisticsData.get(entryName)?.maxTimeMeasurement ?? -Infinity,
+    );
+    this.statistics.statisticsData.get(entryName)!.totalTimeMeasurement =
+      (this.statistics.statisticsData.get(entryName)?.totalTimeMeasurement ?? 0) + entry.duration;
+    this.statistics.statisticsData.get(entryName)!.avgTimeMeasurement =
+      this.statistics.statisticsData.get(entryName)!.totalTimeMeasurement! /
+      this.statistics.statisticsData.get(entryName)!.timeMeasurementCount!;
+    this.statistics.statisticsData.get(entryName)?.measurementTimeSeries instanceof CircularArray
       ? this.statistics.statisticsData
           .get(entryName)
-          ?.timeMeasurementSeries?.push({ timestamp: entry.startTime, value: entry.duration })
-      : (this.statistics.statisticsData.get(entryName).timeMeasurementSeries =
-          new CircularArray<TimeSeries>(Constants.DEFAULT_CIRCULAR_BUFFER_CAPACITY, {
+          ?.measurementTimeSeries?.push({ timestamp: entry.startTime, value: entry.duration })
+      : (this.statistics.statisticsData.get(entryName)!.measurementTimeSeries =
+          new CircularArray<TimestampedData>(Constants.DEFAULT_CIRCULAR_BUFFER_CAPACITY, {
             timestamp: entry.startTime,
             value: entry.duration,
           }));
-    this.statistics.statisticsData.get(entryName).medTimeMeasurement = Utils.median(
-      this.extractTimeSeriesValues(
-        this.statistics.statisticsData.get(entryName).timeMeasurementSeries
-      )
+    this.statistics.statisticsData.get(entryName)!.medTimeMeasurement = median(
+      extractTimeSeriesValues(
+        this.statistics.statisticsData.get(entryName)!.measurementTimeSeries as TimestampedData[],
+      ),
     );
-    this.statistics.statisticsData.get(entryName).ninetyFiveThPercentileTimeMeasurement =
-      Utils.percentile(
-        this.extractTimeSeriesValues(
-          this.statistics.statisticsData.get(entryName).timeMeasurementSeries
+    this.statistics.statisticsData.get(entryName)!.ninetyFiveThPercentileTimeMeasurement =
+      nthPercentile(
+        extractTimeSeriesValues(
+          this.statistics.statisticsData.get(entryName)!.measurementTimeSeries as TimestampedData[],
         ),
-        95
+        95,
       );
-    this.statistics.statisticsData.get(entryName).stdDevTimeMeasurement = Utils.stdDeviation(
-      this.extractTimeSeriesValues(
-        this.statistics.statisticsData.get(entryName).timeMeasurementSeries
-      )
+    this.statistics.statisticsData.get(entryName)!.stdDevTimeMeasurement = stdDeviation(
+      extractTimeSeriesValues(
+        this.statistics.statisticsData.get(entryName)!.measurementTimeSeries as TimestampedData[],
+      ),
     );
-    if (Configuration.getPerformanceStorage().enabled) {
-      parentPort?.postMessage(
-        MessageChannelUtils.buildPerformanceStatisticsMessage(this.statistics)
-      );
+    if (
+      Configuration.getConfigurationSection<StorageConfiguration>(
+        ConfigurationSection.performanceStorage,
+      ).enabled
+    ) {
+      parentPort?.postMessage(buildPerformanceStatisticsMessage(this.statistics));
     }
   }
 
-  private extractTimeSeriesValues(timeSeries: CircularArray<TimeSeries>): number[] {
-    return timeSeries.map((timeSeriesItem) => timeSeriesItem.value);
-  }
-
   private logPrefix = (): string => {
-    return Utils.logPrefix(` ${this.objName} | Performance statistics`);
+    return logPrefix(` ${this.objName} | Performance statistics`);
   };
 }