@oino-ts/common 0.9.0 → 0.10.0

package/dist/cjs/OINOBenchmark.js

@@ -56,8 +56,8 @@ class OINOBenchmark {
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    static start(module, method) {
-        OINOBenchmark._instance?._start(module, method);
+    static startMetric(module, method) {
+        OINOBenchmark._instance?._startMetric(module, method);
     }
     /**
      * Complete benchmark timing
@@ -66,8 +66,8 @@ class OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    static end(module, method, category) {
-        return OINOBenchmark._instance?._end(module, method, category) || 0;
+    static endMetric(module, method, category = "OK") {
+        OINOBenchmark._instance?._endMetric(module, method, category);
     }
     /**
      * Get given benchmark data.
@@ -76,27 +76,64 @@ class OINOBenchmark {
      * @param method of the benchmark
      *
      */
-    static get(module, method) {
-        return OINOBenchmark._instance?._get(module, method);
+    static getMetric(module, method) {
+        return OINOBenchmark._instance?._getMetric(module, method);
     }
     /**
      * Get all benchmark data.
      *
      */
-    static getAll() {
-        return OINOBenchmark._instance?._getAll();
+    static getMetrics() {
+        return OINOBenchmark._instance?._getMetrics();
+    }
+    /**
+     * Track a metric value
+     *
+     * @param value of the metric
+     * @param module of the metric
+     * @param method of the metric
+     * @param category optional subcategory of the metric
+     *
+     */
+    static trackMetric(module, method, category, value) {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackMetric(module, method, category, value);
+        }
+    }
+    /**
+     * Track an exception
+     *
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * @param category optional subcategory of the benchmark
+     * @param name of the exception
+     * @param message of the exception
+     * @param stack trace of the exception
+     */
+    static trackException(module, method, category, name, message, stack) {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackException(module, method, category, name, message, stack);
+        }
+    }
+    /**
+     * Get all tracked exceptions.
+     *
+     */
+    static getExceptions() {
+        return OINOBenchmark._instance?._getExceptions();
     }
 }
 exports.OINOBenchmark = OINOBenchmark;
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- *
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. *
  */
 class OINOMemoryBenchmark extends OINOBenchmark {
     _benchmarkCount = {};
     _benchmarkData = {};
     _benchmarkStart = {};
+    _exceptions = [];
     /**
      * Reset benchmark data (but not what is enabled).
      *
@@ -111,13 +148,9 @@ class OINOMemoryBenchmark extends OINOBenchmark {
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    _start(module, method) {
+    _startMetric(module, method) {
         const name = module + "." + method;
-        if (OINOBenchmark._enabled[module]) {
-            if (this._benchmarkCount[name] == undefined) {
-                this._benchmarkCount[name] = 0;
-                this._benchmarkData[name] = 0;
-            }
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
             this._benchmarkStart[name] = performance.now();
         }
     }
@@ -128,25 +161,14 @@ class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    _end(module, method, category) {
+    _endMetric(module, method, category) {
         const name = module + "." + method;
         let result = 0;
-        if (OINOBenchmark._enabled[module]) {
+        if (OINOBenchmark._enabled[module] && (this._benchmarkStart[name] > 0)) { // if benchmark is started, end it
             const duration = performance.now() - this._benchmarkStart[name];
-            this._benchmarkCount[name] += 1;
-            this._benchmarkData[name] += duration;
-            if (category) {
-                const category_name = name + "." + category;
-                if (this._benchmarkCount[category_name] == undefined) {
-                    this._benchmarkCount[category_name] = 0;
-                    this._benchmarkData[category_name] = 0;
-                }
-                this._benchmarkCount[category_name] += 1;
-                this._benchmarkData[category_name] += duration;
-            }
-            result = this._benchmarkData[name] / this._benchmarkCount[name];
+            this._trackMetric(module, method, category, duration);
         }
-        return result;
+        return;
     }
     /**
      * Get given benchmark data.
@@ -155,7 +177,7 @@ class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      *
      */
-    _get(module, method) {
+    _getMetric(module, method) {
         const name = module + "." + method;
         if (OINOBenchmark._enabled[module] && (this._benchmarkCount[name] > 0)) {
             return this._benchmarkData[module] / this._benchmarkCount[module];
@@ -166,7 +188,7 @@ class OINOMemoryBenchmark extends OINOBenchmark {
      * Get all benchmark data.
      *
      */
-    _getAll() {
+    _getMetrics() {
         let result = {};
         for (const name in this._benchmarkData) {
             if (this._benchmarkCount[name] > 0) {
@@ -175,5 +197,33 @@ class OINOMemoryBenchmark extends OINOBenchmark {
         }
         return result;
     }
+    _trackMetric(module, method, category, value) {
+        const name = module + "." + method;
+        if (this._benchmarkCount[name] == undefined) {
+            this._benchmarkCount[name] = 1;
+            this._benchmarkData[name] = value;
+        }
+        else {
+            this._benchmarkCount[name] += 1;
+            this._benchmarkData[name] += value;
+        }
+        const category_name = name + "." + category;
+        if (this._benchmarkCount[category_name] == undefined) {
+            this._benchmarkCount[category_name] = 1;
+            this._benchmarkData[category_name] = value;
+        }
+        else {
+            this._benchmarkCount[category_name] += 1;
+            this._benchmarkData[category_name] += value;
+        }
+        this._benchmarkStart[name] = 0;
+    }
+    _trackException(module, method, category, name, message, stack) {
+        const exception = { module, method, category, name, message, stack };
+        this._exceptions.push(exception);
+    }
+    _getExceptions() {
+        return this._exceptions;
+    }
 }
 exports.OINOMemoryBenchmark = OINOMemoryBenchmark;

package/dist/cjs/OINOHtmlTemplate.js

@@ -116,10 +116,10 @@ class OINOHtmlTemplate {
      *
      */
     renderFromKeyValue(key, value, removeUnusedTags = true) {
-        _1.OINOBenchmark.start("OINOHtmlTemplate", "renderFromKeyValue");
+        _1.OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromKeyValue");
         this.setVariableFromValue(key, value);
         const result = this.render(removeUnusedTags);
-        _1.OINOBenchmark.end("OINOHtmlTemplate", "renderFromKeyValue");
+        _1.OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromKeyValue");
         return result;
     }
     /**
@@ -130,10 +130,10 @@ class OINOHtmlTemplate {
      *
      */
     renderFromObject(object, removeUnusedTags = true) {
-        _1.OINOBenchmark.start("OINOHtmlTemplate", "renderFromObject");
+        _1.OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromObject");
         this.setVariableFromProperties(object);
         const result = this.render(removeUnusedTags);
-        _1.OINOBenchmark.end("OINOHtmlTemplate", "renderFromObject");
+        _1.OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromObject");
         return result;
     }
     /**
@@ -149,7 +149,7 @@ class OINOHtmlTemplate {
      *
      */
     renderFromResult(result, removeUnusedTags = true, messageSeparator = "", includeErrorMessages = false, includeWarningMessages = false, includeInfoMessages = false, includeDebugMessages = false) {
-        _1.OINOBenchmark.start("OINOHtmlTemplate", "renderFromResult");
+        _1.OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromResult");
         this.setVariableFromValue("statusCode", result.statusCode.toString());
         this.setVariableFromValue("statusMessage", result.statusMessage.toString());
         let messages = [];
@@ -171,7 +171,7 @@ class OINOHtmlTemplate {
             this.setVariableFromValue("messages", messages.join(messageSeparator), false); // messages have been escaped already
         }
         const http_result = this.render(removeUnusedTags);
-        _1.OINOBenchmark.end("OINOHtmlTemplate", "renderFromResult");
+        _1.OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromResult");
         return http_result;
     }
 }

package/dist/esm/OINOBenchmark.js

@@ -53,8 +53,8 @@ export class OINOBenchmark {
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    static start(module, method) {
-        OINOBenchmark._instance?._start(module, method);
+    static startMetric(module, method) {
+        OINOBenchmark._instance?._startMetric(module, method);
     }
     /**
      * Complete benchmark timing
@@ -63,8 +63,8 @@ export class OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    static end(module, method, category) {
-        return OINOBenchmark._instance?._end(module, method, category) || 0;
+    static endMetric(module, method, category = "OK") {
+        OINOBenchmark._instance?._endMetric(module, method, category);
     }
     /**
      * Get given benchmark data.
@@ -73,26 +73,63 @@ export class OINOBenchmark {
      * @param method of the benchmark
      *
      */
-    static get(module, method) {
-        return OINOBenchmark._instance?._get(module, method);
+    static getMetric(module, method) {
+        return OINOBenchmark._instance?._getMetric(module, method);
     }
     /**
      * Get all benchmark data.
      *
      */
-    static getAll() {
-        return OINOBenchmark._instance?._getAll();
+    static getMetrics() {
+        return OINOBenchmark._instance?._getMetrics();
+    }
+    /**
+     * Track a metric value
+     *
+     * @param value of the metric
+     * @param module of the metric
+     * @param method of the metric
+     * @param category optional subcategory of the metric
+     *
+     */
+    static trackMetric(module, method, category, value) {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackMetric(module, method, category, value);
+        }
+    }
+    /**
+     * Track an exception
+     *
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * @param category optional subcategory of the benchmark
+     * @param name of the exception
+     * @param message of the exception
+     * @param stack trace of the exception
+     */
+    static trackException(module, method, category, name, message, stack) {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackException(module, method, category, name, message, stack);
+        }
+    }
+    /**
+     * Get all tracked exceptions.
+     *
+     */
+    static getExceptions() {
+        return OINOBenchmark._instance?._getExceptions();
     }
 }
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- *
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. *
  */
 export class OINOMemoryBenchmark extends OINOBenchmark {
     _benchmarkCount = {};
     _benchmarkData = {};
     _benchmarkStart = {};
+    _exceptions = [];
     /**
      * Reset benchmark data (but not what is enabled).
      *
@@ -107,13 +144,9 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    _start(module, method) {
+    _startMetric(module, method) {
         const name = module + "." + method;
-        if (OINOBenchmark._enabled[module]) {
-            if (this._benchmarkCount[name] == undefined) {
-                this._benchmarkCount[name] = 0;
-                this._benchmarkData[name] = 0;
-            }
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
             this._benchmarkStart[name] = performance.now();
         }
     }
@@ -124,25 +157,14 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    _end(module, method, category) {
+    _endMetric(module, method, category) {
         const name = module + "." + method;
         let result = 0;
-        if (OINOBenchmark._enabled[module]) {
+        if (OINOBenchmark._enabled[module] && (this._benchmarkStart[name] > 0)) { // if benchmark is started, end it
             const duration = performance.now() - this._benchmarkStart[name];
-            this._benchmarkCount[name] += 1;
-            this._benchmarkData[name] += duration;
-            if (category) {
-                const category_name = name + "." + category;
-                if (this._benchmarkCount[category_name] == undefined) {
-                    this._benchmarkCount[category_name] = 0;
-                    this._benchmarkData[category_name] = 0;
-                }
-                this._benchmarkCount[category_name] += 1;
-                this._benchmarkData[category_name] += duration;
-            }
-            result = this._benchmarkData[name] / this._benchmarkCount[name];
+            this._trackMetric(module, method, category, duration);
         }
-        return result;
+        return;
     }
     /**
      * Get given benchmark data.
@@ -151,7 +173,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      *
      */
-    _get(module, method) {
+    _getMetric(module, method) {
         const name = module + "." + method;
         if (OINOBenchmark._enabled[module] && (this._benchmarkCount[name] > 0)) {
             return this._benchmarkData[module] / this._benchmarkCount[module];
@@ -162,7 +184,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * Get all benchmark data.
      *
      */
-    _getAll() {
+    _getMetrics() {
         let result = {};
         for (const name in this._benchmarkData) {
             if (this._benchmarkCount[name] > 0) {
@@ -171,4 +193,32 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
         }
         return result;
     }
+    _trackMetric(module, method, category, value) {
+        const name = module + "." + method;
+        if (this._benchmarkCount[name] == undefined) {
+            this._benchmarkCount[name] = 1;
+            this._benchmarkData[name] = value;
+        }
+        else {
+            this._benchmarkCount[name] += 1;
+            this._benchmarkData[name] += value;
+        }
+        const category_name = name + "." + category;
+        if (this._benchmarkCount[category_name] == undefined) {
+            this._benchmarkCount[category_name] = 1;
+            this._benchmarkData[category_name] = value;
+        }
+        else {
+            this._benchmarkCount[category_name] += 1;
+            this._benchmarkData[category_name] += value;
+        }
+        this._benchmarkStart[name] = 0;
+    }
+    _trackException(module, method, category, name, message, stack) {
+        const exception = { module, method, category, name, message, stack };
+        this._exceptions.push(exception);
+    }
+    _getExceptions() {
+        return this._exceptions;
+    }
 }

package/dist/esm/OINOHtmlTemplate.js

@@ -113,10 +113,10 @@ export class OINOHtmlTemplate {
      *
      */
     renderFromKeyValue(key, value, removeUnusedTags = true) {
-        OINOBenchmark.start("OINOHtmlTemplate", "renderFromKeyValue");
+        OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromKeyValue");
         this.setVariableFromValue(key, value);
         const result = this.render(removeUnusedTags);
-        OINOBenchmark.end("OINOHtmlTemplate", "renderFromKeyValue");
+        OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromKeyValue");
         return result;
     }
     /**
@@ -127,10 +127,10 @@ export class OINOHtmlTemplate {
      *
      */
     renderFromObject(object, removeUnusedTags = true) {
-        OINOBenchmark.start("OINOHtmlTemplate", "renderFromObject");
+        OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromObject");
         this.setVariableFromProperties(object);
         const result = this.render(removeUnusedTags);
-        OINOBenchmark.end("OINOHtmlTemplate", "renderFromObject");
+        OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromObject");
         return result;
     }
     /**
@@ -146,7 +146,7 @@ export class OINOHtmlTemplate {
      *
      */
     renderFromResult(result, removeUnusedTags = true, messageSeparator = "", includeErrorMessages = false, includeWarningMessages = false, includeInfoMessages = false, includeDebugMessages = false) {
-        OINOBenchmark.start("OINOHtmlTemplate", "renderFromResult");
+        OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromResult");
         this.setVariableFromValue("statusCode", result.statusCode.toString());
         this.setVariableFromValue("statusMessage", result.statusMessage.toString());
         let messages = [];
@@ -168,7 +168,7 @@ export class OINOHtmlTemplate {
             this.setVariableFromValue("messages", messages.join(messageSeparator), false); // messages have been escaped already
         }
         const http_result = this.render(removeUnusedTags);
-        OINOBenchmark.end("OINOHtmlTemplate", "renderFromResult");
+        OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromResult");
         return http_result;
     }
 }

package/dist/types/OINOBenchmark.d.ts

@@ -30,15 +30,15 @@ export declare abstract class OINOBenchmark {
      *  @param modules array of those benchmarks that are enabled
      */
     static setEnabled(modules: string[]): void;
-    protected abstract _start(module: string, method: string): void;
+    protected abstract _startMetric(module: string, method: string): void;
     /**
      * Start benchmark timing.
      *
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    static start(module: string, method: string): void;
-    protected abstract _end(module: string, method: string, category?: string): number;
+    static startMetric(module: string, method: string): void;
+    protected abstract _endMetric(module: string, method: string, category: string): void;
     /**
      * Complete benchmark timing
      *
@@ -46,8 +46,8 @@ export declare abstract class OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    static end(module: string, method: string, category?: string): number;
-    protected abstract _get(module: string, method: string): number;
+    static endMetric(module: string, method: string, category?: string): void;
+    protected abstract _getMetric(module: string, method: string): number;
     /**
      * Get given benchmark data.
      *
@@ -55,23 +55,53 @@ export declare abstract class OINOBenchmark {
      * @param method of the benchmark
      *
      */
-    static get(module: string, method: string): number;
-    protected abstract _getAll(): Record<string, number>;
+    static getMetric(module: string, method: string): number;
+    protected abstract _getMetrics(): Record<string, number>;
     /**
      * Get all benchmark data.
      *
      */
-    static getAll(): Record<string, number>;
+    static getMetrics(): Record<string, number>;
+    protected abstract _trackMetric(module: string, method: string, category: string, value: number): void;
+    /**
+     * Track a metric value
+     *
+     * @param value of the metric
+     * @param module of the metric
+     * @param method of the metric
+     * @param category optional subcategory of the metric
+     *
+     */
+    static trackMetric(module: string, method: string, category: string, value: number): void;
+    protected abstract _trackException(module: string, method: string, category: string, name: string, message: string, stack: string): void;
+    /**
+     * Track an exception
+     *
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * @param category optional subcategory of the benchmark
+     * @param name of the exception
+     * @param message of the exception
+     * @param stack trace of the exception
+     */
+    static trackException(module: string, method: string, category: string, name: string, message: string, stack: string): void;
+    protected abstract _getExceptions(): any[];
+    /**
+     * Get all tracked exceptions.
+     *
+     */
+    static getExceptions(): any[];
 }
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- *
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. *
  */
 export declare class OINOMemoryBenchmark extends OINOBenchmark {
-    private _benchmarkCount;
-    private _benchmarkData;
-    private _benchmarkStart;
+    protected _benchmarkCount: Record<string, number>;
+    protected _benchmarkData: Record<string, number>;
+    protected _benchmarkStart: Record<string, number>;
+    protected _exceptions: any[];
     /**
      * Reset benchmark data (but not what is enabled).
      *
@@ -83,7 +113,7 @@ export declare class OINOMemoryBenchmark extends OINOBenchmark {
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    protected _start(module: string, method: string): void;
+    protected _startMetric(module: string, method: string): void;
     /**
      * Complete benchmark timing
      *
@@ -91,7 +121,7 @@ export declare class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    protected _end(module: string, method: string, category?: string): number;
+    protected _endMetric(module: string, method: string, category: string): void;
     /**
      * Get given benchmark data.
      *
@@ -99,10 +129,13 @@ export declare class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      *
      */
-    protected _get(module: string, method: string): number;
+    protected _getMetric(module: string, method: string): number;
     /**
      * Get all benchmark data.
      *
      */
-    protected _getAll(): Record<string, number>;
+    protected _getMetrics(): Record<string, number>;
+    protected _trackMetric(module: string, method: string, category: string, value: number): void;
+    protected _trackException(module: string, method: string, category: string, name: string, message: string, stack: string): void;
+    protected _getExceptions(): any[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "OINO TS package for common classes.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,7 +19,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@oino-ts/types": "0.9.0"
+    "@oino-ts/types": "0.10.0"
   },
   "files": [
     "src/*.ts",

package/src/OINOBenchmark.ts

@@ -56,18 +56,18 @@ export abstract class OINOBenchmark {
         });
     }
 
-    protected abstract _start(module:string, method:string):void
+    protected abstract _startMetric(module:string, method:string):void
     /**
      * Start benchmark timing.
      *
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    static start(module:string, method:string):void {
-        OINOBenchmark._instance?._start(module, method)
+    static startMetric(module:string, method:string):void {
+        OINOBenchmark._instance?._startMetric(module, method)
     }
 
-    protected abstract _end(module:string, method:string, category?:string):number
+    protected abstract _endMetric(module:string, method:string, category:string):void
     /**
      * Complete benchmark timing
      * 
@@ -75,11 +75,11 @@ export abstract class OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    static end(module:string, method:string, category?:string):number {
-        return OINOBenchmark._instance?._end(module, method, category) || 0
+    static endMetric(module:string, method:string, category:string = "OK"):void {
+        OINOBenchmark._instance?._endMetric(module, method, category)
     }
 
-    protected abstract _get(module:string, method:string):number
+    protected abstract _getMetric(module:string, method:string):number
     /**
      * Get given benchmark data.
      * 
@@ -87,30 +87,74 @@ export abstract class OINOBenchmark {
      * @param method of the benchmark
      * 
      */
-    static get(module:string, method:string):number {
-        return OINOBenchmark._instance?._get(module, method)
+    static getMetric(module:string, method:string):number {
+        return OINOBenchmark._instance?._getMetric(module, method)
     }
 
-    protected abstract _getAll():Record<string, number>
+    protected abstract _getMetrics():Record<string, number>
     /**
      * Get all benchmark data.
      * 
      */
-    static getAll():Record<string, number> {
-        return OINOBenchmark._instance?._getAll()
+    static getMetrics():Record<string, number> {
+        return OINOBenchmark._instance?._getMetrics()
+    }
+
+    protected abstract _trackMetric(module:string, method:string, category:string, value:number):void
+    /**
+     * Track a metric value
+     * 
+     * @param value of the metric
+     * @param module of the metric
+     * @param method of the metric
+     * @param category optional subcategory of the metric
+     * 
+     */
+    static trackMetric(module:string, method:string, category:string, value:number):void {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackMetric(module, method, category, value)
+        }
+    }
+
+    protected abstract _trackException(module:string, method:string, category:string, name:string, message:string, stack: string):void
+    /**
+     * Track an exception
+     * 
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * @param category optional subcategory of the benchmark
+     * @param name of the exception
+     * @param message of the exception
+     * @param stack trace of the exception
+     */
+    static trackException(module:string, method:string, category:string, name:string, message:string, stack:string):void {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackException(module, method, category, name, message, stack)
+        }
+    }
+
+    protected abstract _getExceptions():any[]
+    /**
+     * Get all tracked exceptions.
+     * 
+     */
+    static getExceptions():any[] {
+        return OINOBenchmark._instance?._getExceptions()
     }
 }
 
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- * 
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. * 
  */
 export class OINOMemoryBenchmark extends OINOBenchmark {
 
-    private _benchmarkCount:Record<string, number> = {}
-    private _benchmarkData:Record<string, number> = {}
-    private _benchmarkStart:Record<string, number> = {}
+    protected _benchmarkCount:Record<string, number> = {}
+    protected _benchmarkData:Record<string, number> = {}
+    protected _benchmarkStart:Record<string, number> = {}
+
+    protected _exceptions:any[] = []
 
     /**
      * Reset benchmark data (but not what is enabled).
@@ -127,13 +171,9 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * @param module of the benchmark
      * @param method of the benchmark
      */
-    protected _start(module:string, method:string):void {
+    protected _startMetric(module:string, method:string):void {
         const name:string = module + "." + method
-        if (OINOBenchmark._enabled[module]) {
-            if (this._benchmarkCount[name] == undefined) {
-                this._benchmarkCount[name] = 0
-                this._benchmarkData[name] = 0
-            }
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
             this._benchmarkStart[name] = performance.now()
         }
     }
@@ -145,25 +185,14 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      * @param category optional subcategory of the benchmark
      */
-    protected _end(module:string, method:string, category?:string):number {
+    protected _endMetric(module:string, method:string, category:string):void {
         const name:string = module + "." + method
         let result:number = 0
-        if (OINOBenchmark._enabled[module]) {
+        if (OINOBenchmark._enabled[module] && (this._benchmarkStart[name] > 0)) { // if benchmark is started, end it
             const duration = performance.now() - this._benchmarkStart[name]
-            this._benchmarkCount[name] += 1
-            this._benchmarkData[name] += duration
-            if (category) {
-                const category_name = name + "." + category
-                if (this._benchmarkCount[category_name] == undefined) {
-                    this._benchmarkCount[category_name] = 0
-                    this._benchmarkData[category_name] = 0
-                }
-                this._benchmarkCount[category_name] += 1
-                this._benchmarkData[category_name] += duration
-            }
-            result = this._benchmarkData[name] / this._benchmarkCount[name]
+            this._trackMetric(module, method, category, duration)
         }
-        return result
+        return
     }
 
     /**
@@ -173,7 +202,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * @param method of the benchmark
      * 
      */
-    protected _get(module:string, method:string):number {
+    protected _getMetric(module:string, method:string):number {
         const name:string = module + "." + method
         if (OINOBenchmark._enabled[module] && (this._benchmarkCount[name] > 0)) {
             return this._benchmarkData[module] / this._benchmarkCount[module]
@@ -185,7 +214,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      * Get all benchmark data.
      * 
      */
-    protected _getAll():Record<string, number> {
+    protected _getMetrics():Record<string, number> {
         let result:Record<string, number> = {}
         for (const name in this._benchmarkData) {
             if (this._benchmarkCount[name] > 0) {
@@ -194,4 +223,35 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
         }
         return result
     }
+
+    protected _trackMetric(module:string, method:string, category:string, value:number):void {
+        const name:string = module + "." + method
+        if (this._benchmarkCount[name] == undefined) {
+            this._benchmarkCount[name] = 1
+            this._benchmarkData[name] = value
+        } else {
+            this._benchmarkCount[name] += 1
+            this._benchmarkData[name] += value
+        }
+
+        const category_name = name + "." + category
+        if (this._benchmarkCount[category_name] == undefined) {
+            this._benchmarkCount[category_name] = 1
+            this._benchmarkData[category_name] = value
+        } else {
+            this._benchmarkCount[category_name] += 1
+            this._benchmarkData[category_name] += value
+        }
+
+        this._benchmarkStart[name] = 0 
+    }
+
+    protected _trackException(module:string, method:string, category:string, name:string, message:string, stack:string):void {
+        const exception = { module, method, category, name, message, stack }
+        this._exceptions.push(exception)
+    }
+
+    protected _getExceptions():any[] {
+        return this._exceptions
+    }
 }

package/src/OINOHtmlTemplate.ts

@@ -124,10 +124,10 @@ export class OINOHtmlTemplate {
      * 
      */
     renderFromKeyValue(key:string, value:string, removeUnusedTags:boolean = true):OINOHttpResult {
-        OINOBenchmark.start("OINOHtmlTemplate", "renderFromKeyValue")
+        OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromKeyValue")
         this.setVariableFromValue(key, value)
         const result:OINOHttpResult = this.render(removeUnusedTags)
-        OINOBenchmark.end("OINOHtmlTemplate", "renderFromKeyValue")
+        OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromKeyValue")
         return result
     }
 
@@ -139,10 +139,10 @@ export class OINOHtmlTemplate {
      * 
      */
     renderFromObject(object:any, removeUnusedTags:boolean = true):OINOHttpResult {
-        OINOBenchmark.start("OINOHtmlTemplate", "renderFromObject")
+        OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromObject")
         this.setVariableFromProperties(object)
         const result:OINOHttpResult = this.render(removeUnusedTags)
-        OINOBenchmark.end("OINOHtmlTemplate", "renderFromObject")
+        OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromObject")
         return result
     }
 
@@ -159,7 +159,7 @@ export class OINOHtmlTemplate {
      * 
      */
     renderFromResult(result:OINOResult, removeUnusedTags:boolean=true, messageSeparator:string = "", includeErrorMessages:boolean=false, includeWarningMessages:boolean=false, includeInfoMessages:boolean=false, includeDebugMessages:boolean=false):OINOHttpResult {
-        OINOBenchmark.start("OINOHtmlTemplate", "renderFromResult")
+        OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromResult")
         this.setVariableFromValue("statusCode", result.statusCode.toString())
         this.setVariableFromValue("statusMessage", result.statusMessage.toString())
         let messages:string[] = []
@@ -182,7 +182,7 @@ export class OINOHtmlTemplate {
             this.setVariableFromValue("messages", messages.join(messageSeparator), false) // messages have been escaped already
         }        
         const http_result:OINOHttpResult = this.render(removeUnusedTags)
-        OINOBenchmark.end("OINOHtmlTemplate", "renderFromResult")
+        OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromResult")
         return http_result
     }
 };