@axinom/mosaic-db-common 0.38.0-rc.0 → 0.38.0-rc.2

package/dist/monitoring/postgres-metrics.d.ts

@@ -7,8 +7,8 @@ import { DbLogger } from '../common';
  * or a value of `0` otherwise.
  *
  * @param pgPool The Postgres Pool to use for checking the connectivity. The connectivity test will be done at the point of metric collection.
- * @param pgPoolType The Postgres Pool to check connectivity for. The connectivity test will be done at the point of metric collection.
- * @param timeoutInMilliSeconds The maximum time the connectivity check will run during metric collection. Defaults to `1000ms`.
+ * @param pgPoolType The Postgres Pool to check connectivity for.
+ * @param timeoutInMilliSeconds The maximum time the connectivity check will run during metric collection. Defaults to `10000ms`.
  * @returns A `Gauge` metric with a name `ax_postgres_<pgPoolType>_connectivity`.
  */
 export declare const createPostgresPoolConnectivityMetric: (logger: DbLogger, pgPool: Pool, pgPoolType: 'dbOwnerPool' | 'envOwnerPool' | 'loginPool', timeoutInMilliSeconds?: number) => Metric<string>;

package/dist/monitoring/postgres-metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-metrics.d.ts","sourceRoot":"","sources":["../../src/monitoring/postgres-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAS,MAAM,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAUrC;;;;;;;;;GASG;AACH,eAAO,MAAM,oCAAoC,WACvC,QAAQ,UACR,IAAI,cACA,aAAa,GAAG,cAAc,GAAG,WAAW,qCAEvD,OAAO,MAAM,CAyBf,CAAC"}
+{"version":3,"file":"postgres-metrics.d.ts","sourceRoot":"","sources":["../../src/monitoring/postgres-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAS,MAAM,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAUrC;;;;;;;;;GASG;AACH,eAAO,MAAM,oCAAoC,WACvC,QAAQ,UACR,IAAI,cACA,aAAa,GAAG,cAAc,GAAG,WAAW,qCAEvD,OAAO,MAAM,CA2Bf,CAAC"}

package/dist/monitoring/postgres-metrics.js

@@ -9,21 +9,23 @@ const createTimeout = (timeoutInMilliSeconds) => new Promise((_, reject) => setT
  * or a value of `0` otherwise.
  *
  * @param pgPool The Postgres Pool to use for checking the connectivity. The connectivity test will be done at the point of metric collection.
- * @param pgPoolType The Postgres Pool to check connectivity for. The connectivity test will be done at the point of metric collection.
- * @param timeoutInMilliSeconds The maximum time the connectivity check will run during metric collection. Defaults to `1000ms`.
+ * @param pgPoolType The Postgres Pool to check connectivity for.
+ * @param timeoutInMilliSeconds The maximum time the connectivity check will run during metric collection. Defaults to `10000ms`.
  * @returns A `Gauge` metric with a name `ax_postgres_<pgPoolType>_connectivity`.
  */
-const createPostgresPoolConnectivityMetric = (logger, pgPool, pgPoolType, timeoutInMilliSeconds = 1000) => {
+const createPostgresPoolConnectivityMetric = (logger, pgPool, pgPoolType, timeoutInMilliSeconds = 10000) => {
     return new prom_client_1.Gauge({
         name: `ax_postgres_${pgPoolType}_connectivity`,
-        help: `Connection status from the service to the database via the ${pgPoolType}`,
+        help: `Connection time from the service to the database via the ${pgPoolType} in milliseconds`,
         async collect() {
             try {
+                const startTime = process.hrtime();
                 await Promise.race([
                     pgPool.query(`SELECT NOW() AS PostgresPoolConnectivityMetric`),
                     createTimeout(timeoutInMilliSeconds),
                 ]);
-                this.set(1);
+                const duration = process.hrtime(startTime);
+                this.set(duration[1] / 1e6);
             }
             catch (error) {
                 if (error.message === 'METRIC_COLLECTION_TIMEOUT') {

package/dist/monitoring/postgres-metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-metrics.js","sourceRoot":"","sources":["../../src/monitoring/postgres-metrics.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAG5C,MAAM,aAAa,GAAG,CAAC,qBAA6B,EAAiB,EAAE,CACrE,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAC9B,UAAU,CACR,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,EACpD,qBAAqB,CACtB,CACF,CAAC;AAEJ;;;;;;;;;GASG;AACI,MAAM,oCAAoC,GAAG,CAClD,MAAgB,EAChB,MAAY,EACZ,UAAwD,EACxD,qBAAqB,GAAG,IAAI,EACZ,EAAE;IAClB,OAAO,IAAI,mBAAK,CAAC;QACf,IAAI,EAAE,eAAe,UAAU,eAAe;QAC9C,IAAI,EAAE,8DAA8D,UAAU,EAAE;QAEhF,KAAK,CAAC,OAAO;YACX,IAAI;gBACF,MAAM,OAAO,CAAC,IAAI,CAAC;oBACjB,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC;oBAC9D,aAAa,CAAC,qBAAqB,CAAC;iBACrC,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACb;YAAC,OAAO,KAAK,EAAE;gBACd,IAAY,KAAM,CAAC,OAAO,KAAK,2BAA2B,EAAE;oBAC1D,MAAM,CAAC,KAAK,CACV,kGAAkG,UAAU,sBAAsB,qBAAqB,KAAK,CAC7J,CAAC;iBACH;qBAAM;oBACL,MAAM,CAAC,KAAK,CAAQ,KAAK,EAAE,yBAAyB,CAAC,CAAC;iBACvD;gBAED,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACb;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9BW,QAAA,oCAAoC,wCA8B/C"}
+{"version":3,"file":"postgres-metrics.js","sourceRoot":"","sources":["../../src/monitoring/postgres-metrics.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAG5C,MAAM,aAAa,GAAG,CAAC,qBAA6B,EAAiB,EAAE,CACrE,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAC9B,UAAU,CACR,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,EACpD,qBAAqB,CACtB,CACF,CAAC;AAEJ;;;;;;;;;GASG;AACI,MAAM,oCAAoC,GAAG,CAClD,MAAgB,EAChB,MAAY,EACZ,UAAwD,EACxD,qBAAqB,GAAG,KAAK,EACb,EAAE;IAClB,OAAO,IAAI,mBAAK,CAAC;QACf,IAAI,EAAE,eAAe,UAAU,eAAe;QAC9C,IAAI,EAAE,4DAA4D,UAAU,kBAAkB;QAE9F,KAAK,CAAC,OAAO;YACX,IAAI;gBACF,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnC,MAAM,OAAO,CAAC,IAAI,CAAC;oBACjB,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC;oBAC9D,aAAa,CAAC,qBAAqB,CAAC;iBACrC,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;aAC7B;YAAC,OAAO,KAAK,EAAE;gBACd,IAAY,KAAM,CAAC,OAAO,KAAK,2BAA2B,EAAE;oBAC1D,MAAM,CAAC,KAAK,CACV,kGAAkG,UAAU,sBAAsB,qBAAqB,KAAK,CAC7J,CAAC;iBACH;qBAAM;oBACL,MAAM,CAAC,KAAK,CAAQ,KAAK,EAAE,yBAAyB,CAAC,CAAC;iBACvD;gBAED,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACb;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhCW,QAAA,oCAAoC,wCAgC/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-db-common",
-  "version": "0.38.0-rc.0",
+  "version": "0.38.0-rc.2",
   "description": "This library encapsulates database-related functionality to develop Mosaic based services.",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -54,5 +54,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c759240b5649f2b249b94193c2b10823bee383be"
+  "gitHead": "4918cf4edaf640b1ef1c26aa983bc6a41d691c83"
 }

package/src/monitoring/postgres-metrics.ts

@@ -16,27 +16,29 @@ const createTimeout = (timeoutInMilliSeconds: number): Promise<void> =>
  * or a value of `0` otherwise.
  *
  * @param pgPool The Postgres Pool to use for checking the connectivity. The connectivity test will be done at the point of metric collection.
- * @param pgPoolType The Postgres Pool to check connectivity for. The connectivity test will be done at the point of metric collection.
- * @param timeoutInMilliSeconds The maximum time the connectivity check will run during metric collection. Defaults to `1000ms`.
+ * @param pgPoolType The Postgres Pool to check connectivity for.
+ * @param timeoutInMilliSeconds The maximum time the connectivity check will run during metric collection. Defaults to `10000ms`.
  * @returns A `Gauge` metric with a name `ax_postgres_<pgPoolType>_connectivity`.
  */
 export const createPostgresPoolConnectivityMetric = (
   logger: DbLogger,
   pgPool: Pool,
   pgPoolType: 'dbOwnerPool' | 'envOwnerPool' | 'loginPool',
-  timeoutInMilliSeconds = 1000,
+  timeoutInMilliSeconds = 10000,
 ): Metric<string> => {
   return new Gauge({
     name: `ax_postgres_${pgPoolType}_connectivity`,
-    help: `Connection status from the service to the database via the ${pgPoolType}`,
+    help: `Connection time from the service to the database via the ${pgPoolType} in milliseconds`,
 
     async collect() {
       try {
+        const startTime = process.hrtime();
         await Promise.race([
           pgPool.query(`SELECT NOW() AS PostgresPoolConnectivityMetric`),
           createTimeout(timeoutInMilliSeconds),
         ]);
-        this.set(1);
+        const duration = process.hrtime(startTime);
+        this.set(duration[1] / 1e6);
       } catch (error) {
         if ((<Error>error).message === 'METRIC_COLLECTION_TIMEOUT') {
           logger.error(