Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: read temperature sensors darwin arm #1672

Merged
merged 2 commits into from
Jul 19, 2024

Conversation

Girbons
Copy link
Contributor

@Girbons Girbons commented Jul 5, 2024

Description

proposal to read temperature sensors for mac with apple silicon

fixes #1332

Tested with M1
image

@shirou
Copy link
Owner

shirou commented Jul 8, 2024

Thank you for your contribution! At first glance, it looks good. However, I don't have an environment to test it, so could someone else please verify its functionality?

And also, sensors/darwin_arm_sensors.h is copied from other project. It is BSD-3 clause license, so it is not a problem, but could you add those two lines on head of the file in order to make it machine readable?

// SPDX-FileCopyrightText: Copyright (c) 2016-2018, "freedom" Koan-Sin Tan
// SPDX-License-Identifier: BSD-3-Clause

@Girbons
Copy link
Contributor Author

Girbons commented Jul 8, 2024

And also, sensors/darwin_arm_sensors.h is copied from other project. It is BSD-3 clause license, so it is not a problem, but could you add those two lines on head of the file in order to make it machine readable?

Sure!

@davidnewhall
Copy link
Contributor

Can confirm adding this line to go.mod (and running go mod tidy) gives me temperates on an M2 Mac mini that I did not have before.

replace github.com/shirou/gopsutil/v4 => github.com/Girbons/gopsutil/v4 ba82fef

Screenshot 2024-07-10 at 3 14 10 PM

@davidnewhall
Copy link
Contributor

davidnewhall commented Jul 18, 2024

@shirou Can we get this merged? I'd like to release a new version of my app [with Mac ARM temperatures working], but not with a replace line in the go mod. I'm happy to pin to the master branch on your repo though until there's a new release.

Thanks!

Copy link
Owner

@shirou shirou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job! Thank you for your contribution!

And @davidnewhall, your assistance with the confirmation was very helpful. Thank you so much

@shirou shirou merged commit 0fc9a73 into shirou:master Jul 19, 2024
21 of 23 checks passed
@Girbons Girbons deleted the fix/arm-temperature-sensors branch July 20, 2024 17:54
codeboten referenced this pull request in open-telemetry/opentelemetry-collector Aug 6, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](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` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.6/v4.24.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.6/v4.24.7?slim=true)](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
[#&#8203;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
[@&#8203;coderZoe](https://github.com/coderZoe) in
[https://github.com/shirou/gopsutil/pull/1670](https://github.com/shirou/gopsutil/pull/1670)

##### mem

- \[windows]\[mem]: change to use Performance Counter on SwapMemory. by
[@&#8203;shirou](https://github.com/shirou) in
[https://github.com/shirou/gopsutil/pull/1677](https://github.com/shirou/gopsutil/pull/1677)

##### Other Changes

- fix: read temperature sensors darwin arm by
[@&#8203;Girbons](https://github.com/Girbons) in
[https://github.com/shirou/gopsutil/pull/1672](https://github.com/shirou/gopsutil/pull/1672)
- fix: remove macos11 and add ubuntu-24.04 on GitHub runner list. by
[@&#8203;shirou](https://github.com/shirou) in
[https://github.com/shirou/gopsutil/pull/1676](https://github.com/shirou/gopsutil/pull/1676)

#### New Contributors

- [@&#8203;coderZoe](https://github.com/coderZoe) made their first
contribution in
[https://github.com/shirou/gopsutil/pull/1670](https://github.com/shirou/gopsutil/pull/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>
codeboten referenced this pull request in open-telemetry/opentelemetry-collector-contrib Aug 6, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](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` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.6/v4.24.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.6/v4.24.7?slim=true)](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
[#&#8203;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
[@&#8203;coderZoe](https://github.com/coderZoe) in
[https://github.com/shirou/gopsutil/pull/1670](https://github.com/shirou/gopsutil/pull/1670)

##### mem

- \[windows]\[mem]: change to use Performance Counter on SwapMemory. by
[@&#8203;shirou](https://github.com/shirou) in
[https://github.com/shirou/gopsutil/pull/1677](https://github.com/shirou/gopsutil/pull/1677)

##### Other Changes

- fix: read temperature sensors darwin arm by
[@&#8203;Girbons](https://github.com/Girbons) in
[https://github.com/shirou/gopsutil/pull/1672](https://github.com/shirou/gopsutil/pull/1672)
- fix: remove macos11 and add ubuntu-24.04 on GitHub runner list. by
[@&#8203;shirou](https://github.com/shirou) in
[https://github.com/shirou/gopsutil/pull/1676](https://github.com/shirou/gopsutil/pull/1676)

#### New Contributors

- [@&#8203;coderZoe](https://github.com/coderZoe) made their first
contribution in
[https://github.com/shirou/gopsutil/pull/1670](https://github.com/shirou/gopsutil/pull/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>
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SensorsTemperatures returns 0 values for all sensors on darwin arm64 (M1)
3 participants