Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(instrumentation-runtime-node)!: add prom-client-metrics #2136

Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ed6596f
feat(prom-client) add implementation for collecting event loop lag, g…
pikalovArtemN Apr 22, 2024
046072e
test(prom-client) add tests for check implementation
pikalovArtemN Apr 22, 2024
d7c5108
chore(prom-client) change version and fix README.md
pikalovArtemN Apr 22, 2024
ad88f98
Merge branch 'main' into feat/node/prom-client-implementation
pikalovArtemN Apr 22, 2024
2cd9093
chore(instrumentation-runtime-node): fetch loop lag format in convention
pikalovArtemN May 3, 2024
184b212
chore(instrumentation-runtime-node): fetch other metrics to convention
pikalovArtemN May 3, 2024
922d677
test(instrumentation-runtime-node):fix some tests
pikalovArtemN May 3, 2024
3cba596
chore(instrumentation-runtime-node): sync with conventions
pikalovArtemN May 17, 2024
54858de
test(instrumentation-runtime-node): fix tests
pikalovArtemN May 17, 2024
926f052
test(instrumentation-runtime-node): fix tests
pikalovArtemN May 17, 2024
dbb34ff
lint(instrumentation-runtime-node): lint
pikalovArtemN May 17, 2024
ade0ab9
Merge remote-tracking branch 'origin/feat/node/prom-client-implementa…
pikalovArtemN May 17, 2024
7a98bfd
Merge branch 'main' into feat/node/prom-client-implementation
pikalovArtemN May 17, 2024
7418c78
chore(instrumentation-runtime-node): synchronize with convention
pikalovArtemN Jul 6, 2024
fdfea51
Merge remote-tracking branch 'origin/feat/node/prom-client-implementa…
pikalovArtemN Jul 6, 2024
6a84254
chore(instrumentation-runtime-node): remove scrape interval, remove u…
pikalovArtemN Jul 15, 2024
5efdd9d
chore(instrumentation-runtime-node): set default monitoringPrecision …
pikalovArtemN Jul 16, 2024
a69fc5c
chore(instrumentation-runtime-node): addnodejs.eventloop.time, fix tests
pikalovArtemN Aug 3, 2024
2d31e98
Merge branch 'main' into feat/node/prom-client-implementation
pikalovArtemN Oct 7, 2024
184be5e
chore(instrumentation-runtime-node): fix conflicts
pikalovArtemN Oct 7, 2024
8bf14b5
chore(instrumentation-runtime-node): fix event loop utilization colle…
pikalovArtemN Oct 8, 2024
5121a0b
chore(instrumentation-runtime-node): fix package.json
pikalovArtemN Oct 8, 2024
fd8d803
chore(instrumentation-runtime-node): fix conflicts
pikalovArtemN Oct 8, 2024
6506489
chore(instrumentation-runtime-node): lint
pikalovArtemN Oct 8, 2024
012f370
Merge branch 'main' into feat/node/prom-client-implementation
pikalovArtemN Oct 8, 2024
247403e
chore(instrumentation-runtime-node): fix test
pikalovArtemN Oct 9, 2024
d99c458
Merge remote-tracking branch 'origin/feat/node/prom-client-implementa…
pikalovArtemN Oct 9, 2024
43ba51c
Merge branch 'main' into feat/node/prom-client-implementation
pikalovArtemN Oct 9, 2024
2189d51
Merge branch 'main' into feat/node/prom-client-implementation
david-luna Oct 10, 2024
460003f
chore(instrumentation-runtime-node): fix package-lock.json
pikalovArtemN Oct 10, 2024
310a2b2
Merge remote-tracking branch 'origin/feat/node/prom-client-implementa…
pikalovArtemN Oct 10, 2024
feb3f36
Merge branch 'main' into feat/node/prom-client-implementation
david-luna Oct 17, 2024
6b5fc8b
chore(instrumentation-runtime-node): fix attributes names
pikalovArtemN Nov 3, 2024
97d8d92
Merge remote-tracking branch 'origin/feat/node/prom-client-implementa…
pikalovArtemN Nov 3, 2024
cab7e6c
chore(instrumentation-runtime-node): merge main
pikalovArtemN Nov 3, 2024
b663012
chore(instrumentation-runtime-node): lint
pikalovArtemN Nov 4, 2024
a6a9e81
chore: add skip lint directive
david-luna Nov 5, 2024
4941407
Merge branch 'main' into feat/node/prom-client-implementation
david-luna Nov 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions plugins/node/instrumentation-runtime-node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const prometheusExporter = new PrometheusExporter({
const sdk = new NodeSDK({
metricReader: prometheusExporter,
instrumentations: [new RuntimeNodeInstrumentation({
eventLoopUtilizationMeasurementInterval: 5000,
monitoringPrecision: 5000,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor Q: It looks like the default is 10 ms (from lower down in this README). Should the example here show 10 rather than 5000?

})],
});

Expand All @@ -44,7 +44,7 @@ Go to [`localhost:9464/metrics`](http://localhost:9464/metrics), and you should
nodejs_performance_event_loop_utilization 0.010140079547955264
```

> Metrics will only be exported after it has collected two ELU readings (at least approximately `RuntimeNodeInstrumentationConfig.eventLoopUtilizationMeasurementInterval` milliseconds after initialization). Otherwise, you may see:
> Metrics will only be exported after it has collected two ELU readings (at least approximately `RuntimeNodeInstrumentationConfig.monitoringPrecision` milliseconds after initialization). Otherwise, you may see:
>
> ```txt
> # no registered metrics
Expand All @@ -56,7 +56,7 @@ nodejs_performance_event_loop_utilization 0.010140079547955264

| name | type | unit | default | description |
|---|---|---|---|---|
| [`eventLoopUtilizationMeasurementInterval`](./src/types.ts#L25) | `int` | millisecond | `5000` | The approximate number of milliseconds for which to calculate event loop utilization averages. A larger value will result in more accurate averages at the expense of less granular data. Should be set to below the scrape interval of your metrics collector to avoid duplicated data points. |
| [`monitoringPrecision`](./src/types.ts#L25) | `int` | millisecond | `5000` | The approximate number of milliseconds for which to calculate event loop utilization averages. A larger value will result in more accurate averages at the expense of less granular data. Should be set to below the scrape interval of your metrics collector to avoid duplicated data points. |

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion(non-blocking): update the default

You changed the default to 10 so we should update the README too

Suggested change
| [`monitoringPrecision`](./src/types.ts#L25) | `int` | millisecond | `5000` | The approximate number of milliseconds for which to calculate event loop utilization averages. A larger value will result in more accurate averages at the expense of less granular data. Should be set to below the scrape interval of your metrics collector to avoid duplicated data points. |
| [`monitoringPrecision`](./src/types.ts#L25) | `int` | millisecond | `10` | The approximate number of milliseconds for which to calculate event loop utilization averages. A larger value will result in more accurate averages at the expense of less granular data. Should be set to below the scrape interval of your metrics collector to avoid duplicated data points. |

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 6b5fc8b


## Supported Node.js versions

Expand Down
4 changes: 2 additions & 2 deletions plugins/node/instrumentation-runtime-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=14.10.0"
"node": ">=17.4.0"
david-luna marked this conversation as resolved.
Show resolved Hide resolved
},
"keywords": [
"perf_hooks",
Expand All @@ -45,7 +45,7 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/sdk-metrics": "^1.20.0",
"@types/mocha": "^10.0.6",
"@types/node": "^20.11.2",
"@types/node": "^22.1.0",
david-luna marked this conversation as resolved.
Show resolved Hide resolved
"mocha": "7.2.0",
"nyc": "^15.1.0",
"rimraf": "5.0.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* Copyright The OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export const V8_HEAP_SIZE_NAME_ATTRIBUTE = 'heap.space.name';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume these are just temporary until the next semconv release?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, they already exist on the current release (they didn't when the PR was created), so @pikalovArtemN you can replace for the final values. For example, this one is ATTR_V8JS_HEAP_SPACE_NAME

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix

85 changes: 40 additions & 45 deletions plugins/node/instrumentation-runtime-node/src/instrumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,83 +13,78 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { EventLoopUtilization, performance } from 'node:perf_hooks';
const { eventLoopUtilization } = performance;

import { InstrumentationBase } from '@opentelemetry/instrumentation';

import { VERSION } from './version';
import { RuntimeNodeInstrumentationConfig } from './types';
import { MetricCollector } from './types/metricCollector';
import { EventLoopUtilizationCollector } from './metrics/eventLoopUtilizationCollector';
import { EventLoopDelayCollector } from './metrics/eventLoopDelayCollector';
import { GCCollector } from './metrics/gcCollector';
import { HeapSpacesSizeAndUsedCollector } from './metrics/heapSpacesSizeAndUsedCollector';
import { ConventionalNamePrefix } from './types/ConventionalNamePrefix';
import {EventLoopTimeCollector} from "./metrics/eventLoopTimeCollector";

const ELUS_LENGTH = 2;
const DEFAULT_CONFIG: RuntimeNodeInstrumentationConfig = {
eventLoopUtilizationMeasurementInterval: 5000,
monitoringPrecision: 10,
};

export class RuntimeNodeInstrumentation extends InstrumentationBase {
private _ELUs: EventLoopUtilization[] = [];
private _interval: NodeJS.Timeout | undefined;
private _collectors: MetricCollector[] = [];

constructor(config: RuntimeNodeInstrumentationConfig = {}) {
super(
'@opentelemetry/instrumentation-runtime-node',
VERSION,
Object.assign({}, DEFAULT_CONFIG, config)
);
}

private _addELU() {
this._ELUs.unshift(eventLoopUtilization());
if (this._ELUs.length > ELUS_LENGTH) {
this._ELUs.pop();
}
}

private _clearELU() {
if (!this._ELUs) {
this._ELUs = [];
this._collectors = [
new EventLoopUtilizationCollector(
this._config,
ConventionalNamePrefix.NodeJs
),
new EventLoopTimeCollector(
this._config,
ConventionalNamePrefix.NodeJs
),
new EventLoopDelayCollector(this._config, ConventionalNamePrefix.NodeJs),
new GCCollector(this._config, ConventionalNamePrefix.V8js),
new HeapSpacesSizeAndUsedCollector(
this._config,
ConventionalNamePrefix.V8js
),
];
if (this._config.enabled) {
for (const collector of this._collectors) {
collector.enable();
}
}
this._ELUs.length = 0;
}

// Called when a new `MeterProvider` is set
// the Meter (result of @opentelemetry/api's getMeter) is available as this.meter within this method
override _updateMetricInstruments() {
this.meter
.createObservableGauge('nodejs.event_loop.utilization', {
description: 'Event loop utilization',
unit: '1',
})
.addCallback(async observableResult => {
if (this._ELUs.length !== ELUS_LENGTH) {
return;
}
const elu = eventLoopUtilization(...this._ELUs);
observableResult.observe(elu.utilization);
});
if (!this._collectors) return;
for (const collector of this._collectors) {
collector.updateMetricInstruments(this.meter);
}
}

init() {
// Not instrumenting or patching a Node.js module
}

override enable() {
this._clearELU();
this._addELU();
clearInterval(this._interval);
this._interval = setInterval(
() => this._addELU(),
(this._config as RuntimeNodeInstrumentationConfig)
.eventLoopUtilizationMeasurementInterval
);
if (!this._collectors) return;

// unref so that it does not keep the process running if disable() is never called
this._interval?.unref();
for (const collector of this._collectors) {
collector.enable();
}
}

override disable() {
this._clearELU();
clearInterval(this._interval);
this._interval = undefined;
for (const collector of this._collectors) {
collector.disable();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright The OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { MetricCollector } from '../types/metricCollector';
import { Meter } from '@opentelemetry/api';
import { RuntimeNodeInstrumentationConfig } from '../types';

export abstract class BaseCollector implements MetricCollector {
protected _config: RuntimeNodeInstrumentationConfig = {};

protected namePrefix: string;

protected constructor(
config: RuntimeNodeInstrumentationConfig = {},
namePrefix: string
) {
this._config = config;
this.namePrefix = namePrefix;
}

public disable(): void {
this._config.enabled = false;
this.internalDisable();
}

public enable(): void {
this._config.enabled = true;
this.internalEnable();
}

public abstract updateMetricInstruments(meter: Meter): void;

protected abstract internalEnable(): void;

protected abstract internalDisable(): void;
}
Loading