-
Notifications
You must be signed in to change notification settings - Fork 530
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(host-metrics): macOS bundling fix #2071
Merged
legendecas
merged 45 commits into
open-telemetry:main
from
Netail:fix/host-metrics-bundling
Jun 3, 2024
Merged
Changes from 41 commits
Commits
Show all changes
45 commits
Select commit
Hold shift + click to select a range
2c6d8cf
fix: semcov alignment & reduce import bundle
Netail 60e0933
fix: types?
Netail 65aabe7
Merge branch 'main' into fix/host-metrics-bundling
Netail ae578fc
fix: ci/cd
Netail ce92ffe
Merge branch 'main' into fix/host-metrics-bundling
Netail e818ba5
Merge branch 'main' into fix/host-metrics-bundling
Netail 2484ef6
Merge branch 'main' into fix/host-metrics-bundling
Netail 1106e97
docs: specify semantic conventions
Netail 8f65520
revert some changes
Netail 08506a4
Merge branch 'main' into fix/host-metrics-bundling
Netail 63cc39d
fix: small type improvement
Netail 03e2237
docs: add small comment
Netail 9cbe462
Merge branch 'main' into fix/host-metrics-bundling
Netail a2aaa4b
Merge branch 'main' into fix/host-metrics-bundling
Netail 744ea1d
fix: feedback
Netail cc8aafe
Merge branch 'main' into fix/host-metrics-bundling
Netail d1c1fca
Merge branch 'main' into fix/host-metrics-bundling
Netail a3b898f
Merge branch 'main' into fix/host-metrics-bundling
Netail a8196e4
fix: feedback
Netail 304dc98
Merge branch 'main' into fix/host-metrics-bundling
Netail 9f81a2d
Merge branch 'main' into fix/host-metrics-bundling
Netail 769de9e
Merge branch 'main' into fix/host-metrics-bundling
Netail 4fd1f8f
Merge branch 'main' into fix/host-metrics-bundling
Netail 9c30315
Merge branch 'main' into fix/host-metrics-bundling
Netail 83c58a3
Merge branch 'main' into fix/host-metrics-bundling
Netail 2ac772e
Merge branch 'main' into fix/host-metrics-bundling
Netail 343733e
Merge branch 'main' into fix/host-metrics-bundling
Netail fd50fe5
Merge branch 'main' into fix/host-metrics-bundling
Netail 38b80b1
Merge branch 'main' into fix/host-metrics-bundling
Netail b642766
Merge branch 'main' into fix/host-metrics-bundling
Netail 5e6370a
Merge branch 'main' into fix/host-metrics-bundling
Netail deb3257
Merge branch 'main' into fix/host-metrics-bundling
Netail 5922334
fix: feedback
Netail 06ac5e7
Merge branch 'main' into fix/host-metrics-bundling
Netail a3f9a61
Merge branch 'main' into fix/host-metrics-bundling
Netail fc23083
Merge branch 'main' into fix/host-metrics-bundling
Netail f675811
fix: remove subpath
Netail 9c14d64
Merge branch 'main' into fix/host-metrics-bundling
Netail 72ba6f9
feedback
Netail 4c0c3c9
lint
Netail f0a7187
Merge branch 'main' into fix/host-metrics-bundling
Netail c0fbc8b
remove node import prefix
Netail 5338456
lint
Netail 3df9163
eof
Netail 79555fc
Merge branch 'main' into fix/host-metrics-bundling
Netail File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +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'; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess with the change suggested by @pichlermarc in
./src/stats/si.ts
this file is no needed. I see the
.d.ts
file fromsysteminformation
exportingnetworkStats
function alreadyThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I use
import { networkStats } from 'systeminformation';
, it still tries to import the underlying cpu.js file, thus throwing an error on macOS. :( By targeting the file directly it won't.The systeminformation/lib/cpu.js file tries to import
osx-temperature-sensor
for macOS, which you additionally have to install for macOS temperatures as it's not included in the dependencies, however osx-temp-sensor package breaks something else. But the cpu.js file isn't even used for host-metrics, so installing this package besides systeminformation is unecessary