From 21f6c64c1c0324b8db3e4d91f361d398f34f578a Mon Sep 17 00:00:00 2001 From: Tamir David Date: Sat, 6 Jul 2024 03:35:48 +0530 Subject: [PATCH 1/4] fix: align process command arguments to spec defenition --- opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py | 2 +- opentelemetry-sdk/tests/resources/test_resources.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py index 77a0ca9618b..1fed32c0be5 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py @@ -348,7 +348,7 @@ def detect(self) -> "Resource": _process_executable_path = os.path.dirname(_process_executable_name) _process_command = sys.argv[0] _process_command_line = " ".join(sys.argv) - _process_command_args = sys.argv[1:] + _process_command_args = sys.argv resource_info = { PROCESS_RUNTIME_DESCRIPTION: sys.version, PROCESS_RUNTIME_NAME: sys.implementation.name, diff --git a/opentelemetry-sdk/tests/resources/test_resources.py b/opentelemetry-sdk/tests/resources/test_resources.py index a0c6159010d..8a42d0c6d0f 100644 --- a/opentelemetry-sdk/tests/resources/test_resources.py +++ b/opentelemetry-sdk/tests/resources/test_resources.py @@ -608,7 +608,7 @@ def test_process_detector(self): ) self.assertEqual( aggregated_resource.attributes[PROCESS_COMMAND_ARGS], - tuple(sys.argv[1:]), + tuple(sys.argv), ) def test_resource_detector_entry_points_default(self): From 46f614b1ff5f76ccd1df18f0a49e8aba50609b68 Mon Sep 17 00:00:00 2001 From: Tamir David Date: Tue, 9 Jul 2024 09:41:59 +0300 Subject: [PATCH 2/4] update change log --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a210986065..acec831dcf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +- Update sdk process resource detector 'process.command_args' to be aligned with the spec. + ([#4032](https://github.com/open-telemetry/opentelemetry-python/pull/4032)) - Fix `start_time_unix_nano` for delta collection for explicit bucket histogram aggregation ([#4009](https://github.com/open-telemetry/opentelemetry-python/pull/4009)) - Fix `start_time_unix_nano` for delta collection for sum aggregation From eb375ece3d84f3238f7d86eb3f995026de1760f6 Mon Sep 17 00:00:00 2001 From: Tamir David <53215879+tamirdavid@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:35:44 +0300 Subject: [PATCH 3/4] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb309de3d42..90dd5dcf4a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased -- Update sdk process resource detector 'process.command_args' to be aligned with the spec. +- Update sdk process resource detector `PROCESS_COMMAND_ARGS` attribute to also include the executable itself ([#4032](https://github.com/open-telemetry/opentelemetry-python/pull/4032)) - Fix `start_time_unix_nano` for delta collection for explicit bucket histogram aggregation ([#4009](https://github.com/open-telemetry/opentelemetry-python/pull/4009)) From 4ccdae357d4e43c981eeefbbc096bfed0e321f24 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Wed, 10 Jul 2024 13:02:45 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90dd5dcf4a7..f716f96c941 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased -- Update sdk process resource detector `PROCESS_COMMAND_ARGS` attribute to also include the executable itself +- Update sdk process resource detector `process.command_args` attribute to also include the executable itself ([#4032](https://github.com/open-telemetry/opentelemetry-python/pull/4032)) - Fix `start_time_unix_nano` for delta collection for explicit bucket histogram aggregation ([#4009](https://github.com/open-telemetry/opentelemetry-python/pull/4009))