fix: docker_memory in centos_7.5 & docker_1.13.1 #1670
Merged
Conversation
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
shirou
approved these changes
Jul 19, 2024
There was a problem hiding this comment.
Thank you for pointing it out! kernel.org cgrou-1 document says rss_huge and mapped_file are used.
codeboten
pushed a commit
to open-telemetry/opentelemetry-collector
that referenced
this pull request
Aug 6, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/shirou/gopsutil/v4](https://github.com/shirou/gopsutil) | `v4.24.6` -> `v4.24.7` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>shirou/gopsutil (github.com/shirou/gopsutil/v4)</summary> ### [`v4.24.7`](https://github.com/shirou/gopsutil/releases/tag/v4.24.7) [Compare Source](https://github.com/shirou/gopsutil/compare/v4.24.6...v4.24.7) <!-- Release notes generated using configuration in .github/release.yml at v4.24.7 --> #### **Important Notice Regarding Value Changes on mem.SwapMemory() on Windows** In change [#​1677](https://github.com/shirou/gopsutil/issues/1677), the values returned by `mem.SwapMemory()` on Windows have been significantly revised. Previously, these values were calculated from the [`PERFORMANCE_INFORMATION`](https://learn.microsoft.com/en-us/windows/win32/api/psapi/ns-psapi-performance_information) structure of the [`GetPerformanceInfo`](https://learn.microsoft.com/en-us/windows/win32/api/psapi/nf-psapi-getperformanceinfo) win32 function, but this calculation was incorrect. Consequently, it has been adjusted to align with the [psutil implementation](https://github.com/giampaolo/psutil/blob/c034e6692cf736b5e87d14418a8153bb03f6cf42/psutil/\_pswindows.py#L250-L273). As a result, the values returned by `mem.SwapMemory()` are expected to differ greatly from previous values. #### What's Changed ##### docker - fix: docker_memory in centos\_7.5 & docker\_1.13.1 by [@​coderZoe](https://github.com/coderZoe) in [shirou/gopsutil#1670 ##### mem - \[windows]\[mem]: change to use Performance Counter on SwapMemory. by [@​shirou](https://github.com/shirou) in [shirou/gopsutil#1677 ##### Other Changes - fix: read temperature sensors darwin arm by [@​Girbons](https://github.com/Girbons) in [shirou/gopsutil#1672 - fix: remove macos11 and add ubuntu-24.04 on GitHub runner list. by [@​shirou](https://github.com/shirou) in [shirou/gopsutil#1676 #### New Contributors - [@​coderZoe](https://github.com/coderZoe) made their first contribution in [shirou/gopsutil#1670 **Full Changelog**: shirou/gopsutil@v4.24.6...v4.24.7 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
](https://renovatebot.com){kind=link}
codeboten
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
Aug 6, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/shirou/gopsutil/v4](https://github.com/shirou/gopsutil) | `v4.24.6` -> `v4.24.7` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>shirou/gopsutil (github.com/shirou/gopsutil/v4)</summary> ### [`v4.24.7`](https://github.com/shirou/gopsutil/releases/tag/v4.24.7) [Compare Source](https://github.com/shirou/gopsutil/compare/v4.24.6...v4.24.7) <!-- Release notes generated using configuration in .github/release.yml at v4.24.7 --> #### **Important Notice Regarding Value Changes on mem.SwapMemory() on Windows** In change [#​1677](https://github.com/shirou/gopsutil/issues/1677), the values returned by `mem.SwapMemory()` on Windows have been significantly revised. Previously, these values were calculated from the [`PERFORMANCE_INFORMATION`](https://learn.microsoft.com/en-us/windows/win32/api/psapi/ns-psapi-performance_information) structure of the [`GetPerformanceInfo`](https://learn.microsoft.com/en-us/windows/win32/api/psapi/nf-psapi-getperformanceinfo) win32 function, but this calculation was incorrect. Consequently, it has been adjusted to align with the [psutil implementation](https://github.com/giampaolo/psutil/blob/c034e6692cf736b5e87d14418a8153bb03f6cf42/psutil/\_pswindows.py#L250-L273). As a result, the values returned by `mem.SwapMemory()` are expected to differ greatly from previous values. #### What's Changed ##### docker - fix: docker_memory in centos\_7.5 & docker\_1.13.1 by [@​coderZoe](https://github.com/coderZoe) in [shirou/gopsutil#1670 ##### mem - \[windows]\[mem]: change to use Performance Counter on SwapMemory. by [@​shirou](https://github.com/shirou) in [shirou/gopsutil#1677 ##### Other Changes - fix: read temperature sensors darwin arm by [@​Girbons](https://github.com/Girbons) in [shirou/gopsutil#1672 - fix: remove macos11 and add ubuntu-24.04 on GitHub runner list. by [@​shirou](https://github.com/shirou) in [shirou/gopsutil#1676 #### New Contributors - [@​coderZoe](https://github.com/coderZoe) made their first contribution in [shirou/gopsutil#1670 **Full Changelog**: shirou/gopsutil@v4.24.6...v4.24.7 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xOC4xNyIsInVwZGF0ZWRJblZlciI6IjM4LjE4LjE3IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
bugfix：docker_memory in centos_7.5 & docker_1.13.1