@theia/metrics 1.45.1 → 1.46.0-next.72

package/src/node/index.ts

@@ -1,21 +1,21 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-export * from './metrics-backend-application-contribution';
-export * from './metrics-contribution';
-export * from './node-metrics-contribution';
-export * from './extensions-metrics-contribution';
-export * from './prometheus';
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+export * from './metrics-backend-application-contribution';
+export * from './metrics-contribution';
+export * from './node-metrics-contribution';
+export * from './extensions-metrics-contribution';
+export * from './prometheus';

package/src/node/measurement-metrics-contribution.ts

@@ -1,75 +1,75 @@
-// *****************************************************************************
-// Copyright (C) 2023 STMicroelectronics and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-import { inject, injectable, } from '@theia/core/shared/inversify';
-import { MetricsContribution } from './metrics-contribution';
-import { LogLevel, MeasurementResult, Stopwatch } from '@theia/core';
-import { MeasurementNotificationService } from '../common';
-import { LogLevelCliContribution } from '@theia/core/lib/node/logger-cli-contribution';
-
-const backendId = 'backend';
-const metricsName = 'theia_measurements';
-
-@injectable()
-export class MeasurementMetricsBackendContribution implements MetricsContribution, MeasurementNotificationService {
-    @inject(Stopwatch)
-    protected backendStopwatch: Stopwatch;
-
-    @inject(LogLevelCliContribution)
-    protected logLevelCli: LogLevelCliContribution;
-
-    protected metrics = '';
-    protected frontendCounters = new Map<string, string>();
-
-    startCollecting(): void {
-        if (this.logLevelCli.defaultLogLevel !== LogLevel.DEBUG) {
-            return;
-        }
-        this.metrics += `# HELP ${metricsName} Theia stopwatch measurement results.\n`;
-        this.metrics += `# TYPE ${metricsName} gauge\n`;
-        this.backendStopwatch.storedMeasurements.forEach(result => this.onBackendMeasurement(result));
-        this.backendStopwatch.onDidAddMeasurementResult(result => this.onBackendMeasurement(result));
-    }
-
-    getMetrics(): string {
-        return this.metrics;
-    }
-
-    protected appendMetricsValue(id: string, result: MeasurementResult): void {
-        const { name, elapsed, startTime, owner } = result;
-        const labels: string = `id="${id}", name="${name}", startTime="${startTime}", owner="${owner}"`;
-        const metricsValue = `${metricsName}{${labels}} ${elapsed}`;
-        this.metrics += (metricsValue + '\n');
-    }
-
-    protected onBackendMeasurement(result: MeasurementResult): void {
-        this.appendMetricsValue(backendId, result);
-    }
-
-    protected createFrontendCounterId(frontendId: string): string {
-        const counterId = `frontend-${this.frontendCounters.size + 1}`;
-        this.frontendCounters.set(frontendId, counterId);
-        return counterId;
-    }
-
-    protected toCounterId(frontendId: string): string {
-        return this.frontendCounters.get(frontendId) ?? this.createFrontendCounterId(frontendId);
-    }
-
-    onFrontendMeasurement(frontendId: string, result: MeasurementResult): void {
-        this.appendMetricsValue(this.toCounterId(frontendId), result);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2023 STMicroelectronics and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+import { inject, injectable, } from '@theia/core/shared/inversify';
+import { MetricsContribution } from './metrics-contribution';
+import { LogLevel, MeasurementResult, Stopwatch } from '@theia/core';
+import { MeasurementNotificationService } from '../common';
+import { LogLevelCliContribution } from '@theia/core/lib/node/logger-cli-contribution';
+
+const backendId = 'backend';
+const metricsName = 'theia_measurements';
+
+@injectable()
+export class MeasurementMetricsBackendContribution implements MetricsContribution, MeasurementNotificationService {
+    @inject(Stopwatch)
+    protected backendStopwatch: Stopwatch;
+
+    @inject(LogLevelCliContribution)
+    protected logLevelCli: LogLevelCliContribution;
+
+    protected metrics = '';
+    protected frontendCounters = new Map<string, string>();
+
+    startCollecting(): void {
+        if (this.logLevelCli.defaultLogLevel !== LogLevel.DEBUG) {
+            return;
+        }
+        this.metrics += `# HELP ${metricsName} Theia stopwatch measurement results.\n`;
+        this.metrics += `# TYPE ${metricsName} gauge\n`;
+        this.backendStopwatch.storedMeasurements.forEach(result => this.onBackendMeasurement(result));
+        this.backendStopwatch.onDidAddMeasurementResult(result => this.onBackendMeasurement(result));
+    }
+
+    getMetrics(): string {
+        return this.metrics;
+    }
+
+    protected appendMetricsValue(id: string, result: MeasurementResult): void {
+        const { name, elapsed, startTime, owner } = result;
+        const labels: string = `id="${id}", name="${name}", startTime="${startTime}", owner="${owner}"`;
+        const metricsValue = `${metricsName}{${labels}} ${elapsed}`;
+        this.metrics += (metricsValue + '\n');
+    }
+
+    protected onBackendMeasurement(result: MeasurementResult): void {
+        this.appendMetricsValue(backendId, result);
+    }
+
+    protected createFrontendCounterId(frontendId: string): string {
+        const counterId = `frontend-${this.frontendCounters.size + 1}`;
+        this.frontendCounters.set(frontendId, counterId);
+        return counterId;
+    }
+
+    protected toCounterId(frontendId: string): string {
+        return this.frontendCounters.get(frontendId) ?? this.createFrontendCounterId(frontendId);
+    }
+
+    onFrontendMeasurement(frontendId: string, result: MeasurementResult): void {
+        this.appendMetricsValue(this.toCounterId(frontendId), result);
+    }
+
+}

package/src/node/metrics-backend-application-contribution.ts

@@ -1,50 +1,50 @@
-// *****************************************************************************
-// Copyright (C) 2017-2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject, named } from '@theia/core/shared/inversify';
-import * as http from 'http';
-import * as https from 'https';
-import * as express from '@theia/core/shared/express';
-import { ContributionProvider } from '@theia/core/lib/common';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { MetricsContribution } from './metrics-contribution';
-
-@injectable()
-export class MetricsBackendApplicationContribution implements BackendApplicationContribution {
-    constructor(
-        @inject(ContributionProvider) @named(MetricsContribution)
-        protected readonly metricsProviders: ContributionProvider<MetricsContribution>
-    ) {
-    }
-
-    configure(app: express.Application): void {
-        app.get('/metrics', (req, res) => {
-            const lastMetrics = this.fetchMetricsFromProviders();
-            res.send(lastMetrics);
-        });
-    }
-
-    onStart(server: http.Server | https.Server): void {
-        this.metricsProviders.getContributions().forEach(contribution => {
-            contribution.startCollecting();
-        });
-    }
-
-    fetchMetricsFromProviders(): string {
-        return this.metricsProviders.getContributions().reduce((total, contribution) =>
-            total += contribution.getMetrics() + '\n', '');
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017-2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject, named } from '@theia/core/shared/inversify';
+import * as http from 'http';
+import * as https from 'https';
+import * as express from '@theia/core/shared/express';
+import { ContributionProvider } from '@theia/core/lib/common';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { MetricsContribution } from './metrics-contribution';
+
+@injectable()
+export class MetricsBackendApplicationContribution implements BackendApplicationContribution {
+    constructor(
+        @inject(ContributionProvider) @named(MetricsContribution)
+        protected readonly metricsProviders: ContributionProvider<MetricsContribution>
+    ) {
+    }
+
+    configure(app: express.Application): void {
+        app.get('/metrics', (req, res) => {
+            const lastMetrics = this.fetchMetricsFromProviders();
+            res.send(lastMetrics);
+        });
+    }
+
+    onStart(server: http.Server | https.Server): void {
+        this.metricsProviders.getContributions().forEach(contribution => {
+            contribution.startCollecting();
+        });
+    }
+
+    fetchMetricsFromProviders(): string {
+        return this.metricsProviders.getContributions().reduce((total, contribution) =>
+            total += contribution.getMetrics() + '\n', '');
+    }
+}

package/src/node/metrics-backend-module.ts

@@ -1,40 +1,40 @@
-// *****************************************************************************
-// Copyright (C) 2017-2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { ConnectionHandler, RpcConnectionHandler, bindContributionProvider } from '@theia/core/lib/common';
-import { MetricsContribution } from './metrics-contribution';
-import { NodeMetricsContribution } from './node-metrics-contribution';
-import { ExtensionMetricsContribution } from './extensions-metrics-contribution';
-import { MetricsBackendApplicationContribution } from './metrics-backend-application-contribution';
-import { measurementNotificationServicePath } from '../common';
-import { MeasurementMetricsBackendContribution } from './measurement-metrics-contribution';
-
-export default new ContainerModule(bind => {
-    bindContributionProvider(bind, MetricsContribution);
-    bind(MetricsContribution).to(NodeMetricsContribution).inSingletonScope();
-    bind(MetricsContribution).to(ExtensionMetricsContribution).inSingletonScope();
-
-    bind(MeasurementMetricsBackendContribution).toSelf().inSingletonScope();
-    bind(MetricsContribution).toService(MeasurementMetricsBackendContribution);
-    bind(ConnectionHandler).toDynamicValue(ctx =>
-        new RpcConnectionHandler(measurementNotificationServicePath,
-            () => ctx.container.get(MeasurementMetricsBackendContribution)));
-
-    bind(BackendApplicationContribution).to(MetricsBackendApplicationContribution).inSingletonScope();
-
-});
+// *****************************************************************************
+// Copyright (C) 2017-2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { ConnectionHandler, RpcConnectionHandler, bindContributionProvider } from '@theia/core/lib/common';
+import { MetricsContribution } from './metrics-contribution';
+import { NodeMetricsContribution } from './node-metrics-contribution';
+import { ExtensionMetricsContribution } from './extensions-metrics-contribution';
+import { MetricsBackendApplicationContribution } from './metrics-backend-application-contribution';
+import { measurementNotificationServicePath } from '../common';
+import { MeasurementMetricsBackendContribution } from './measurement-metrics-contribution';
+
+export default new ContainerModule(bind => {
+    bindContributionProvider(bind, MetricsContribution);
+    bind(MetricsContribution).to(NodeMetricsContribution).inSingletonScope();
+    bind(MetricsContribution).to(ExtensionMetricsContribution).inSingletonScope();
+
+    bind(MeasurementMetricsBackendContribution).toSelf().inSingletonScope();
+    bind(MetricsContribution).toService(MeasurementMetricsBackendContribution);
+    bind(ConnectionHandler).toDynamicValue(ctx =>
+        new RpcConnectionHandler(measurementNotificationServicePath,
+            () => ctx.container.get(MeasurementMetricsBackendContribution)));
+
+    bind(BackendApplicationContribution).to(MetricsBackendApplicationContribution).inSingletonScope();
+
+});

package/src/node/metrics-contribution.ts

@@ -1,20 +1,20 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-export const MetricsContribution = Symbol('MetricsContribution');
-export interface MetricsContribution {
-    startCollecting(): void;
-    getMetrics(): string;
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+export const MetricsContribution = Symbol('MetricsContribution');
+export interface MetricsContribution {
+    startCollecting(): void;
+    getMetrics(): string;
+}

package/src/node/node-metrics-contribution.ts

@@ -1,33 +1,33 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as prom from 'prom-client';
-import { injectable } from '@theia/core/shared/inversify';
-import { MetricsContribution } from './metrics-contribution';
-
-@injectable()
-export class NodeMetricsContribution implements MetricsContribution {
-    getMetrics(): string {
-        return prom.register.metrics().toString();
-    }
-
-    startCollecting(): void {
-        const collectDefaultMetrics = prom.collectDefaultMetrics;
-
-        // Probe every 5th second.
-        collectDefaultMetrics({ timeout: 5000 });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as prom from 'prom-client';
+import { injectable } from '@theia/core/shared/inversify';
+import { MetricsContribution } from './metrics-contribution';
+
+@injectable()
+export class NodeMetricsContribution implements MetricsContribution {
+    getMetrics(): string {
+        return prom.register.metrics().toString();
+    }
+
+    startCollecting(): void {
+        const collectDefaultMetrics = prom.collectDefaultMetrics;
+
+        // Probe every 5th second.
+        collectDefaultMetrics({ timeout: 5000 });
+    }
+}

package/src/node/prometheus.spec.ts

@@ -1,49 +1,49 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as chai from 'chai';
-import { PROMETHEUS_REGEXP, toPrometheusValidName } from './prometheus';
-
-const expect = chai.expect;
-
-describe('Prometheus helper module', () => {
-    /* According to https://prometheus.io/docs/concepts/data_model/ */
-
-    const validName = 'theia_extension3242-:';
-    const invalidTheiaName = '@theia/something';
-    const validTheiaName = 'theia_something';
-    const invalidName2 = '@theia/?$%^ ';
-
-    it('Should correctly validate a metric name', () => {
-        expect(PROMETHEUS_REGEXP.test(validName)).to.be.true;
-
-        expect(PROMETHEUS_REGEXP.test(invalidTheiaName)).to.be.false;
-
-        expect(PROMETHEUS_REGEXP.test(invalidName2)).to.be.false;
-
-    });
-
-    it('Should correctly return a valid name from an otherwise invalid prometheus string', () => {
-        expect(PROMETHEUS_REGEXP.test(invalidTheiaName)).to.be.false;
-
-        const newName = toPrometheusValidName(invalidTheiaName);
-        expect(PROMETHEUS_REGEXP.test(newName)).to.be.true;
-        expect(newName).to.be.equal(validTheiaName);
-
-        const newName2 = toPrometheusValidName(invalidName2);
-        expect(PROMETHEUS_REGEXP.test(newName2)).to.be.true;
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as chai from 'chai';
+import { PROMETHEUS_REGEXP, toPrometheusValidName } from './prometheus';
+
+const expect = chai.expect;
+
+describe('Prometheus helper module', () => {
+    /* According to https://prometheus.io/docs/concepts/data_model/ */
+
+    const validName = 'theia_extension3242-:';
+    const invalidTheiaName = '@theia/something';
+    const validTheiaName = 'theia_something';
+    const invalidName2 = '@theia/?$%^ ';
+
+    it('Should correctly validate a metric name', () => {
+        expect(PROMETHEUS_REGEXP.test(validName)).to.be.true;
+
+        expect(PROMETHEUS_REGEXP.test(invalidTheiaName)).to.be.false;
+
+        expect(PROMETHEUS_REGEXP.test(invalidName2)).to.be.false;
+
+    });
+
+    it('Should correctly return a valid name from an otherwise invalid prometheus string', () => {
+        expect(PROMETHEUS_REGEXP.test(invalidTheiaName)).to.be.false;
+
+        const newName = toPrometheusValidName(invalidTheiaName);
+        expect(PROMETHEUS_REGEXP.test(newName)).to.be.true;
+        expect(newName).to.be.equal(validTheiaName);
+
+        const newName2 = toPrometheusValidName(invalidName2);
+        expect(PROMETHEUS_REGEXP.test(newName2)).to.be.true;
+    });
+});

package/src/node/prometheus.ts

@@ -1,25 +1,25 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-export function toPrometheusValidName(name: string): string {
-    /* Make sure that start of name is valid and respect [a-zA-Z_:] */
-    const validFirstCharString = name.replace(/(^[^a-zA-Z_:]+)/gi, '');
-    /* Make sure that rest of the name respect [a-zA-Z0-9_:]* */
-    const validPrometheusName = validFirstCharString.replace(/([^a-zA-Z0-9_:])/gi, '_');
-    return validPrometheusName;
-}
-
-export const PROMETHEUS_REGEXP = /^[a-zA-Z_:][a-zA-Z0-9_:]*/;
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+export function toPrometheusValidName(name: string): string {
+    /* Make sure that start of name is valid and respect [a-zA-Z_:] */
+    const validFirstCharString = name.replace(/(^[^a-zA-Z_:]+)/gi, '');
+    /* Make sure that rest of the name respect [a-zA-Z0-9_:]* */
+    const validPrometheusName = validFirstCharString.replace(/([^a-zA-Z0-9_:])/gi, '_');
+    return validPrometheusName;
+}
+
+export const PROMETHEUS_REGEXP = /^[a-zA-Z_:][a-zA-Z0-9_:]*/;