X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2FPerformanceStatistics.ts;h=b7bc5d27f894c27c9984571e90a4b07187ed8fed;hb=42b8cf5cdca8eaab1e7442f7c92c2a5ed97434f6;hp=9672b381b98f19173d8512c32b7f7ce8aa5344b0;hpb=5edd8ba0f8978cfb3ca9d80f299d9748c6c5970e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/PerformanceStatistics.ts b/src/performance/PerformanceStatistics.ts
index 9672b381..b7bc5d27 100644
--- a/src/performance/PerformanceStatistics.ts
+++ b/src/performance/PerformanceStatistics.ts
@@ -4,11 +4,16 @@ import { type PerformanceEntry, PerformanceObserver, performance } from 'node:pe
 import type { URL } from 'node:url';
 import { parentPort } from 'node:worker_threads';
 
+import { secondsToMilliseconds } from 'date-fns';
+
 import {
+  ConfigurationSection,
   type IncomingRequestCommand,
+  type LogConfiguration,
   MessageType,
   type RequestCommand,
   type Statistics,
+  type StorageConfiguration,
   type TimestampedData,
 } from '../types';
 import {
@@ -16,13 +21,16 @@ import {
   Configuration,
   Constants,
   JSONStringifyWithMapSupport,
+  average,
   buildPerformanceStatisticsMessage,
   extractTimeSeriesValues,
   formatDurationSeconds,
   generateUUID,
   logPrefix,
   logger,
+  max,
   median,
+  min,
   nthPercentile,
   stdDeviation,
 } from '../utils';
@@ -37,7 +45,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;
@@ -85,7 +93,7 @@ export class PerformanceStatistics {
           this.statistics.statisticsData.has(command) &&
           this.statistics.statisticsData.get(command)?.requestCount
         ) {
-          ++this.statistics.statisticsData.get(command).requestCount;
+          ++this.statistics.statisticsData.get(command)!.requestCount!;
         } else {
           this.statistics.statisticsData.set(command, {
             ...this.statistics.statisticsData.get(command),
@@ -98,7 +106,7 @@ export class PerformanceStatistics {
           this.statistics.statisticsData.has(command) &&
           this.statistics.statisticsData.get(command)?.responseCount
         ) {
-          ++this.statistics.statisticsData.get(command).responseCount;
+          ++this.statistics.statisticsData.get(command)!.responseCount!;
         } else {
           this.statistics.statisticsData.set(command, {
             ...this.statistics.statisticsData.get(command),
@@ -111,7 +119,7 @@ export class PerformanceStatistics {
           this.statistics.statisticsData.has(command) &&
           this.statistics.statisticsData.get(command)?.errorCount
         ) {
-          ++this.statistics.statisticsData.get(command).errorCount;
+          ++this.statistics.statisticsData.get(command)!.errorCount!;
         } else {
           this.statistics.statisticsData.set(command, {
             ...this.statistics.statisticsData.get(command),
@@ -128,11 +136,15 @@ export class PerformanceStatistics {
 
   public start(): void {
     this.startLogStatisticsInterval();
-    if (Configuration.getPerformanceStorage().enabled) {
+    const performanceStorageConfiguration =
+      Configuration.getConfigurationSection<StorageConfiguration>(
+        ConfigurationSection.performanceStorage,
+      );
+    if (performanceStorageConfiguration.enabled) {
       logger.info(
-        `${this.logPrefix()} storage enabled: type ${
-          Configuration.getPerformanceStorage().type
-        }, uri: ${Configuration.getPerformanceStorage().uri}`,
+        `${this.logPrefix()} storage enabled: type ${performanceStorageConfiguration.type}, uri: ${
+          performanceStorageConfiguration.uri
+        }`,
       );
     }
   }
@@ -154,7 +166,7 @@ export class PerformanceStatistics {
       const lastPerformanceEntry = performanceObserverList.getEntries()[0];
       // logger.debug(
       //   `${this.logPrefix()} '${lastPerformanceEntry.name}' performance entry: %j`,
-      //   lastPerformanceEntry
+      //   lastPerformanceEntry,
       // );
       this.addPerformanceEntryToStatistics(lastPerformanceEntry);
     });
@@ -169,13 +181,16 @@ export class PerformanceStatistics {
   }
 
   private startLogStatisticsInterval(): void {
-    const logStatisticsInterval = Configuration.getLog().enabled
-      ? Configuration.getLog().statisticsInterval
+    const logConfiguration = Configuration.getConfigurationSection<LogConfiguration>(
+      ConfigurationSection.log,
+    );
+    const logStatisticsInterval = logConfiguration.enabled
+      ? logConfiguration.statisticsInterval!
       : 0;
     if (logStatisticsInterval > 0 && !this.displayInterval) {
       this.displayInterval = setInterval(() => {
         this.logStatistics();
-      }, logStatisticsInterval * 1000);
+      }, secondsToMilliseconds(logStatisticsInterval));
       logger.info(
         `${this.logPrefix()} logged every ${formatDurationSeconds(logStatisticsInterval)}`,
       );
@@ -183,9 +198,9 @@ export class PerformanceStatistics {
       logger.info(
         `${this.logPrefix()} already logged every ${formatDurationSeconds(logStatisticsInterval)}`,
       );
-    } else if (Configuration.getLog().enabled) {
+    } else if (logConfiguration.enabled) {
       logger.info(
-        `${this.logPrefix()} log interval is set to ${logStatisticsInterval?.toString()}. Not logging statistics`,
+        `${this.logPrefix()} log interval is set to ${logStatisticsInterval}. Not logging statistics`,
       );
     }
   }
@@ -198,52 +213,52 @@ export class PerformanceStatistics {
   }
 
   private addPerformanceEntryToStatistics(entry: PerformanceEntry): void {
-    const entryName = entry.name;
     // Initialize command statistics
-    if (!this.statistics.statisticsData.has(entryName)) {
-      this.statistics.statisticsData.set(entryName, {});
+    if (!this.statistics.statisticsData.has(entry.name)) {
+      this.statistics.statisticsData.set(entry.name, {});
     }
     // Update current statistics
-    this.statistics.updatedAt = new Date();
-    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(
+    this.statistics.statisticsData.get(entry.name)!.timeMeasurementCount =
+      (this.statistics.statisticsData.get(entry.name)?.timeMeasurementCount ?? 0) + 1;
+    this.statistics.statisticsData.get(entry.name)!.currentTimeMeasurement = entry.duration;
+    this.statistics.statisticsData.get(entry.name)!.minTimeMeasurement = min(
       entry.duration,
-      this.statistics.statisticsData.get(entryName)?.minTimeMeasurement ?? Infinity,
+      this.statistics.statisticsData.get(entry.name)?.minTimeMeasurement ?? Infinity,
     );
-    this.statistics.statisticsData.get(entryName).maxTimeMeasurement = Math.max(
+    this.statistics.statisticsData.get(entry.name)!.maxTimeMeasurement = max(
       entry.duration,
-      this.statistics.statisticsData.get(entryName)?.maxTimeMeasurement ?? -Infinity,
+      this.statistics.statisticsData.get(entry.name)?.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(entry.name)!.totalTimeMeasurement =
+      (this.statistics.statisticsData.get(entry.name)?.totalTimeMeasurement ?? 0) + entry.duration;
+    this.statistics.statisticsData.get(entry.name)?.measurementTimeSeries instanceof CircularArray
       ? this.statistics.statisticsData
-          .get(entryName)
+          .get(entry.name)
           ?.measurementTimeSeries?.push({ timestamp: entry.startTime, value: entry.duration })
-      : (this.statistics.statisticsData.get(entryName).measurementTimeSeries =
+      : (this.statistics.statisticsData.get(entry.name)!.measurementTimeSeries =
           new CircularArray<TimestampedData>(Constants.DEFAULT_CIRCULAR_BUFFER_CAPACITY, {
             timestamp: entry.startTime,
             value: entry.duration,
           }));
-    this.statistics.statisticsData.get(entryName).medTimeMeasurement = median(
-      extractTimeSeriesValues(this.statistics.statisticsData.get(entryName).measurementTimeSeries),
+    const timeMeasurementValues = extractTimeSeriesValues(
+      this.statistics.statisticsData.get(entry.name)!.measurementTimeSeries!,
     );
-    this.statistics.statisticsData.get(entryName).ninetyFiveThPercentileTimeMeasurement =
-      nthPercentile(
-        extractTimeSeriesValues(
-          this.statistics.statisticsData.get(entryName).measurementTimeSeries,
-        ),
-        95,
-      );
-    this.statistics.statisticsData.get(entryName).stdDevTimeMeasurement = stdDeviation(
-      extractTimeSeriesValues(this.statistics.statisticsData.get(entryName).measurementTimeSeries),
+    this.statistics.statisticsData.get(entry.name)!.avgTimeMeasurement =
+      average(timeMeasurementValues);
+    this.statistics.statisticsData.get(entry.name)!.medTimeMeasurement =
+      median(timeMeasurementValues);
+    this.statistics.statisticsData.get(entry.name)!.ninetyFiveThPercentileTimeMeasurement =
+      nthPercentile(timeMeasurementValues, 95);
+    this.statistics.statisticsData.get(entry.name)!.stdDevTimeMeasurement = stdDeviation(
+      timeMeasurementValues,
+      this.statistics.statisticsData.get(entry.name)!.avgTimeMeasurement,
     );
-    if (Configuration.getPerformanceStorage().enabled) {
+    this.statistics.updatedAt = new Date();
+    if (
+      Configuration.getConfigurationSection<StorageConfiguration>(
+        ConfigurationSection.performanceStorage,
+      ).enabled
+    ) {
       parentPort?.postMessage(buildPerformanceStatisticsMessage(this.statistics));
     }
   }