@substrate/api-sidecar 19.1.0 → 19.2.0

package/build/src/main.js

@@ -52,11 +52,11 @@ const App_1 = __importDefault(require("./App"));
 const chains_config_1 = require("./chains-config");
 const consoleOverride_1 = require("./logging/consoleOverride");
 const Log_1 = require("./logging/Log");
+const index_1 = require("./metrics/index");
 const middleware = __importStar(require("./middleware"));
 const typesBundle_1 = __importDefault(require("./override-types/typesBundle"));
 const parseArgs_1 = require("./parseArgs");
 const SidecarConfig_1 = require("./SidecarConfig");
-const metrics_1 = __importDefault(require("./util/metrics"));
 async function main() {
     const { config } = SidecarConfig_1.SidecarConfig;
     const { logger } = Log_1.Log;
@@ -83,11 +83,11 @@ async function main() {
     ]);
     startUpPrompt(config.SUBSTRATE.URL, chainName.toString(), implName.toString());
     const preMiddlewares = [(0, express_1.json)(), middleware.httpLoggerCreate(logger)];
-    if (args.prometheus) {
+    if (config.METRICS.ENABLED) {
         // Create Metrics App
-        const metricsApp = new metrics_1.default({
-            port: 9100,
-            host: config.EXPRESS.HOST,
+        const metricsApp = new index_1.MetricsApp({
+            port: config.METRICS.PROM_PORT,
+            host: config.METRICS.PROM_HOST,
         });
         // Generate metrics middleware
         preMiddlewares.push(metricsApp.preMiddleware());

package/build/src/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}

package/build/src/{util/metrics.d.ts → metrics/Metrics.d.ts}

@@ -1,14 +1,9 @@
 import { Request, Response } from 'express';
+import client from 'prom-client';
 interface IAppConfiguration {
     port: number;
     host: string;
 }
-export declare const enum MetricType {
-    Counter = "counter",
-    Gauge = "gauge",
-    Histogram = "histogram",
-    Summary = "summary"
-}
 interface Query extends Request {
     route: {
         path: string;
@@ -25,11 +20,11 @@ export default class Metrics_App {
     /**
      * @param appConfig configuration for app.
      */
-    constructor({ host }: IAppConfiguration);
+    constructor({ host, port }: IAppConfiguration);
     listen(): void;
+    getRegisteredMetrics(): Record<string, client.Metric>;
     private createMetricByType;
     private getRoute;
-    private blocksControllerMetrics;
     preMiddleware(): (req: Query, res: Response, next: () => void) => void;
     private init;
 }

package/build/src/{util/metrics.js → metrics/Metrics.js}

@@ -6,81 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const prom_client_1 = __importDefault(require("prom-client"));
 const Log_1 = require("../logging/Log");
-const parseArgs_1 = require("../parseArgs");
-const metrics = [
-    {
-        name: 'request_errors_total',
-        help: 'Number of HTTP Errors',
-        type: "counter" /* MetricType.Counter */,
-    },
-    {
-        name: 'request_success_total',
-        help: 'Number of HTTP Success',
-        type: "counter" /* MetricType.Counter */,
-    },
-    {
-        name: 'requests_total',
-        help: 'Total number of HTTP Requests',
-        type: "counter" /* MetricType.Counter */,
-    },
-    {
-        name: 'request_duration_seconds',
-        help: 'Duration of HTTP requests in seconds',
-        labels: ['method', 'route', 'status_code'],
-        buckets: [0.1, 0.5, 1, 1.5, 2, 3, 4, 5],
-        type: "histogram" /* MetricType.Histogram */,
-    },
-    {
-        name: 'response_size_bytes_seconds',
-        help: 'Size of HTTP responses in bytes',
-        labels: ['method', 'route', 'status_code'],
-        buckets: [100, 500, 1000, 5000, 10000, 50000, 100000, 500000, 1000000, 5000000],
-        type: "histogram" /* MetricType.Histogram */,
-    },
-    {
-        name: 'response_size_latency_ratio_seconds',
-        help: 'Ratio of response size to latency',
-        labels: ['method', 'route', 'status_code'],
-        buckets: [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144],
-        type: "histogram" /* MetricType.Histogram */,
-    },
-    {
-        name: 'extrinsics_in_request_count',
-        help: 'Number of extrinsics in a request',
-        type: "histogram" /* MetricType.Histogram */,
-        buckets: [5, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120, 10240, 20480],
-        labels: ['method', 'route', 'status_code'],
-    },
-    {
-        name: 'extrinsics_per_second_count',
-        help: 'Number of extrinsics per second',
-        type: "histogram" /* MetricType.Histogram */,
-        labels: ['method', 'route', 'status_code'],
-        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
-    },
-    {
-        name: 'extrinsics_per_block_count',
-        help: 'Average number of extrinsics per block',
-        type: "histogram" /* MetricType.Histogram */,
-        labels: ['method', 'route', 'status_code'],
-        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
-    },
-    {
-        name: 'seconds_per_block_count',
-        help: 'Average seconds per block',
-        type: "histogram" /* MetricType.Histogram */,
-        labels: ['method', 'route', 'status_code'],
-        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
-    },
-];
+const SidecarConfig_1 = require("../SidecarConfig");
+const _1 = require(".");
 class Metrics_App {
     /**
      * @param appConfig configuration for app.
      */
-    constructor({ host }) {
-        const args = (0, parseArgs_1.parseArgs)();
-        this.includeQueryParams = !!args.prometheus_queryparams;
-        this.port = Number(args.prometheus_port);
+    constructor({ host, port }) {
+        this.includeQueryParams = SidecarConfig_1.SidecarConfig.config.METRICS.INCLUDE_QUERYPARAMS;
+        this.port = port;
         this.app = (0, express_1.default)();
         this.host = host;
         this.registry = new prom_client_1.default.Registry();
@@ -93,6 +27,9 @@ class Metrics_App {
             logger.info(`Metrics Server started at http://${this.host}:${this.port}/metrics`);
         });
     }
+    getRegisteredMetrics() {
+        return this.metrics;
+    }
     createMetricByType(prefix = 'sas', metric) {
         const prefixedName = prefix + '_' + metric.name;
         if (prefixedName in this.metrics) {
@@ -164,72 +101,19 @@ class Metrics_App {
         }
         return route;
     }
-    blocksControllerMetrics(req, res, end) {
-        var _a, _b;
-        const body = res.locals.body;
-        if (((_a = req.params) === null || _a === void 0 ? void 0 : _a.number) && !Array.isArray(body)) {
-            const extrinscs = body.extrinsics ? body.extrinsics.length : 0;
-            const extrinsics_per_second = this.metrics['sas_extrinsics_per_second_count'];
-            const seconds = end();
-            extrinsics_per_second
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(extrinscs / seconds);
-            const extrinsics_per_block = this.metrics['sas_extrinsics_per_block_count'];
-            const blocks = 1;
-            extrinsics_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(extrinscs / blocks);
-            const seconds_per_block = this.metrics['sas_seconds_per_block_count'];
-            seconds_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(seconds / blocks);
-        }
-        if ((_b = req.query) === null || _b === void 0 ? void 0 : _b.range) {
-            let totExtrinsics = 0;
-            if (Array.isArray(body)) {
-                totExtrinsics = body.reduce((current, block) => {
-                    const extrinsics = block['extrinsics'];
-                    if (Array.isArray(extrinsics)) {
-                        return current + extrinsics.length;
-                    }
-                    return current;
-                }, 0);
-            }
-            else {
-                const extrinsics = body['extrinsics'];
-                if (Array.isArray(extrinsics)) {
-                    totExtrinsics = extrinsics.length;
-                }
-            }
-            const extrinsics_in_request = this.metrics['sas_extrinsics_in_request_count'];
-            extrinsics_in_request
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(totExtrinsics);
-            const extrinsics_per_second = this.metrics['sas_extrinsics_per_second_count'];
-            const seconds = end();
-            extrinsics_per_second
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(totExtrinsics / seconds);
-            const extrinsics_per_block = this.metrics['sas_extrinsics_per_block_count'];
-            const blocks = Array.isArray(body) ? body.length : 1;
-            extrinsics_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(totExtrinsics / blocks);
-            const seconds_per_block = this.metrics['sas_seconds_per_block_count'];
-            seconds_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(seconds / blocks);
-        }
-    }
     preMiddleware() {
         return (req, res, next) => {
-            const tot_requests = this.metrics['sas_requests_total'];
+            const tot_requests = this.metrics['sas_http_requests'];
             // request count metrics
             if (req.originalUrl != '/favicon.ico') {
                 tot_requests.inc();
             }
             const request_duration_seconds = this.metrics['sas_request_duration_seconds'];
             const end = request_duration_seconds.startTimer();
+            res.locals.metrics = {
+                timer: end,
+                registry: this.metrics,
+            };
             const oldJson = res.json;
             res.json = (body) => {
                 res.locals.body = body;
@@ -237,11 +121,11 @@ class Metrics_App {
             };
             res.once('finish', () => {
                 if (res.statusCode >= 400 && req.originalUrl != '/favicon.ico') {
-                    const request_errors = this.metrics['sas_request_errors'];
+                    const request_errors = this.metrics['sas_http_request_error'];
                     request_errors.inc();
                 }
                 else if (res.statusCode < 400) {
-                    const request_success = this.metrics['sas_request_errors_total'];
+                    const request_success = this.metrics['sas_http_request_success'];
                     request_success.inc();
                 }
                 let resContentLength = '0';
@@ -251,19 +135,16 @@ class Metrics_App {
                 else if (res.hasHeader('Content-Length')) {
                     resContentLength = res.getHeader('Content-Length');
                 }
-                // route specific metrics
-                if (this.getRoute(req).includes('blocks')) {
-                    this.blocksControllerMetrics(req, res, end);
-                }
+                // Generic Metrics per route (latency, response size, response size to latency ratio)
                 // response size metrics
-                const response_size_bytes = this.metrics['sas_response_size_bytes_seconds'];
+                const response_size_bytes = this.metrics['sas_response_size_bytes'];
                 response_size_bytes
                     .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
                     .observe(parseFloat(resContentLength));
                 // latency metrics
                 const latency = end({ method: req.method, route: this.getRoute(req), status_code: res.statusCode });
                 // response size to latency ratio
-                const response_size_latency_ratio = this.metrics['sas_response_size_latency_ratio_seconds'];
+                const response_size_latency_ratio = this.metrics['sas_response_size_bytes_seconds'];
                 response_size_latency_ratio
                     .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
                     .observe(parseFloat(resContentLength) / latency);
@@ -273,7 +154,7 @@ class Metrics_App {
     }
     init() {
         // Set up
-        metrics.forEach((metric) => this.createMetricByType('sas', metric));
+        _1.config.metric_list.forEach((metric) => this.createMetricByType('sas', metric));
         prom_client_1.default.collectDefaultMetrics({ register: this.registry, prefix: 'sas_' });
         // Set up the metrics endpoint
         this.app.get('/metrics', (_req, res) => {
@@ -291,4 +172,4 @@ class Metrics_App {
     }
 }
 exports.default = Metrics_App;
-//# sourceMappingURL=metrics.js.map
+//# sourceMappingURL=Metrics.js.map

package/build/src/metrics/Metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Metrics.js","sourceRoot":"","sources":["../../../src/metrics/Metrics.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAE9B,8DAAiC;AAEjC,wCAAqC;AACrC,oDAAiD;AAEjD,wBAA2B;AAmB3B,MAAqB,WAAW;IAQ/B;;OAEG;IACH,YAAY,EAAE,IAAI,EAAE,IAAI,EAAqB;QAC5C,IAAI,CAAC,kBAAkB,GAAG,6BAAa,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAC3E,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAED,MAAM;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,SAAG,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,UAAU,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,oBAAoB;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAEO,kBAAkB,CAAC,MAAM,GAAG,KAAK,EAAE,MAAe;QACzD,MAAM,YAAY,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;QAChD,IAAI,YAAY,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;SAClC;QAED,QAAQ,MAAM,CAAC,IAAI,EAAE;YACpB,uCAAuB,CAAC,CAAC;gBACxB,MAAM,OAAO,GAAG,IAAI,qBAAM,CAAC,OAAO,CAAC;oBAClC,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,UAAU,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;oBAC/B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC1B,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBACtC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC;gBACrC,OAAO,OAAO,CAAC;aACf;YACD,2CAAyB,CAAC,CAAC;gBAC1B,MAAM,SAAS,GAAG,IAAI,qBAAM,CAAC,SAAS,CAAC;oBACtC,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,UAAU,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;oBAC/B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;iBACzD,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;gBACvC,OAAO,SAAS,CAAC;aACjB;YACD;gBACC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC1C;gBACC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC5C;gBACC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACxC;IACF,CAAC;IAEO,QAAQ,CAAC,GAAU;;QAC1B,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;QACxB,IAAI,GAAG,CAAC,KAAK,EAAE;YACd,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE;gBAC3B,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,IAAG,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAC;aAC1D;YAED,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACxD,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;iBAAM;gBACN,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvC,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7D,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;gBAEjE,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3D,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC;aACxB;YAED,IAAI,IAAI,CAAC,kBAAkB,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1E,KAAK,GAAG,GAAG,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;qBACxC,IAAI,EAAE;qBACN,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,MAAM,CAAC;qBACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;aACd;SACD;QAED,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC7C,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAC;SACH;QAED,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE,EAAE;YAC3B,qDAAqD;YACrD,KAAK,GAAG,KAAK,CAAC;SACd;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAED,aAAa;QACZ,OAAO,CAAC,GAAU,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;YACtD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAmB,CAAC;YAEzE,wBAAwB;YACxB,IAAI,GAAG,CAAC,WAAW,IAAI,cAAc,EAAE;gBACtC,YAAY,CAAC,GAAG,EAAE,CAAC;aACnB;YACD,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAqB,CAAC;YAClG,MAAM,GAAG,GAAG,wBAAwB,CAAC,UAAU,EAAE,CAAC;YAElD,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG;gBACpB,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;YAEF,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;YACzB,GAAG,CAAC,IAAI,GAAG,CAAC,IAAU,EAAE,EAAE;gBACzB,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;gBACvB,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC,CAAC;YAEF,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACvB,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,cAAc,EAAE;oBAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAmB,CAAC;oBAChF,cAAc,CAAC,GAAG,EAAE,CAAC;iBACrB;qBAAM,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE;oBAChC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAmB,CAAC;oBACnF,eAAe,CAAC,GAAG,EAAE,CAAC;iBACtB;gBAED,IAAI,gBAAgB,GAAG,GAAG,CAAC;gBAC3B,IAAI,gBAAgB,IAAI,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAE;oBAC7D,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,CAAW,CAAC;iBACnD;qBAAM,IAAI,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE;oBAC3C,gBAAgB,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAW,CAAC;iBAC7D;gBACD,qFAAqF;gBACrF,wBAAwB;gBACxB,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAqB,CAAC;gBACxF,mBAAmB;qBACjB,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC;qBACtF,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAExC,kBAAkB;gBAClB,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEpG,iCAAiC;gBACjC,MAAM,2BAA2B,GAAG,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAAqB,CAAC;gBACxG,2BAA2B;qBACzB,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC;qBACtF,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YAEH,IAAI,EAAE,CAAC;QACR,CAAC,CAAC;IACH,CAAC;IAEO,IAAI;QACX,SAAS;QACT,SAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAE/E,qBAAM,CAAC,qBAAqB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAE1E,8BAA8B;QAC9B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,IAAa,EAAE,GAAa,EAAE,EAAE;YACzD,KAAK,CAAC,KAAK,IAAI,EAAE;gBAChB,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACnD,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC;QACN,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,IAAa,EAAE,GAAa,EAAE,EAAE;YAC9D,KAAK,CAAC,KAAK,IAAI,EAAE;gBAChB,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACnD,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAClD,CAAC,CAAC,EAAE,CAAC;QACN,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AA9LD,8BA8LC"}

package/build/src/metrics/config.d.ts

@@ -0,0 +1,2 @@
+import { IMetric } from '../types/metrics';
+export declare const metric_list: IMetric[];

package/build/src/metrics/config.js

@@ -0,0 +1,71 @@
+"use strict";
+// as new metrics are added in routes they need to be registered here to make them available across the apps
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.metric_list = void 0;
+exports.metric_list = [
+    {
+        name: 'http_request_error',
+        help: 'Number of HTTP Errors',
+        type: "counter" /* MetricType.Counter */,
+    },
+    {
+        name: 'http_request_success',
+        help: 'Number of HTTP Success',
+        type: "counter" /* MetricType.Counter */,
+    },
+    {
+        name: 'http_requests',
+        help: 'Total number of HTTP Requests',
+        type: "counter" /* MetricType.Counter */,
+    },
+    {
+        name: 'request_duration_seconds',
+        help: 'Duration of HTTP requests in seconds',
+        labels: ['method', 'route', 'status_code'],
+        buckets: [0.1, 0.5, 1, 1.5, 2, 3, 4, 5],
+        type: "histogram" /* MetricType.Histogram */,
+    },
+    {
+        name: 'response_size_bytes',
+        help: 'Size of HTTP responses in bytes',
+        labels: ['method', 'route', 'status_code'],
+        buckets: [100, 500, 1000, 5000, 10000, 50000, 100000, 500000, 1000000, 5000000],
+        type: "histogram" /* MetricType.Histogram */,
+    },
+    {
+        name: 'response_size_bytes_seconds',
+        help: 'Ratio of response size to latency',
+        labels: ['method', 'route', 'status_code'],
+        buckets: [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144],
+        type: "histogram" /* MetricType.Histogram */,
+    },
+    {
+        name: 'extrinsics_in_request',
+        help: 'Number of extrinsics in a request',
+        type: "histogram" /* MetricType.Histogram */,
+        buckets: [5, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120, 10240, 20480],
+        labels: ['method', 'route', 'status_code'],
+    },
+    {
+        name: 'extrinsics_per_second',
+        help: 'Number of extrinsics per second',
+        type: "histogram" /* MetricType.Histogram */,
+        labels: ['method', 'route', 'status_code'],
+        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
+    },
+    {
+        name: 'extrinsics_per_block',
+        help: 'Average number of extrinsics per block',
+        type: "histogram" /* MetricType.Histogram */,
+        labels: ['method', 'route', 'status_code'],
+        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
+    },
+    {
+        name: 'seconds_per_block',
+        help: 'Average seconds per block',
+        type: "histogram" /* MetricType.Histogram */,
+        labels: ['method', 'route', 'status_code'],
+        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
+    },
+];
+//# sourceMappingURL=config.js.map

package/build/src/metrics/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/metrics/config.ts"],"names":[],"mappings":"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"}

package/build/src/metrics/index.d.ts

@@ -0,0 +1,2 @@
+export * as config from './config';
+export { default as MetricsApp } from './Metrics';

package/build/src/metrics/index.js

@@ -0,0 +1,33 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetricsApp = exports.config = void 0;
+exports.config = __importStar(require("./config"));
+var Metrics_1 = require("./Metrics");
+Object.defineProperty(exports, "MetricsApp", { enumerable: true, get: function () { return __importDefault(Metrics_1).default; } });
+//# sourceMappingURL=index.js.map

package/build/src/metrics/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/metrics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAmC;AACnC,qCAAkD;AAAzC,sHAAA,OAAO,OAAc"}

package/build/src/parseArgs.js

@@ -23,19 +23,6 @@ const parseArgs = () => {
         action: 'store_true',
         help: 'print substrate-api-sidecar version',
     });
-    parser.add_argument('-p', '--prometheus', {
-        action: 'store_true',
-        help: 'enable the prometheus metrics endpoint',
-    });
-    parser.add_argument('-pp', '--prometheus-port', {
-        type: 'int',
-        default: 9100,
-        help: 'specify the port number on which the prometheus metrics are exposed [default: 9100]',
-    });
-    parser.add_argument('-pq', '--prometheus-queryparams', {
-        action: 'store_true',
-        help: 'enambles query parameters in the prometheus metrics',
-    });
     return parser.parse_args();
 };
 exports.parseArgs = parseArgs;

package/build/src/parseArgs.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../src/parseArgs.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,uCAAqD;AAE9C,MAAM,SAAS,GAAG,GAAc,EAAE;IACxC,MAAM,MAAM,GAAG,IAAI,yBAAc,EAAE,CAAC;IAEpC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE;QACtC,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,qCAAqC;KAC3C,CAAC,CAAC;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE;QACzC,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,wCAAwC;KAC9C,CAAC,CAAC;IACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,mBAAmB,EAAE;QAC/C,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,qFAAqF;KAC3F,CAAC,CAAC;IACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,0BAA0B,EAAE;QACtD,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,qDAAqD;KAC3D,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,UAAU,EAAe,CAAC;AACzC,CAAC,CAAC;AAtBW,QAAA,SAAS,aAsBpB"}
+{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../src/parseArgs.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,uCAAqD;AAE9C,MAAM,SAAS,GAAG,GAAc,EAAE;IACxC,MAAM,MAAM,GAAG,IAAI,yBAAc,EAAE,CAAC;IAEpC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE;QACtC,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,qCAAqC;KAC3C,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,UAAU,EAAe,CAAC;AACzC,CAAC,CAAC;AATW,QAAA,SAAS,aASpB"}

package/build/src/services/accounts/AccountsAssetsService.js

@@ -31,10 +31,9 @@ class AccountsAssetsService extends AbstractService_1.AbstractService {
      */
     async fetchAssetBalances(hash, address, assets) {
         const { api } = this;
-        const historicApi = await api.at(hash);
+        const [historicApi, { number }] = await Promise.all([api.at(hash), api.rpc.chain.getHeader(hash)]);
         // Check if this runtime has the assets pallet
         this.checkAssetsError(historicApi);
-        const { number } = await api.rpc.chain.getHeader(hash);
         let response;
         if (assets.length === 0) {
             /**

package/build/src/services/accounts/AccountsAssetsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsAssetsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsAssetsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccountsAssetsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsAssetsService.ts"],"names":[],"mappings":"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"}

package/build/src/services/accounts/AccountsPoolAssetsService.js

@@ -31,10 +31,9 @@ class AccountsPoolAssetsService extends AbstractService_1.AbstractService {
      */
     async fetchPoolAssetBalances(hash, address, assets) {
         const { api } = this;
-        const historicApi = await api.at(hash);
+        const [historicApi, { number }] = await Promise.all([api.at(hash), api.rpc.chain.getHeader(hash)]);
         // Check if this runtime has the PoolAssets pallet
         this.checkPoolAssetsError(historicApi);
-        const { number } = await api.rpc.chain.getHeader(hash);
         let response;
         if (assets.length === 0) {
             /**

package/build/src/services/accounts/AccountsPoolAssetsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsPoolAssetsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsPoolAssetsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccountsPoolAssetsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsPoolAssetsService.ts"],"names":[],"mappings":"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"}

package/build/src/services/accounts/AccountsStakingPayoutsService.js

@@ -162,8 +162,10 @@ class AccountsStakingPayoutsService extends AbstractService_1.AbstractService {
                     ? await this.api.rpc.chain.getBlockHash(earlyErasBlockInfo[0].end)
                     : await this.api.rpc.chain.getBlockHash(earlyErasBlockInfo[era - 1].end);
                 let reward = historicApi.registry.createType('Option<u128>');
-                const blockInfo = await this.api.rpc.chain.getBlock(nextEraStartBlockHash);
-                const allRecords = await historicApi.query.system.events();
+                const [blockInfo, allRecords] = await Promise.all([
+                    this.api.rpc.chain.getBlock(nextEraStartBlockHash),
+                    historicApi.query.system.events(),
+                ]);
                 blockInfo.block.extrinsics.forEach((index) => {
                     allRecords
                         .filter(({ phase }) => phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index))