From 66f2be3cfdb34ab4a6f9e580ae799dafde6c9db4 Mon Sep 17 00:00:00 2001 From: YR Chen Date: Sun, 24 Nov 2024 01:27:02 +0800 Subject: [PATCH 1/5] Fix typo: `pustil` -> `psutil` --- opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py index 3235ba10dcd..a52573ac1c9 100644 --- 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 From 8c5e5c7f60a3d5ce2e61ff167ed4ec1929fc7138 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 26 Nov 2024 09:37:06 +0100 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf0ae6a891a..fe34dfec32b 100644 --- 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)) ## Version 1.28.0/0.49b0 (2024-11-05) From 9f3173b305dd0fdecad0f2014d891e4def3f89d5 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 26 Nov 2024 09:40:04 +0100 Subject: [PATCH 3/5] Update test-requirements.txt --- opentelemetry-sdk/test-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt index 8a7ccc7bd78..d0a0535a934 100644 --- 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 py-cpuinfo==9.0.0 pytest==7.4.4 tomli==2.0.1 From 702574aa661055b6d37440b1f9367340d5b67e9b Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 26 Nov 2024 15:16:28 +0100 Subject: [PATCH 4/5] Update test-requirements.txt --- opentelemetry-sdk/test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt index d0a0535a934..fe47a73239e 100644 --- a/opentelemetry-sdk/test-requirements.txt +++ b/opentelemetry-sdk/test-requirements.txt @@ -5,7 +5,7 @@ importlib-metadata==6.11.0 iniconfig==2.0.0 packaging==24.0 pluggy==1.5.0 -psutil==5.9.6 +psutil==5.9.6; sys_platform == 'win32' py-cpuinfo==9.0.0 pytest==7.4.4 tomli==2.0.1 From d0ac5f41865676ab9ce23513156a365ea9cd3e68 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 26 Nov 2024 15:16:49 +0100 Subject: [PATCH 5/5] Update test-requirements.txt --- opentelemetry-sdk/test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt index fe47a73239e..68755072fb1 100644 --- a/opentelemetry-sdk/test-requirements.txt +++ b/opentelemetry-sdk/test-requirements.txt @@ -5,7 +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' +psutil==5.9.6; sys_platform != 'win32' py-cpuinfo==9.0.0 pytest==7.4.4 tomli==2.0.1