Skip to content

Fix typo: pustil -> psutil #4311

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 26, 2024
Merged

Fix typo: pustil -> psutil #4311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66f2be3
Fix typo: `pustil` -> `psutil`
stevapple Nov 23, 2024
8c5e5c7
Update CHANGELOG.md
xrmx Nov 26, 2024
eb29875
Merge branch 'main' into patch-2
xrmx Nov 26, 2024
9f3173b
Update test-requirements.txt
xrmx Nov 26, 2024
702574a
Update test-requirements.txt
xrmx Nov 26, 2024
d0ac5f4
Update test-requirements.txt
xrmx Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4270](https://github.com/open-telemetry/opentelemetry-python/pull/4270))
- api: fix logging of duplicate EventLogger setup warning
([#4299](https://github.com/open-telemetry/opentelemetry-python/pull/4299))
- sdk: fix setting of process owner in ProcessResourceDetector
([#4311](https://github.com/open-telemetry/opentelemetry-python/pull/4311))
- sdk: fix serialization of logs severity_number field to int
([#4324](https://github.com/open-telemetry/opentelemetry-python/pull/4324))

Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
try:
import psutil as psutil_module

pustil = psutil_module
psutil = psutil_module
except ImportError:
pass

Expand Down
1 change: 1 addition & 0 deletions opentelemetry-sdk/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
psutil==5.9.6; sys_platform != 'win32'
py-cpuinfo==9.0.0
pytest==7.4.4
tomli==2.0.1
Expand Down