@theia/plugin-metrics 1.34.2 → 1.34.3

package/src/node/metrics-contributor.ts

@@ -1,70 +1,70 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { PluginMetrics } from '../common/metrics-protocol';
-import { injectable } from '@theia/core/shared/inversify';
-import { AnalyticsFromRequests, MetricsMap } from '../common/plugin-metrics-types';
-
-@injectable()
-export class PluginMetricsContributor {
-    clients: Set<PluginMetrics> = new Set();
-
-    reconcile(): MetricsMap {
-        const reconciledMap: MetricsMap = {};
-        this.clients.forEach(c => {
-            const extensionIDtoMap = JSON.parse(c.getMetrics()) as MetricsMap;
-
-            for (const vscodeExtensionID in extensionIDtoMap) {
-                if (!extensionIDtoMap.hasOwnProperty(vscodeExtensionID)) {
-                    continue;
-                }
-
-                if (!reconciledMap[vscodeExtensionID]) {
-                    reconciledMap[vscodeExtensionID] = extensionIDtoMap[vscodeExtensionID];
-                } else {
-                    const methodToAnalytics = extensionIDtoMap[vscodeExtensionID];
-                    for (const method in methodToAnalytics) {
-
-                        if (!methodToAnalytics.hasOwnProperty(method)) {
-                            continue;
-                        }
-
-                        if (!reconciledMap[vscodeExtensionID][method]) {
-                            reconciledMap[vscodeExtensionID][method] = methodToAnalytics[method];
-                        } else {
-                            const currentAnalytic = reconciledMap[vscodeExtensionID][method];
-                            if (!methodToAnalytics[method]) {
-                                reconciledMap[vscodeExtensionID][method] = currentAnalytic;
-                            } else {
-                                // It does have the method
-                                // Then we need to reconcile the two analytics from requests
-                                const newAnalytic = methodToAnalytics[method] as AnalyticsFromRequests;
-                                newAnalytic.sumOfTimeForSuccess = newAnalytic.sumOfTimeForSuccess + currentAnalytic.sumOfTimeForSuccess;
-                                newAnalytic.sumOfTimeForFailure = newAnalytic.sumOfTimeForFailure + currentAnalytic.sumOfTimeForFailure;
-                                newAnalytic.totalRequests += currentAnalytic.totalRequests;
-                                newAnalytic.successfulResponses += currentAnalytic.successfulResponses;
-
-                                reconciledMap[vscodeExtensionID][method] = newAnalytic;
-                            }
-                        }
-                    }
-                }
-            }
-        });
-        return reconciledMap;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { PluginMetrics } from '../common/metrics-protocol';
+import { injectable } from '@theia/core/shared/inversify';
+import { AnalyticsFromRequests, MetricsMap } from '../common/plugin-metrics-types';
+
+@injectable()
+export class PluginMetricsContributor {
+    clients: Set<PluginMetrics> = new Set();
+
+    reconcile(): MetricsMap {
+        const reconciledMap: MetricsMap = {};
+        this.clients.forEach(c => {
+            const extensionIDtoMap = JSON.parse(c.getMetrics()) as MetricsMap;
+
+            for (const vscodeExtensionID in extensionIDtoMap) {
+                if (!extensionIDtoMap.hasOwnProperty(vscodeExtensionID)) {
+                    continue;
+                }
+
+                if (!reconciledMap[vscodeExtensionID]) {
+                    reconciledMap[vscodeExtensionID] = extensionIDtoMap[vscodeExtensionID];
+                } else {
+                    const methodToAnalytics = extensionIDtoMap[vscodeExtensionID];
+                    for (const method in methodToAnalytics) {
+
+                        if (!methodToAnalytics.hasOwnProperty(method)) {
+                            continue;
+                        }
+
+                        if (!reconciledMap[vscodeExtensionID][method]) {
+                            reconciledMap[vscodeExtensionID][method] = methodToAnalytics[method];
+                        } else {
+                            const currentAnalytic = reconciledMap[vscodeExtensionID][method];
+                            if (!methodToAnalytics[method]) {
+                                reconciledMap[vscodeExtensionID][method] = currentAnalytic;
+                            } else {
+                                // It does have the method
+                                // Then we need to reconcile the two analytics from requests
+                                const newAnalytic = methodToAnalytics[method] as AnalyticsFromRequests;
+                                newAnalytic.sumOfTimeForSuccess = newAnalytic.sumOfTimeForSuccess + currentAnalytic.sumOfTimeForSuccess;
+                                newAnalytic.sumOfTimeForFailure = newAnalytic.sumOfTimeForFailure + currentAnalytic.sumOfTimeForFailure;
+                                newAnalytic.totalRequests += currentAnalytic.totalRequests;
+                                newAnalytic.successfulResponses += currentAnalytic.successfulResponses;
+
+                                reconciledMap[vscodeExtensionID][method] = newAnalytic;
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        return reconciledMap;
+    }
+
+}

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

@@ -1,49 +1,49 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { MetricsContribution } from '@theia/metrics/lib/node/metrics-contribution';
-import { PluginMetricsContribution } from './plugin-metrics';
-import { PluginMetrics, metricsJsonRpcPath } from '../common/metrics-protocol';
-import { PluginMetricsImpl } from './plugin-metrics-impl';
-import { ConnectionHandler } from '@theia/core/lib/common/messaging/handler';
-import { JsonRpcConnectionHandler } from '@theia/core';
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { PluginMetricsContributor } from './metrics-contributor';
-import { PluginMetricTimeSum } from './metric-output/plugin-metrics-time-sum';
-import { PluginMetricTimeCount } from './metric-output/plugin-metrics-time-count';
-import { PluginMetricStringGenerator } from './metric-string-generator';
-
-export default new ContainerModule((bind, unbind, isBound, rebind) => {
-    bind(PluginMetricTimeSum).toSelf().inSingletonScope();
-    bind(PluginMetricTimeCount).toSelf().inSingletonScope();
-    bind(PluginMetrics).to(PluginMetricsImpl).inTransientScope();
-    bind(PluginMetricStringGenerator).toSelf().inSingletonScope();
-    bind(PluginMetricsContributor).toSelf().inSingletonScope();
-    bind(ConnectionHandler).toDynamicValue(ctx => {
-        const clients = ctx.container.get(PluginMetricsContributor);
-        return new JsonRpcConnectionHandler(metricsJsonRpcPath, client => {
-            const pluginMetricsHandler: PluginMetrics = ctx.container.get(PluginMetrics);
-            clients.clients.add(pluginMetricsHandler);
-            client.onDidCloseConnection(() => {
-                clients.clients.delete(pluginMetricsHandler);
-            });
-            return pluginMetricsHandler;
-        });
-    }
-    ).inSingletonScope();
-
-    bind(MetricsContribution).to(PluginMetricsContribution).inSingletonScope();
-});
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { MetricsContribution } from '@theia/metrics/lib/node/metrics-contribution';
+import { PluginMetricsContribution } from './plugin-metrics';
+import { PluginMetrics, metricsJsonRpcPath } from '../common/metrics-protocol';
+import { PluginMetricsImpl } from './plugin-metrics-impl';
+import { ConnectionHandler } from '@theia/core/lib/common/messaging/handler';
+import { JsonRpcConnectionHandler } from '@theia/core';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { PluginMetricsContributor } from './metrics-contributor';
+import { PluginMetricTimeSum } from './metric-output/plugin-metrics-time-sum';
+import { PluginMetricTimeCount } from './metric-output/plugin-metrics-time-count';
+import { PluginMetricStringGenerator } from './metric-string-generator';
+
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+    bind(PluginMetricTimeSum).toSelf().inSingletonScope();
+    bind(PluginMetricTimeCount).toSelf().inSingletonScope();
+    bind(PluginMetrics).to(PluginMetricsImpl).inTransientScope();
+    bind(PluginMetricStringGenerator).toSelf().inSingletonScope();
+    bind(PluginMetricsContributor).toSelf().inSingletonScope();
+    bind(ConnectionHandler).toDynamicValue(ctx => {
+        const clients = ctx.container.get(PluginMetricsContributor);
+        return new JsonRpcConnectionHandler(metricsJsonRpcPath, client => {
+            const pluginMetricsHandler: PluginMetrics = ctx.container.get(PluginMetrics);
+            clients.clients.add(pluginMetricsHandler);
+            client.onDidCloseConnection(() => {
+                clients.clients.delete(pluginMetricsHandler);
+            });
+            return pluginMetricsHandler;
+        });
+    }
+    ).inSingletonScope();
+
+    bind(MetricsContribution).to(PluginMetricsContribution).inSingletonScope();
+});

package/src/node/plugin-metrics-impl.ts

@@ -1,38 +1,38 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { PluginMetrics } from '../common/metrics-protocol';
-
-@injectable()
-export class PluginMetricsImpl implements PluginMetrics {
-
-    private metrics: string = '{}';
-
-    // tslint:disable-next-line:typedef
-    setMetrics(metrics: string) {
-        this.metrics = metrics;
-    }
-
-    /**
-     * This sends all the information about metrics inside of the plugins to the backend
-     * where it is served on the /metrics endpoint
-     */
-    getMetrics(): string {
-        return this.metrics;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { PluginMetrics } from '../common/metrics-protocol';
+
+@injectable()
+export class PluginMetricsImpl implements PluginMetrics {
+
+    private metrics: string = '{}';
+
+    // tslint:disable-next-line:typedef
+    setMetrics(metrics: string) {
+        this.metrics = metrics;
+    }
+
+    /**
+     * This sends all the information about metrics inside of the plugins to the backend
+     * where it is served on the /metrics endpoint
+     */
+    getMetrics(): string {
+        return this.metrics;
+    }
+
+}

package/src/node/plugin-metrics.ts

@@ -1,44 +1,44 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { MetricsContribution } from '@theia/metrics/lib/node/metrics-contribution';
-import { METRICS_TIMEOUT } from '../common/metrics-protocol';
-import { PluginMetricsContributor } from './metrics-contributor';
-import { PluginMetricStringGenerator } from './metric-string-generator';
-
-@injectable()
-export class PluginMetricsContribution implements MetricsContribution {
-
-    @inject(PluginMetricsContributor)
-    protected readonly metricsContributor: PluginMetricsContributor;
-
-    @inject(PluginMetricStringGenerator)
-    protected readonly stringGenerator: PluginMetricStringGenerator;
-
-    private metrics: string;
-
-    getMetrics(): string {
-        return this.metrics;
-    }
-
-    startCollecting(): void {
-        setInterval(() => {
-            const reconciledMetrics = this.metricsContributor.reconcile();
-            this.metrics = this.stringGenerator.getMetricsString(reconciledMetrics);
-        }, METRICS_TIMEOUT);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { MetricsContribution } from '@theia/metrics/lib/node/metrics-contribution';
+import { METRICS_TIMEOUT } from '../common/metrics-protocol';
+import { PluginMetricsContributor } from './metrics-contributor';
+import { PluginMetricStringGenerator } from './metric-string-generator';
+
+@injectable()
+export class PluginMetricsContribution implements MetricsContribution {
+
+    @inject(PluginMetricsContributor)
+    protected readonly metricsContributor: PluginMetricsContributor;
+
+    @inject(PluginMetricStringGenerator)
+    protected readonly stringGenerator: PluginMetricStringGenerator;
+
+    private metrics: string;
+
+    getMetrics(): string {
+        return this.metrics;
+    }
+
+    startCollecting(): void {
+        setInterval(() => {
+            const reconciledMetrics = this.metricsContributor.reconcile();
+            this.metrics = this.stringGenerator.getMetricsString(reconciledMetrics);
+        }, METRICS_TIMEOUT);
+    }
+}