@interopio/otel 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/dist/metrics/application/duration.d.ts +7 -20
  2. package/dist/metrics/application/duration.js +19 -92
  3. package/dist/metrics/application/duration.js.map +1 -1
  4. package/dist/metrics/application/durationBase.d.ts +21 -0
  5. package/dist/metrics/application/durationBase.js +102 -0
  6. package/dist/metrics/application/durationBase.js.map +1 -0
  7. package/dist/metrics/application/durationHistogram.d.ts +4 -6
  8. package/dist/metrics/application/durationHistogram.js +4 -4
  9. package/dist/metrics/application/durationHistogram.js.map +1 -1
  10. package/dist/metrics/application/startup.d.ts +7 -16
  11. package/dist/metrics/application/startup.js +17 -62
  12. package/dist/metrics/application/startup.js.map +1 -1
  13. package/dist/metrics/application/startupBase.d.ts +17 -0
  14. package/dist/metrics/application/startupBase.js +68 -0
  15. package/dist/metrics/application/startupBase.js.map +1 -0
  16. package/dist/metrics/application/startupHistogram.d.ts +4 -6
  17. package/dist/metrics/application/startupHistogram.js +4 -4
  18. package/dist/metrics/application/startupHistogram.js.map +1 -1
  19. package/dist/metrics/base/gauge.js +7 -5
  20. package/dist/metrics/base/gauge.js.map +1 -1
  21. package/dist/metrics/base/observable.d.ts +20 -0
  22. package/dist/metrics/base/observable.js +70 -0
  23. package/dist/metrics/base/observable.js.map +1 -0
  24. package/dist/metrics/factory.js +1 -1
  25. package/dist/metrics/factory.js.map +1 -1
  26. package/dist/metrics/factoryBuilder.d.ts +0 -1
  27. package/dist/metrics/factoryBuilder.js +7 -17
  28. package/dist/metrics/factoryBuilder.js.map +1 -1
  29. package/dist/metrics/layout/startup.d.ts +7 -17
  30. package/dist/metrics/layout/startup.js +18 -66
  31. package/dist/metrics/layout/startup.js.map +1 -1
  32. package/dist/metrics/layout/startupBase.d.ts +18 -0
  33. package/dist/metrics/layout/startupBase.js +71 -0
  34. package/dist/metrics/layout/startupBase.js.map +1 -0
  35. package/dist/metrics/layout/startupHistogram.d.ts +4 -6
  36. package/dist/metrics/layout/startupHistogram.js +4 -4
  37. package/dist/metrics/layout/startupHistogram.js.map +1 -1
  38. package/dist/metrics/{base/null.d.ts → null.d.ts} +2 -2
  39. package/dist/metrics/null.js.map +1 -0
  40. package/dist/metrics/platform/startup.js +1 -2
  41. package/dist/metrics/platform/startup.js.map +1 -1
  42. package/dist/metrics/settingsBuilder.d.ts +0 -1
  43. package/dist/metrics/settingsBuilder.js +0 -12
  44. package/dist/metrics/settingsBuilder.js.map +1 -1
  45. package/dist/metrics/types.d.ts +9 -6
  46. package/dist/validation/metrics/application/duration.d.ts +2 -2
  47. package/dist/validation/metrics/application/duration.js.map +1 -1
  48. package/dist/validation/metrics/application/startup.d.ts +3 -2
  49. package/dist/validation/metrics/application/startup.js +1 -0
  50. package/dist/validation/metrics/application/startup.js.map +1 -1
  51. package/dist/validation/metrics/base/gauge.d.ts +2 -1
  52. package/dist/validation/metrics/base/gauge.js.map +1 -1
  53. package/dist/validation/metrics/layout/startup.d.ts +3 -2
  54. package/dist/validation/metrics/layout/startup.js +1 -0
  55. package/dist/validation/metrics/layout/startup.js.map +1 -1
  56. package/dist/validation/metrics/platform/startup.d.ts +2 -1
  57. package/dist/validation/metrics/platform/startup.js +1 -0
  58. package/dist/validation/metrics/platform/startup.js.map +1 -1
  59. package/package.json +1 -1
  60. package/dist/metrics/application/durationSum.d.ts +0 -9
  61. package/dist/metrics/application/durationSum.js +0 -17
  62. package/dist/metrics/application/durationSum.js.map +0 -1
  63. package/dist/metrics/base/null.js.map +0 -1
  64. /package/dist/metrics/{base/null.js → null.js} +0 -0
