fix: feedback

open-telemetry · Apr 20, 2024 · a8196e4 · a8196e4
1 parent a3b898f
commit a8196e4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/packages/opentelemetry-host-metrics/global.d.ts b/packages/opentelemetry-host-metrics/global.d.ts
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
 declare module 'systeminformation/lib/network' {
   export { networkStats } from 'systeminformation';
 }
diff --git a/packages/opentelemetry-host-metrics/src/BaseMetrics.ts b/packages/opentelemetry-host-metrics/src/BaseMetrics.ts
@@ -45,8 +45,7 @@ export abstract class BaseMetrics {
 
   constructor(config: MetricsCollectorConfig) {
     this._name = config.name || DEFAULT_NAME;
-    const meterProvider =
-      config.meterProvider || metrics.getMeterProvider();
+    const meterProvider = config.meterProvider || metrics.getMeterProvider();
     if (!config.meterProvider) {
       this._logger.warn('No meter provider, using default');
     }

diff --git a/packages/opentelemetry-host-metrics/src/metric.ts b/packages/opentelemetry-host-metrics/src/metric.ts
@@ -15,8 +15,18 @@
  */
 
 import { BaseMetrics } from './BaseMetrics';
-import { BatchObservableResult, ObservableCounter, ObservableGauge } from '@opentelemetry/api';
-import { ATTRIBUTE_NAMES, CPU_LABELS, MEMORY_LABELS, METRIC_NAMES, NETWORK_LABELS } from './enum';
+import {
+  BatchObservableResult,
+  ObservableCounter,
+  ObservableGauge,
+} from '@opentelemetry/api';
+import {
+  ATTRIBUTE_NAMES,
+  CPU_LABELS,
+  MEMORY_LABELS,
+  METRIC_NAMES,
+  NETWORK_LABELS,
+} from './enum';
 
 import {
   getCpuUsageData,
@@ -25,11 +35,7 @@ import {
   getProcessMemoryData,
 } from './stats/common';
 import { getNetworkData } from './stats/si';
-import type {
-  CpuUsageData,
-  MemoryData,
-  ProcessCpuUsageData,
-} from './types';
+import type { CpuUsageData, MemoryData, ProcessCpuUsageData } from './types';
 import type { Systeminformation } from 'systeminformation';
 
 /**
@@ -188,13 +194,10 @@ export class HostMetrics extends BaseMetrics {
    * Creates metrics
    */
   protected _createMetrics(): void {
-    this._cpuTime = this._meter.createObservableCounter(
-      METRIC_NAMES.CPU_TIME,
-      {
-        description: 'Cpu time in seconds',
-        unit: 's',
-      }
-    );
+    this._cpuTime = this._meter.createObservableCounter(METRIC_NAMES.CPU_TIME, {
+      description: 'Cpu time in seconds',
+      unit: 's',
+    });
     this._cpuUtilization = this._meter.createObservableGauge(
       METRIC_NAMES.CPU_UTILIZATION,
       {

diff --git a/packages/opentelemetry-host-metrics/src/stats/common.ts b/packages/opentelemetry-host-metrics/src/stats/common.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { type CpuInfo, cpus, totalmem, freemem } from 'os';
-
+import { cpus, totalmem, freemem } from 'os';
+import type { CpuInfo } from 'os';
 import type { CpuUsageData, MemoryData, ProcessCpuUsageData } from '../types';
 
 const MILLISECOND = 1 / 1e3;

diff --git a/packages/opentelemetry-host-metrics/test/metric.test.ts b/packages/opentelemetry-host-metrics/test/metric.test.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-const SI = require('systeminformation');
+import * as Network from 'systeminformation/lib/network';
+import type { Systeminformation } from 'systeminformation';
 import { Attributes } from '@opentelemetry/api';
 import {
   AggregationTemporality,
@@ -45,7 +46,7 @@ class TestMetricReader extends MetricReader {
 let countSI = 0;
 const mockedSI = {
   networkStats: function () {
-    return new Promise((resolve, reject) => {
+    return new Promise<Systeminformation.NetworkStatsData[]>((resolve, reject) => {
       countSI++;
       const stats: any[] = networkJson
         .slice()
@@ -137,7 +138,7 @@ describe('Host Metrics', () => {
       sandbox
         .stub(process.memoryUsage, 'rss')
         .callsFake(mockedProcess.memoryUsage.rss);
-      sandbox.stub(SI, 'networkStats').callsFake(mockedSI.networkStats);
+      sandbox.stub(Network, 'networkStats').callsFake(mockedSI.networkStats);
 
       reader = new TestMetricReader();