Merge branch 'main' into gen-workflows-contrib

emdneto · Nov 26, 2024 · 49d4184 · 49d4184
2 parents d464d1d + 1ee2774
commit 49d4184
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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))
 

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py
@@ -84,7 +84,7 @@
 try:
     import psutil as psutil_module
 
-    pustil = psutil_module
+    psutil = psutil_module
 except ImportError:
     pass
 

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
@@ -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