fix: ci/cd

open-telemetry · Apr 2, 2024 · ae578fc · ae578fc
1 parent 65aabe7
commit ae578fc
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 108 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opentelemetry-host-metrics/global.d.ts b/packages/opentelemetry-host-metrics/global.d.ts
@@ -1,5 +1,5 @@
-/// <reference types="systeminformation" />
-
 declare module 'systeminformation/lib/network' {
-    export function networkStats(ifaces?: string, cb?: (data: Systeminformation.NetworkStatsData[]) => any): Promise<Systeminformation.NetworkStatsData[]>;
-}
+  import type { Systeminformation } from 'systeminformation';
+
+  export function networkStats(ifaces?: string, cb?: (data: Systeminformation.NetworkStatsData[]) => any): Promise<Systeminformation.NetworkStatsData[]>;
+}
diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@opentelemetry/sdk-metrics": "^1.8.0",
-    "systeminformation": "^5.21.20"
+    "systeminformation": "^5.22.7"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme"
-}
+}
diff --git a/packages/opentelemetry-host-metrics/src/BaseMetrics.ts b/packages/opentelemetry-host-metrics/src/BaseMetrics.ts
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-import * as api from '@opentelemetry/api';
-import * as metrics from '@opentelemetry/sdk-metrics';
-
-import { VERSION } from './version';
+import { Meter, diag, metrics } from '@opentelemetry/api';
+import { MeterProvider } from '@opentelemetry/sdk-metrics';
 
 /**
  * Metrics Collector Configuration
  */
 export interface MetricsCollectorConfig {
   // Meter Provider
-  meterProvider?: metrics.MeterProvider;
+  meterProvider?: MeterProvider;
   // Character to be used to join metrics - default is "."
   metricNameSeparator?: string;
   // Name of component
@@ -39,18 +37,18 @@ const DEFAULT_NAME = '@opentelemetry/host-metrics';
  * Base Class for metrics
  */
 export abstract class BaseMetrics {
-  protected _logger = api.diag;
-  protected _meter: api.Meter;
+  protected _logger = diag;
+  protected _meter: Meter;
   private _name: string;
 
   constructor(config: MetricsCollectorConfig) {
     this._name = config.name || DEFAULT_NAME;
     const meterProvider =
-      config.meterProvider || api.metrics.getMeterProvider();
+      config.meterProvider || metrics.getMeterProvider();
     if (!config.meterProvider) {
       this._logger.warn('No meter provider, using default');
     }
-    this._meter = meterProvider.getMeter(this._name, VERSION);
+    this._meter = meterProvider.getMeter(this._name);
   }
 
   /**