@@ -1,21 +1,8 @@
1
- import { Meter, ObservableResult } from "@opentelemetry/api";
2
- import { TelemetryMetricData, InstanceFocusedHandler, TelemetryMetricSettings } from "../types";
3
- import { TelemetryLogger } from "../../types";
4
- import { GaugeMetricBase } from "../base/gauge";
5
- export declare class ApplicationDurationMetric extends GaugeMetricBase {
6
- instanceFocusHandler: InstanceFocusedHandler;
7
- private focusedTimes;
8
- private currentFocusedApp?;
9
- private unInstanceFocusHandler;
10
- private validator;
11
- constructor(settings: TelemetryMetricSettings, meter: Meter, userId: string, logger: TelemetryLogger, instanceFocusHandler: InstanceFocusedHandler);
12
- protected subscribeCore(): Promise<void>;
13
- protected observeCore(result: ObservableResult<TelemetryMetricData>): Promise<void>;
14
- protected unsubscribeCore(): Promise<void>;
15
- protected sendMetric(focusedPeriods: number[], data: TelemetryMetricData, result: ObservableResult<TelemetryMetricData>): void;
16
- private handleFocusChanged;
17
- private handleFocusChangedCore;
18
- private handleGotFocus;
19
- private handleLostFocus;
20
- private addFocusLostEventCore;
1
+ import { TelemetryMetricData } from "../types";
2
+ import { ApplicationDurationMetricBase } from "./durationBase";
3
+ export declare class ApplicationDurationMetric extends ApplicationDurationMetricBase {
4
+ private lastMetrics;
5
+ private appDurationMetric;
6
+ protected createMetricCore(): Promise<void>;
7
+ protected sendMetric(focusedPeriods: number[], data: TelemetryMetricData): void;
21
8
  }
@@ -1,101 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ApplicationDurationMetric = void 0;
4
- const validator_1 = require("../../utils/validator");
5
- const gauge_1 = require("../base/gauge");
6
- const duration_1 = require("../../validation/metrics/application/duration");
7
- class ApplicationDurationMetric extends gauge_1.GaugeMetricBase {
8
- constructor(settings, meter, userId, logger, instanceFocusHandler) {
9
- super(settings, meter, userId, logger);
10
- this.instanceFocusHandler = instanceFocusHandler;
11
- // application -> focused times for a given period
12
- this.focusedTimes = new Map();
13
- this.validator = new duration_1.ApplicationDurationMetricValidator();
14
- this.validator.validate(this);
15
- }
16
- subscribeCore() {
17
- this.unInstanceFocusHandler = this.instanceFocusHandler(this.handleFocusChanged.bind(this));
18
- return Promise.resolve();
19
- }
20
- observeCore(result) {
21
- const hasFocusedApp = this.currentFocusedApp !== undefined;
22
- const currentFocusedApp = hasFocusedApp ? this.currentFocusedApp.name : undefined;
23
- if (hasFocusedApp) {
24
- this.handleFocusChanged({ application: currentFocusedApp, focused: false });
25
- }
26
- this.focusedTimes.forEach((focusedPeriods, application) => {
27
- const data = this.getData(application);
28
- this.sendMetric(focusedPeriods, data, result);
29
- focusedPeriods.splice(0);
30
- });
31
- if (hasFocusedApp) {
32
- this.handleFocusChanged({ application: currentFocusedApp, focused: true });
33
- }
4
+ const durationBase_1 = require("./durationBase");
5
+ class ApplicationDurationMetric extends durationBase_1.ApplicationDurationMetricBase {
6
+ constructor() {
7
+ super(...arguments);
8
+ // app -> last metric value
9
+ this.lastMetrics = new Map();
10
+ }
11
+ createMetricCore() {
12
+ this.appDurationMetric = this.meter.createUpDownCounter(this.settings.name, { description: this.settings.description, unit: this.settings.unit });
34
13
  return Promise.resolve();
35
14
  }
36
- unsubscribeCore() {
37
- this.unInstanceFocusHandler();
38
- return Promise.resolve();
39
- }
40
- sendMetric(focusedPeriods, data, result) {
15
+ sendMetric(focusedPeriods, data) {
16
+ const application = data.application;
41
17
  const focusedTime = focusedPeriods.length === 0 ? 0 : focusedPeriods.reduce((prev, current) => prev + current);
42
- result.observe(focusedTime, data);
43
- this.logger.debug(`metric ${this.settings.name} sent focused time ${focusedTime} for app ${data.application}`);
44
- }
45
- handleFocusChanged(e) {
46
- try {
47
- this.validator.validateFocusChanged(e);
48
- this.logger.debug(`focused changed is being invoked for metric ${this.settings.name} with ${JSON.stringify(e)}`);
49
- return this.handleFocusChangedCore(e);
50
- }
51
- catch (error) {
52
- const message = `error while executing handleFocusChanges for metric from type: ${this.settings.type}`;
53
- this.logger.error(message, error);
54
- }
55
- }
56
- handleFocusChangedCore(e) {
57
- const focused = e.focused;
58
- const application = e.application;
59
- if (focused) {
60
- this.handleGotFocus(application);
61
- }
62
- else {
63
- try {
64
- this.handleLostFocus(application);
65
- }
66
- finally {
67
- this.currentFocusedApp = undefined;
68
- }
69
- }
70
- }
71
- handleGotFocus(application) {
72
- const now = new Date().getTime();
73
- this.currentFocusedApp = { name: application, gotFocusTime: now };
74
- if (!this.focusedTimes.has(this.currentFocusedApp.name)) {
75
- this.focusedTimes.set(this.currentFocusedApp.name, []);
76
- }
77
- this.logger.debug(`got focus event has been added for metric ${this.settings.name}`);
78
- }
79
- handleLostFocus(application) {
80
- if (validator_1.Validator.isNullOrUndefined(this.currentFocusedApp)) {
81
- throw new Error(`cannot handle focus lost for application ${application} since there is no previous got focus event`);
82
- }
83
- const currentFocusedApp = this.currentFocusedApp.name;
84
- const gotFocusTime = this.currentFocusedApp.gotFocusTime;
85
- if (application !== currentFocusedApp) {
86
- throw new Error(`cannot handle focus lost for application ${application} since the previous got focus event had come from application ${currentFocusedApp}`);
87
- }
88
- if (!this.focusedTimes.has(application)) {
89
- throw new Error(`there is no got focus event for ${application}`);
90
- }
91
- this.addFocusLostEventCore(currentFocusedApp, gotFocusTime);
92
- this.logger.debug(`lost focus event has been added for metric ${this.settings.name}`);
93
- }
94
- addFocusLostEventCore(application, gotFocusTime) {
95
- const now = new Date().getTime();
96
- const focusedTime = (now - gotFocusTime);
97
- const focusedTimes = this.focusedTimes.get(application);
98
- focusedTimes.push(focusedTime);
18
+ if (this.lastMetrics.has(application)) {
19
+ const lastFocusedTime = -this.lastMetrics.get(application);
20
+ this.appDurationMetric.add(lastFocusedTime, data);
21
+ this.logger.debug(`metric ${this.settings.name} sent focused time ${lastFocusedTime} for app ${application}`);
22
+ }
23
+ this.appDurationMetric.add(focusedTime, data);
24
+ this.logger.debug(`metric ${this.settings.name} sent focused time ${focusedTime} for app ${application}`);
25
+ this.lastMetrics.set(application, focusedTime);
99
26
  }
100
27
  }
101
28
  exports.ApplicationDurationMetric = ApplicationDurationMetric;
@@ -1 +1 @@
1
- {"version":3,"file":"duration.js","sourceRoot":"","sources":["../../../src/metrics/application/duration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"duration.js","sourceRoot":"","sources":["../../../src/metrics/application/duration.ts"],"names":[],"mappings":";;;AAEA,iDAA+D;AAE/D,MAAa,yBAA0B,SAAQ,4CAA6B;IAA5E;;QACI,2BAA2B;QACnB,gBAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAuBpD,CAAC;IApBsB,gBAAgB;QAC/B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAClJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,UAAU,CAAC,cAAwB,EAAE,IAAyB;QAC7E,MAAM,WAAW,GAAG,IAAI,CAAC,WAAY,CAAC;QACtC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC;QAE/G,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACnC,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;YAC5D,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,eAAe,YAAY,WAAW,EAAE,CAAC,CAAC;SACjH;QAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,WAAW,YAAY,WAAW,EAAE,CAAC,CAAC;QAE1G,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACnD,CAAC;CACJ;AAzBD,8DAyBC"}
@@ -0,0 +1,21 @@
1
+ import { Meter } from "@opentelemetry/api";
2
+ import { TelemetryMetricData, InstanceFocusedHandler, TelemetryMetricSettings } from "../types";
3
+ import { TelemetryLogger } from "../../types";
4
+ import { ObservableMetricBase } from "../base/observable";
5
+ export declare abstract class ApplicationDurationMetricBase extends ObservableMetricBase {
6
+ instanceFocusHandler: InstanceFocusedHandler;
7
+ private focusedTimes;
8
+ private currentFocusedApp?;
9
+ private unInstanceFocusHandler;
10
+ private validator;
11
+ constructor(settings: TelemetryMetricSettings, meter: Meter, userId: string, logger: TelemetryLogger, instanceFocusHandler: InstanceFocusedHandler);
12
+ protected subscribeCore(): Promise<void>;
13
+ protected observeCore(): Promise<void>;
14
+ protected unsubscribeCore(): Promise<void>;
15
+ protected abstract sendMetric(focusedPeriods: number[], data: TelemetryMetricData): void;
16
+ private handleFocusChanged;
17
+ private handleFocusChangedCore;
18
+ private handleGotFocus;
19
+ private handleLostFocus;
20
+ private addFocusLostEventCore;
21
+ }
@@ -0,0 +1,102 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ApplicationDurationMetricBase = void 0;
4
+ const validator_1 = require("../../utils/validator");
5
+ const duration_1 = require("../../validation/metrics/application/duration");
6
+ const observable_1 = require("../base/observable");
7
+ class ApplicationDurationMetricBase extends observable_1.ObservableMetricBase {
8
+ constructor(settings, meter, userId, logger, instanceFocusHandler) {
9
+ super(settings, meter, userId, logger);
10
+ this.instanceFocusHandler = instanceFocusHandler;
11
+ // application -> focused times for a given period
12
+ this.focusedTimes = new Map();
13
+ this.validator = new duration_1.ApplicationDurationMetricValidator();
14
+ this.validator.validate(this);
15
+ }
16
+ subscribeCore() {
17
+ this.unInstanceFocusHandler = this.instanceFocusHandler(this.handleFocusChanged.bind(this));
18
+ return Promise.resolve();
19
+ }
20
+ observeCore() {
21
+ const hasFocusedApp = this.currentFocusedApp !== undefined;
22
+ const currentFocusedApp = hasFocusedApp ? this.currentFocusedApp.name : undefined;
23
+ if (hasFocusedApp) {
24
+ this.handleFocusChanged({ application: currentFocusedApp, focused: false });
25
+ }
26
+ this.focusedTimes.forEach((focusedPeriods, application) => {
27
+ const data = this.getData(application);
28
+ this.sendMetric(focusedPeriods, data);
29
+ focusedPeriods.splice(0);
30
+ });
31
+ if (hasFocusedApp) {
32
+ this.handleFocusChanged({ application: currentFocusedApp, focused: true });
33
+ }
34
+ return Promise.resolve();
35
+ }
36
+ unsubscribeCore() {
37
+ this.unInstanceFocusHandler();
38
+ return Promise.resolve();
39
+ }
40
+ // protected sendMetric(focusedPeriods: number[], data: TelemetryMetricData, result: ObservableResult<TelemetryMetricData>): void {
41
+ // const focusedTime = focusedPeriods.length === 0 ? 0 : focusedPeriods.reduce((prev, current) => prev + current);
42
+ // result.observe(focusedTime, data);
43
+ // this.logger.debug(`metric ${this.settings.name} sent focused time ${focusedTime} for app ${data.application}`);
44
+ // }
45
+ handleFocusChanged(e) {
46
+ try {
47
+ this.validator.validateFocusChanged(e);
48
+ this.logger.debug(`focused changed is being invoked for metric ${this.settings.name} with ${JSON.stringify(e)}`);
49
+ return this.handleFocusChangedCore(e);
50
+ }
51
+ catch (error) {
52
+ const message = `error while executing handleFocusChanges for metric from type: ${this.settings.type}`;
53
+ this.logger.error(message, error);
54
+ }
55
+ }
56
+ handleFocusChangedCore(e) {
57
+ const focused = e.focused;
58
+ const application = e.application;
59
+ if (focused) {
60
+ this.handleGotFocus(application);
61
+ }
62
+ else {
63
+ try {
64
+ this.handleLostFocus(application);
65
+ }
66
+ finally {
67
+ this.currentFocusedApp = undefined;
68
+ }
69
+ }
70
+ }
71
+ handleGotFocus(application) {
72
+ const now = new Date().getTime();
73
+ this.currentFocusedApp = { name: application, gotFocusTime: now };
74
+ if (!this.focusedTimes.has(this.currentFocusedApp.name)) {
75
+ this.focusedTimes.set(this.currentFocusedApp.name, []);
76
+ }
77
+ this.logger.debug(`got focus event has been added for metric ${this.settings.name}`);
78
+ }
79
+ handleLostFocus(application) {
80
+ if (validator_1.Validator.isNullOrUndefined(this.currentFocusedApp)) {
81
+ throw new Error(`cannot handle focus lost for application ${application} since there is no previous got focus event`);
82
+ }
83
+ const currentFocusedApp = this.currentFocusedApp.name;
84
+ const gotFocusTime = this.currentFocusedApp.gotFocusTime;
85
+ if (application !== currentFocusedApp) {
86
+ throw new Error(`cannot handle focus lost for application ${application} since the previous got focus event had come from application ${currentFocusedApp}`);
87
+ }
88
+ if (!this.focusedTimes.has(application)) {
89
+ throw new Error(`there is no got focus event for ${application}`);
90
+ }
91
+ this.addFocusLostEventCore(currentFocusedApp, gotFocusTime);
92
+ this.logger.debug(`lost focus event has been added for metric ${this.settings.name}`);
93
+ }
94
+ addFocusLostEventCore(application, gotFocusTime) {
95
+ const now = new Date().getTime();
96
+ const focusedTime = (now - gotFocusTime);
97
+ const focusedTimes = this.focusedTimes.get(application);
98
+ focusedTimes.push(focusedTime);
99
+ }
100
+ }
101
+ exports.ApplicationDurationMetricBase = ApplicationDurationMetricBase;
102
+ //# sourceMappingURL=durationBase.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"durationBase.js","sourceRoot":"","sources":["../../../src/metrics/application/durationBase.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,7 @@
1
- import { Meter } from "@opentelemetry/api";
2
- import { TelemetryMetricData, InstanceFocusedHandler, TelemetryMetricSettings } from "../types";
3
- import { TelemetryLogger } from "../../types";
4
- import { ApplicationDurationMetric } from "./duration";
5
- export declare class ApplicationDurationHistogramMetric extends ApplicationDurationMetric {
1
+ import { TelemetryMetricData } from "../types";
2
+ import { ApplicationDurationMetricBase } from "./durationBase";
3
+ export declare class ApplicationDurationHistogramMetric extends ApplicationDurationMetricBase {
6
4
  private appDurationMetric;
7
- constructor(settings: TelemetryMetricSettings, meter: Meter, userId: string, logger: TelemetryLogger, instanceFocusHandler: InstanceFocusedHandler);
5
+ protected createMetricCore(): Promise<void>;
8
6
  protected sendMetric(focusedPeriods: number[], data: TelemetryMetricData): void;
9
7
  }
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ApplicationDurationHistogramMetric = void 0;
4
- const duration_1 = require("./duration");
5
- class ApplicationDurationHistogramMetric extends duration_1.ApplicationDurationMetric {
6
- constructor(settings, meter, userId, logger, instanceFocusHandler) {
7
- super(settings, meter, userId, logger, instanceFocusHandler);
4
+ const durationBase_1 = require("./durationBase");
5
+ class ApplicationDurationHistogramMetric extends durationBase_1.ApplicationDurationMetricBase {
6
+ createMetricCore() {
8
7
  const advice = { explicitBucketBoundaries: this.settings.buckets };
9
8
  this.appDurationMetric = this.meter.createHistogram(this.settings.name, { description: this.settings.description, unit: this.settings.unit, advice });
9
+ return Promise.resolve();
10
10
  }
11
11
  sendMetric(focusedPeriods, data) {
12
12
  focusedPeriods.forEach((period) => {
@@ -1 +1 @@
1
- {"version":3,"file":"durationHistogram.js","sourceRoot":"","sources":["../../../src/metrics/application/durationHistogram.ts"],"names":[],"mappings":";;;AAGA,yCAAuD;AAEvD,MAAa,kCAAmC,SAAQ,oCAAyB;IAG7E,YACI,QAAiC,EACjC,KAAY,EACZ,MAAc,EACd,MAAuB,EACvB,oBAA4C;QAE5C,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,EAAE,wBAAwB,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1J,CAAC;IAEkB,UAAU,CAAC,cAAwB,EAAE,IAAyB;QAC7E,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,MAAM,YAAY,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9G,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAtBD,gFAsBC"}
1
+ {"version":3,"file":"durationHistogram.js","sourceRoot":"","sources":["../../../src/metrics/application/durationHistogram.ts"],"names":[],"mappings":";;;AAEA,iDAA+D;AAE/D,MAAa,kCAAmC,SAAQ,4CAA6B;IAG9D,gBAAgB;QAC/B,MAAM,MAAM,GAAG,EAAE,wBAAwB,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAEtJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,UAAU,CAAC,cAAwB,EAAE,IAAyB;QAC7E,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,MAAM,YAAY,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9G,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,gFAgBC"}
@@ -1,17 +1,8 @@
1
- import { Meter, ObservableResult } from "@opentelemetry/api";
2
- import { GaugeMetricBase } from "../base/gauge";
3
- import { TelemetryMetricData, InstanceReadyHandler, TelemetryMetricSettings } from "../types";
4
- import { TelemetryLogger } from "../../types";
5
- export declare class ApplicationStartupMetric extends GaugeMetricBase {
6
- instanceReadyHandler: InstanceReadyHandler;
7
- private startupTimes;
8
- private interopReadyUn;
9
- private validator;
10
- constructor(settings: TelemetryMetricSettings, meter: Meter, userId: string, logger: TelemetryLogger, instanceReadyHandler: InstanceReadyHandler);
11
- protected subscribeCore(): Promise<void>;
12
- protected observeCore(result: ObservableResult<TelemetryMetricData>): Promise<void>;
13
- protected unsubscribeCore(): Promise<void>;
14
- protected sendMetric(startupTimes: number[], data: TelemetryMetricData, result: ObservableResult<TelemetryMetricData>): void;
15
- private handleInstanceReady;
16
- private addStartupTime;
1
+ import { ApplicationStartupMetricBase } from "./startupBase";
2
+ import { TelemetryMetricData } from "../types";
3
+ export declare class ApplicationStartupMetric extends ApplicationStartupMetricBase {
4
+ private lastMetrics;
5
+ private appStartupMetric;
6
+ protected createMetricCore(): Promise<void>;
7
+ protected sendMetric(startupTimes: number[], data: TelemetryMetricData): void;
17
8
  }
@@ -1,73 +1,28 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.ApplicationStartupMetric = void 0;
13
- const gauge_1 = require("../base/gauge");
14
- const startup_1 = require("../../validation/metrics/application/startup");
15
- class ApplicationStartupMetric extends gauge_1.GaugeMetricBase {
16
- constructor(settings, meter, userId, logger, instanceReadyHandler) {
17
- super(settings, meter, userId, logger);
18
- this.instanceReadyHandler = instanceReadyHandler;
19
- // application -> [data, startup times]
20
- this.startupTimes = new Map();
21
- this.validator = new startup_1.ApplicationStartupMetricValidator();
22
- this.validator.validate(this);
4
+ const startupBase_1 = require("./startupBase");
5
+ class ApplicationStartupMetric extends startupBase_1.ApplicationStartupMetricBase {
6
+ constructor() {
7
+ super(...arguments);
8
+ // app -> last metric value
9
+ this.lastMetrics = new Map();
23
10
  }
24
- subscribeCore() {
25
- this.interopReadyUn = this.instanceReadyHandler(this.handleInstanceReady.bind(this));
11
+ createMetricCore() {
12
+ this.appStartupMetric = this.meter.createUpDownCounter(this.settings.name, { description: this.settings.description, unit: this.settings.unit });
26
13
  return Promise.resolve();
27
14
  }
28
- observeCore(result) {
29
- return __awaiter(this, void 0, void 0, function* () {
30
- this.startupTimes.forEach((kvp, application) => {
31
- const metrics = kvp[1];
32
- if (metrics.length > 0) {
33
- const data = kvp[0];
34
- this.sendMetric(metrics, data, result);
35
- this.startupTimes.set(application, [data, []]);
36
- }
37
- });
38
- });
39
- }
40
- unsubscribeCore() {
41
- this.interopReadyUn();
42
- return Promise.resolve();
43
- }
44
- sendMetric(startupTimes, data, result) {
15
+ sendMetric(startupTimes, data) {
16
+ const application = data.application;
45
17
  const slowest = Math.max(...startupTimes);
46
- result.observe(slowest, data);
47
- this.logger.debug(`metric ${this.settings.name} sent slowest startup time ${slowest} for app ${data.application}`);
48
- }
49
- handleInstanceReady(e) {
50
- try {
51
- this.validator.validateInstanceReady(e);
52
- this.logger.debug(`instance ready for application ${e.application} and metric ${this.settings.name} is being invoked`);
53
- const now = (new Date()).getTime();
54
- const startupTime = now - e.startTime.getTime();
55
- this.addStartupTime(startupTime, e.application);
56
- this.logger.debug(`start up time ${startupTime} has been added for metric ${this.settings.name}`);
57
- }
58
- catch (error) {
59
- const message = `error while executing handleInstanceReady for metric from type: ${this.settings.type}`;
60
- this.logger.error(message, error);
61
- }
62
- }
63
- addStartupTime(time, application) {
64
- if (!this.startupTimes.has(application)) {
65
- const data = this.getData(application);
66
- this.startupTimes.set(application, [data, []]);
18
+ if (this.lastMetrics.has(application)) {
19
+ const lastSlowestStartup = -this.lastMetrics.get(application);
20
+ this.appStartupMetric.add(lastSlowestStartup, data);
21
+ this.logger.debug(`metric ${this.settings.name} sent startup time ${lastSlowestStartup} for app ${application}`);
67
22
  }
68
- const kvp = this.startupTimes.get(application);
69
- const metrics = kvp[1];
70
- metrics.push(time);
23
+ this.appStartupMetric.add(slowest, data);
24
+ this.logger.debug(`metric ${this.settings.name} sent slowest startup time ${slowest} for app ${application}`);
25
+ this.lastMetrics.set(application, slowest);
71
26
  }
72
27
  }
73
28
  exports.ApplicationStartupMetric = ApplicationStartupMetric;
@@ -1 +1 @@
1
- {"version":3,"file":"startup.js","sourceRoot":"","sources":["../../../src/metrics/application/startup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"startup.js","sourceRoot":"","sources":["../../../src/metrics/application/startup.ts"],"names":[],"mappings":";;;AACA,+CAA6D;AAG7D,MAAa,wBAAyB,SAAQ,0CAA4B;IAA1E;;QACI,2BAA2B;QACnB,gBAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAuBpD,CAAC;IApBsB,gBAAgB;QAC/B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACjJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,UAAU,CAAC,YAAsB,EAAE,IAAyB;QAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,WAAY,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;QAE1C,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACnC,MAAM,kBAAkB,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;YAC/D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,kBAAkB,YAAY,WAAW,EAAE,CAAC,CAAC;SACpH;QAED,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,8BAA8B,OAAO,YAAY,WAAW,EAAE,CAAC,CAAC;QAE9G,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;CACJ;AAzBD,4DAyBC"}
@@ -0,0 +1,17 @@
1
+ import { Meter } from "@opentelemetry/api";
2
+ import { TelemetryMetricData, InstanceReadyHandler, TelemetryMetricSettings } from "../types";
3
+ import { TelemetryLogger } from "../../types";
4
+ import { ObservableMetricBase } from "../base/observable";
5
+ export declare abstract class ApplicationStartupMetricBase extends ObservableMetricBase {
6
+ instanceReadyHandler: InstanceReadyHandler;
7
+ private startupTimes;
8
+ private interopReadyUn;
9
+ private validator;
10
+ constructor(settings: TelemetryMetricSettings, meter: Meter, userId: string, logger: TelemetryLogger, instanceReadyHandler: InstanceReadyHandler);
11
+ protected subscribeCore(): Promise<void>;
12
+ protected observeCore(): Promise<void>;
13
+ protected unsubscribeCore(): Promise<void>;
14
+ protected abstract sendMetric(startupTimes: number[], data: TelemetryMetricData): void;
15
+ private handleInstanceReady;
16
+ private addStartupTime;
17
+ }
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.ApplicationStartupMetricBase = void 0;
13
+ const startup_1 = require("../../validation/metrics/application/startup");
14
+ const observable_1 = require("../base/observable");
15
+ class ApplicationStartupMetricBase extends observable_1.ObservableMetricBase {
16
+ constructor(settings, meter, userId, logger, instanceReadyHandler) {
17
+ super(settings, meter, userId, logger);
18
+ this.instanceReadyHandler = instanceReadyHandler;
19
+ // application -> [data, startup times]
20
+ this.startupTimes = new Map();
21
+ this.validator = new startup_1.ApplicationStartupMetricValidator();
22
+ this.validator.validate(this);
23
+ }
24
+ subscribeCore() {
25
+ this.interopReadyUn = this.instanceReadyHandler(this.handleInstanceReady.bind(this));
26
+ return Promise.resolve();
27
+ }
28
+ observeCore() {
29
+ return __awaiter(this, void 0, void 0, function* () {
30
+ this.startupTimes.forEach((kvp, application) => {
31
+ const metrics = kvp[1];
32
+ if (metrics.length > 0) {
33
+ const data = kvp[0];
34
+ this.sendMetric(metrics, data);
35
+ this.startupTimes.set(application, [data, []]);
36
+ }
37
+ });
38
+ });
39
+ }
40
+ unsubscribeCore() {
41
+ this.interopReadyUn();
42
+ return Promise.resolve();
43
+ }
44
+ handleInstanceReady(e) {
45
+ try {
46
+ this.validator.validateInstanceReady(e);
47
+ this.logger.debug(`instance ready for application ${e.application} and metric ${this.settings.name} is being invoked`);
48
+ const startupTime = e.endTime.getTime() - e.startTime.getTime();
49
+ this.addStartupTime(startupTime, e.application);
50
+ this.logger.debug(`start up time ${startupTime} has been added for metric ${this.settings.name}`);
51
+ }
52
+ catch (error) {
53
+ const message = `error while executing handleInstanceReady for metric from type: ${this.settings.type}`;
54
+ this.logger.error(message, error);
55
+ }
56
+ }
57
+ addStartupTime(time, application) {
58
+ if (!this.startupTimes.has(application)) {
59
+ const data = this.getData(application);
60
+ this.startupTimes.set(application, [data, []]);
61
+ }
62
+ const kvp = this.startupTimes.get(application);
63
+ const metrics = kvp[1];
64
+ metrics.push(time);
65
+ }
66
+ }
67
+ exports.ApplicationStartupMetricBase = ApplicationStartupMetricBase;
68
+ //# sourceMappingURL=startupBase.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"startupBase.js","sourceRoot":"","sources":["../../../src/metrics/application/startupBase.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,7 @@
1
- import { Meter } from "@opentelemetry/api";
2
- import { ApplicationStartupMetric } from "./startup";
3
- import { TelemetryMetricData, InstanceReadyHandler, TelemetryMetricSettings } from "../types";
4
- import { TelemetryLogger } from "../../types";
5
- export declare class ApplicationStartupHistogramMetric extends ApplicationStartupMetric {
1
+ import { ApplicationStartupMetricBase } from "./startupBase";
2
+ import { TelemetryMetricData } from "../types";
3
+ export declare class ApplicationStartupHistogramMetric extends ApplicationStartupMetricBase {
6
4
  private appStartupMetric;
7
- constructor(settings: TelemetryMetricSettings, meter: Meter, userId: string, logger: TelemetryLogger, instanceReadyHandler: InstanceReadyHandler);
5
+ protected createMetricCore(): Promise<void>;
8
6
  protected sendMetric(startupTimes: number[], data: TelemetryMetricData): void;
9
7
  }
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ApplicationStartupHistogramMetric = void 0;
4
- const startup_1 = require("./startup");
5
- class ApplicationStartupHistogramMetric extends startup_1.ApplicationStartupMetric {
6
- constructor(settings, meter, userId, logger, instanceReadyHandler) {
7
- super(settings, meter, userId, logger, instanceReadyHandler);
4
+ const startupBase_1 = require("./startupBase");
5
+ class ApplicationStartupHistogramMetric extends startupBase_1.ApplicationStartupMetricBase {
6
+ createMetricCore() {
8
7
  const advice = { explicitBucketBoundaries: this.settings.buckets };
9
8
  this.appStartupMetric = this.meter.createHistogram(this.settings.name, { description: this.settings.description, unit: this.settings.unit, advice });
9
+ return Promise.resolve();
10
10
  }
11
11
  sendMetric(startupTimes, data) {
12
12
  startupTimes.forEach((time) => {
@@ -1 +1 @@
1
- {"version":3,"file":"startupHistogram.js","sourceRoot":"","sources":["../../../src/metrics/application/startupHistogram.ts"],"names":[],"mappings":";;;AACA,uCAAqD;AAIrD,MAAa,iCAAkC,SAAQ,kCAAwB;IAG3E,YACI,QAAiC,EACjC,KAAY,EACZ,MAAc,EACd,MAAuB,EACvB,oBAA0C;QAE1C,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,EAAE,wBAAwB,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACzJ,CAAC;IAEkB,UAAU,CAAC,YAAsB,EAAE,IAAyB;QAC3E,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,IAAI,YAAY,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5G,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAtBD,8EAsBC"}
1
+ {"version":3,"file":"startupHistogram.js","sourceRoot":"","sources":["../../../src/metrics/application/startupHistogram.ts"],"names":[],"mappings":";;;AACA,+CAA6D;AAG7D,MAAa,iCAAkC,SAAQ,0CAA4B;IAG5D,gBAAgB;QAC/B,MAAM,MAAM,GAAG,EAAE,wBAAwB,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACnE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAErJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,UAAU,CAAC,YAAsB,EAAE,IAAyB;QAC3E,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,sBAAsB,IAAI,YAAY,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5G,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,8EAgBC"}