Skip to content

Commit 7d6ddea

Browse files
authored
fix(host-metrics): macOS bundling fix (#2071)
1 parent 7272ca8 commit 7d6ddea

File tree

10 files changed

+142
-128
lines changed

10 files changed

+142
-128
lines changed

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
declare module 'systeminformation/lib/network' {
17+
export { networkStats } from 'systeminformation';
18+
}

packages/opentelemetry-host-metrics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
"dependencies": {
5858
"@opentelemetry/sdk-metrics": "^1.8.0",
59-
"systeminformation": "^5.21.20"
59+
"systeminformation": "5.22.9"
6060
},
6161
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme"
6262
}

packages/opentelemetry-host-metrics/src/BaseMetrics.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
import * as api from '@opentelemetry/api';
18-
import * as metrics from '@opentelemetry/sdk-metrics';
17+
import { Meter, diag, metrics } from '@opentelemetry/api';
18+
import { MeterProvider } from '@opentelemetry/sdk-metrics';
1919

2020
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2121

@@ -24,7 +24,7 @@ import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2424
*/
2525
export interface MetricsCollectorConfig {
2626
// Meter Provider
27-
meterProvider?: metrics.MeterProvider;
27+
meterProvider?: MeterProvider;
2828
// Character to be used to join metrics - default is "."
2929
metricNameSeparator?: string;
3030
// Name of component
@@ -39,14 +39,13 @@ const DEFAULT_NAME = PACKAGE_NAME;
3939
* Base Class for metrics
4040
*/
4141
export abstract class BaseMetrics {
42-
protected _logger = api.diag;
43-
protected _meter: api.Meter;
42+
protected _logger = diag;
43+
protected _meter: Meter;
4444
private _name: string;
4545

4646
constructor(config: MetricsCollectorConfig) {
4747
this._name = config.name || DEFAULT_NAME;
48-
const meterProvider =
49-
config.meterProvider || api.metrics.getMeterProvider();
48+
const meterProvider = config.meterProvider || metrics.getMeterProvider();
5049
if (!config.meterProvider) {
5150
this._logger.warn('No meter provider, using default');
5251
}

0 commit comments

Comments
 (0)