@promster/metrics 9.0.0 → 9.1.3

package/dist/declarations/src/create-request-recorder/create-request-recorder.d.ts

@@ -1,12 +1,14 @@
-import type { TPromsterOptions, TLabelValues, THttpMetrics, TRequestTiming } from '@promster/types';
+import type { TPromsterOptions, TLabelValues, THttpMetrics } from '@promster/types';
 import { sortLabels } from '../sort-labels';
 import { endMeasurementFrom } from '../end-measurement-from';
+import { Timing } from '../timing';
 declare type TRecordingOptions = {
     labels: TLabelValues;
     requestContentLength?: number;
     responseContentLength?: number;
 };
-export declare type TRequestRecorder = (start: TRequestTiming, recordingOptions: TRecordingOptions) => void;
+declare type TLegacyTiming = [number, number];
+export declare type TRequestRecorder = (timing: Timing | TLegacyTiming, recordingOptions: TRecordingOptions) => void;
 declare const createRequestRecorder: {
     (metrics: THttpMetrics, options?: TPromsterOptions): TRequestRecorder;
     defaultOptions: TPromsterOptions;

package/dist/declarations/src/end-measurement-from/end-measurement-from.d.ts

@@ -1,5 +1,4 @@
-import type { TRequestTiming } from '@promster/types';
-declare function endMeasurementFrom(start: TRequestTiming): {
+declare function endMeasurementFrom(start: [number, number]): {
     durationS: number;
 };
 export { endMeasurementFrom };

package/dist/declarations/src/index.d.ts

@@ -9,5 +9,7 @@ import { defaultNormalizers, normalizeStatusCode, normalizePath, normalizeMethod
 import { isRunningInKubernetes, skipMetricsInEnvironment } from './environment';
 import { endMeasurementFrom } from './end-measurement-from';
 import { sortLabels } from './sort-labels';
+import { timing } from './timing';
 export type { TRequestRecorder } from './create-request-recorder';
-export { Prometheus, defaultRegister, createHttpMetrics, createGraphQlMetrics, createGcMetrics, getSummary, getContentType, createRequestRecorder, createGcObserver, defaultNormalizers, normalizeStatusCode, normalizePath, normalizeMethod, isRunningInKubernetes, skipMetricsInEnvironment, endMeasurementFrom, sortLabels, };
+export type { Timing as TPromsterTiming } from './timing';
+export { Prometheus, defaultRegister, createHttpMetrics, createGraphQlMetrics, createGcMetrics, getSummary, getContentType, createRequestRecorder, createGcObserver, defaultNormalizers, normalizeStatusCode, normalizePath, normalizeMethod, isRunningInKubernetes, skipMetricsInEnvironment, endMeasurementFrom, sortLabels, timing, };

package/dist/declarations/src/timing/index.d.ts

@@ -0,0 +1,2 @@
+import timing, { Timing } from './timing';
+export { timing, Timing };

package/dist/declarations/src/timing/timing.d.ts

@@ -0,0 +1,17 @@
+declare class Timing {
+    #private;
+    static NS_PER_SEC: bigint;
+    constructor();
+    value(): {
+        seconds: undefined;
+    } | {
+        seconds: number;
+    };
+    reset(): this;
+    end(): this;
+}
+declare const timing: {
+    start(): Timing;
+};
+export default timing;
+export { Timing };

package/dist/promster-metrics.cjs.dev.js

@@ -288,16 +288,18 @@ const defaultOptions$1 = {
   detectKubernetes: false
 };
 
+function isTiming(timing) {
+  return !Array.isArray(timing);
+}
+
 const createRequestRecorder = (metrics, options = defaultOptions$1) => {
   const defaultedRecorderOptions = merge__default["default"](defaultOptions$1, options);
   const shouldSkipMetricsByEnvironment = skipMetricsInEnvironment(defaultedRecorderOptions);
-  return (start, recordingOptions) => {
-    const {
-      durationS
-    } = endMeasurementFrom(start);
+  return (timing, recordingOptions) => {
+    const durationS = isTiming(timing) ? timing.end().value().seconds : endMeasurementFrom(timing).durationS;
     const labels = sortLabels(recordingOptions.labels);
 
-    if (!shouldSkipMetricsByEnvironment) {
+    if (!shouldSkipMetricsByEnvironment && durationS !== undefined) {
       var _metrics$httpRequestD;
 
       (_metrics$httpRequestD = metrics.httpRequestDurationInSeconds) === null || _metrics$httpRequestD === void 0 ? void 0 : _metrics$httpRequestD.forEach(httpRequestDurationInSecondsMetricType => {
@@ -305,7 +307,7 @@ const createRequestRecorder = (metrics, options = defaultOptions$1) => {
       });
     }
 
-    if (!shouldSkipMetricsByEnvironment) {
+    if (!shouldSkipMetricsByEnvironment && durationS !== undefined) {
       var _metrics$httpRequestD2;
 
       (_metrics$httpRequestD2 = metrics.httpRequestDurationPerPercentileInSeconds) === null || _metrics$httpRequestD2 === void 0 ? void 0 : _metrics$httpRequestD2.forEach(httpRequestDurationPerPercentileInSecondsMetricType => {
@@ -313,7 +315,7 @@ const createRequestRecorder = (metrics, options = defaultOptions$1) => {
       });
     }
 
-    if (!shouldSkipMetricsByEnvironment) {
+    if (!shouldSkipMetricsByEnvironment && durationS !== undefined) {
       var _metrics$httpRequests;
 
       (_metrics$httpRequests = metrics.httpRequestsTotal) === null || _metrics$httpRequests === void 0 ? void 0 : _metrics$httpRequests.forEach(httpRequestsTotalMetricType => {
@@ -394,6 +396,46 @@ const defaultNormalizers = {
   normalizeMethod
 };
 
+class Timing {
+  static NS_PER_SEC = BigInt(1e9);
+  #startTime;
+  #endTime;
+
+  constructor() {
+    this.reset();
+  }
+
+  value() {
+    const startTime = this.#startTime;
+    const endTime = this.#endTime;
+    if (!endTime || !startTime) return {
+      seconds: undefined
+    };
+    return {
+      seconds: Number((endTime - startTime) / Timing.NS_PER_SEC)
+    };
+  }
+
+  reset() {
+    this.#startTime = process.hrtime.bigint();
+    this.#endTime = undefined;
+    return this;
+  }
+
+  end() {
+    this.#endTime = process.hrtime.bigint();
+    return this;
+  }
+
+}
+
+const timing = {
+  start() {
+    return new Timing();
+  }
+
+};
+
 exports.Prometheus = Prometheus__namespace;
 exports.createGcMetrics = createGcMetrics;
 exports.createGcObserver = createGcObserver;
@@ -411,3 +453,4 @@ exports.normalizePath = normalizePath;
 exports.normalizeStatusCode = normalizeStatusCode;
 exports.skipMetricsInEnvironment = skipMetricsInEnvironment;
 exports.sortLabels = sortLabels;
+exports.timing = timing;

package/dist/promster-metrics.cjs.prod.js

@@ -288,16 +288,18 @@ const defaultOptions$1 = {
   detectKubernetes: false
 };
 
+function isTiming(timing) {
+  return !Array.isArray(timing);
+}
+
 const createRequestRecorder = (metrics, options = defaultOptions$1) => {
   const defaultedRecorderOptions = merge__default["default"](defaultOptions$1, options);
   const shouldSkipMetricsByEnvironment = skipMetricsInEnvironment(defaultedRecorderOptions);
-  return (start, recordingOptions) => {
-    const {
-      durationS
-    } = endMeasurementFrom(start);
+  return (timing, recordingOptions) => {
+    const durationS = isTiming(timing) ? timing.end().value().seconds : endMeasurementFrom(timing).durationS;
     const labels = sortLabels(recordingOptions.labels);
 
-    if (!shouldSkipMetricsByEnvironment) {
+    if (!shouldSkipMetricsByEnvironment && durationS !== undefined) {
       var _metrics$httpRequestD;
 
       (_metrics$httpRequestD = metrics.httpRequestDurationInSeconds) === null || _metrics$httpRequestD === void 0 ? void 0 : _metrics$httpRequestD.forEach(httpRequestDurationInSecondsMetricType => {
@@ -305,7 +307,7 @@ const createRequestRecorder = (metrics, options = defaultOptions$1) => {
       });
     }
 
-    if (!shouldSkipMetricsByEnvironment) {
+    if (!shouldSkipMetricsByEnvironment && durationS !== undefined) {
       var _metrics$httpRequestD2;
 
       (_metrics$httpRequestD2 = metrics.httpRequestDurationPerPercentileInSeconds) === null || _metrics$httpRequestD2 === void 0 ? void 0 : _metrics$httpRequestD2.forEach(httpRequestDurationPerPercentileInSecondsMetricType => {
@@ -313,7 +315,7 @@ const createRequestRecorder = (metrics, options = defaultOptions$1) => {
       });
     }
 
-    if (!shouldSkipMetricsByEnvironment) {
+    if (!shouldSkipMetricsByEnvironment && durationS !== undefined) {
       var _metrics$httpRequests;
 
       (_metrics$httpRequests = metrics.httpRequestsTotal) === null || _metrics$httpRequests === void 0 ? void 0 : _metrics$httpRequests.forEach(httpRequestsTotalMetricType => {
@@ -394,6 +396,46 @@ const defaultNormalizers = {
   normalizeMethod
 };
 
+class Timing {
+  static NS_PER_SEC = BigInt(1e9);
+  #startTime;
+  #endTime;
+
+  constructor() {
+    this.reset();
+  }
+
+  value() {
+    const startTime = this.#startTime;
+    const endTime = this.#endTime;
+    if (!endTime || !startTime) return {
+      seconds: undefined
+    };
+    return {
+      seconds: Number((endTime - startTime) / Timing.NS_PER_SEC)
+    };
+  }
+
+  reset() {
+    this.#startTime = process.hrtime.bigint();
+    this.#endTime = undefined;
+    return this;
+  }
+
+  end() {
+    this.#endTime = process.hrtime.bigint();
+    return this;
+  }
+
+}
+
+const timing = {
+  start() {
+    return new Timing();
+  }
+
+};
+
 exports.Prometheus = Prometheus__namespace;
 exports.createGcMetrics = createGcMetrics;
 exports.createGcObserver = createGcObserver;
@@ -411,3 +453,4 @@ exports.normalizePath = normalizePath;
 exports.normalizeStatusCode = normalizeStatusCode;
 exports.skipMetricsInEnvironment = skipMetricsInEnvironment;
 exports.sortLabels = sortLabels;
+exports.timing = timing;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promster/metrics",
-  "version": "9.0.0",
+  "version": "9.1.3",
   "description": "Metrics utilities used by all other server integrations",
   "main": "dist/promster-metrics.cjs.js",
   "typings": "dist/promster-metrics.cjs.d.ts",
@@ -21,7 +21,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/tdeekens/flopflip.git",
+    "url": "https://github.com/tdeekens/promster.git",
     "directory": "packages/metrics"
   },
   "author": "Tobias Deekens <nerd@tdeekens.name>",
@@ -40,19 +40,18 @@
     "lodash.once": "4.1.1",
     "merge-options": "3.0.4",
     "optional": "0.1.4",
-    "ts-essentials": "9.0.0",
+    "ts-essentials": "9.1.2",
     "tslib": "2.3.1",
-    "url": "0.11.0",
-    "url-value-parser": "2.0.3"
+    "url-value-parser": "2.1.0"
   },
   "devDependencies": {
-    "@promster/types": "^3.2.0",
-    "@types/lodash": "4.14.176",
+    "@promster/types": "^3.2.3",
+    "@types/lodash": "4.14.178",
     "prom-client": "14.0.1",
-    "typescript": "4.4.4"
+    "typescript": "4.5.5"
   },
   "optionalDependencies": {
-    "@sematext/gc-stats": "1.5.5"
+    "@sematext/gc-stats": "1.5.6"
   },
   "peerDependencies": {
     "prom-client": "13.x.x || 14.x"