feat: use lsof for net_connections on FreeBSD #1551
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
Use net.ConnectionsPidWithContext on FreeBSD, similarly to how it is done on Darwin. This uses common.CallLsofWithContext underneath the hood, which will use lsof under the hood, if available. Tested on FreeBSD 13.2-RELEASE Signed-off-by: Chris Gianelloni <wolf31o2@blinklabs.io>
shirou
approved these changes
Nov 12, 2023
mx-psi
referenced
this pull request
in open-telemetry/opentelemetry-collector-contrib
Dec 5, 2023
…29647) [](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/shirou/gopsutil/v3](https://togithub.com/shirou/gopsutil) | require | patch | `v3.23.10` -> `v3.23.11` | --- > [!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/v3)</summary> ### [`v3.23.11`](https://togithub.com/shirou/gopsutil/releases/tag/v3.23.11) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v3.23.10...v3.23.11) <!-- Release notes generated using configuration in .github/release.yml at v3.23.11 --> #### What's Changed ##### process - feat: use lsof for net_connections on FreeBSD by [@​wolf31o2](https://togithub.com/wolf31o2) in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) #### New Contributors - [@​wolf31o2](https://togithub.com/wolf31o2) made their first contribution in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) **Full Changelog**: shirou/gopsutil@v3.23.10...v3.23.11 </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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44MS4zIiwidXBkYXRlZEluVmVyIjoiMzcuODEuMyIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> --------- 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
Dec 5, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | require | patch | `v1.17.3` -> `v1.17.4` | | [github.com/mikefarah/yq/v4](https://togithub.com/mikefarah/yq) | require | patch | `v4.40.3` -> `v4.40.4` | | [github.com/shirou/gopsutil/v3](https://togithub.com/shirou/gopsutil) | require | patch | `v3.23.10` -> `v3.23.11` | | [go.opentelemetry.io/collector](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/component](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configauth](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configcompression](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configgrpc](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/confighttp](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/confignet](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configopaque](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configtelemetry](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configtls](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/internal](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/confmap](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/connector](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/consumer](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/exporter](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension/auth](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension/zpagesextension](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/processor](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/receiver](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/semconv](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/service](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.4`](https://togithub.com/klauspost/compress/releases/tag/v1.17.4) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.3...v1.17.4) #### What's Changed - huff0: Speed up symbol counting by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/887](https://togithub.com/klauspost/compress/pull/887) - huff0: Remove byteReader by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/886](https://togithub.com/klauspost/compress/pull/886) - gzhttp: Allow overriding decompression on transport by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/892](https://togithub.com/klauspost/compress/pull/892) - gzhttp: Clamp compression level by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/890](https://togithub.com/klauspost/compress/pull/890) - gzip: Error out if reserved bits are set by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/891](https://togithub.com/klauspost/compress/pull/891) #### New Contributors - [@​teikjun](https://togithub.com/teikjun) made their first contribution in [https://github.com/klauspost/compress/pull/889](https://togithub.com/klauspost/compress/pull/889) **Full Changelog**: klauspost/compress@v1.17.3...v1.17.4 </details> <details> <summary>mikefarah/yq (github.com/mikefarah/yq/v4)</summary> ### [`v4.40.4`](https://togithub.com/mikefarah/yq/compare/v4.40.3...v4.40.4) [Compare Source](https://togithub.com/mikefarah/yq/compare/v4.40.3...v4.40.4) </details> <details> <summary>shirou/gopsutil (github.com/shirou/gopsutil/v3)</summary> ### [`v3.23.11`](https://togithub.com/shirou/gopsutil/releases/tag/v3.23.11) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v3.23.10...v3.23.11) <!-- Release notes generated using configuration in .github/release.yml at v3.23.11 --> #### What's Changed ##### process - feat: use lsof for net_connections on FreeBSD by [@​wolf31o2](https://togithub.com/wolf31o2) in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) #### New Contributors - [@​wolf31o2](https://togithub.com/wolf31o2) made their first contribution in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) **Full Changelog**: shirou/gopsutil@v3.23.10...v3.23.11 </details> <details> <summary>open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector)</summary> ### [`v0.90.1`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v0901) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.90.0...v0.90.1) ##### 🧰 Bug fixes 🧰 - `exporterhelper`: Remove noisy log ([#​9017](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9017)) </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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44MS4zIiwidXBkYXRlZEluVmVyIjoiMzcuODEuMyIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
pantuza
referenced
this pull request
in pantuza/opentelemetry-collector
Dec 8, 2023
](https://renovatebot.com){kind=link}
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | require | patch | `v1.17.3` -> `v1.17.4` | | [github.com/mikefarah/yq/v4](https://togithub.com/mikefarah/yq) | require | patch | `v4.40.3` -> `v4.40.4` | | [github.com/shirou/gopsutil/v3](https://togithub.com/shirou/gopsutil) | require | patch | `v3.23.10` -> `v3.23.11` | | [go.opentelemetry.io/collector](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/component](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configauth](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configcompression](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configgrpc](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/confighttp](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/confignet](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configopaque](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configtelemetry](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configtls](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/internal](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/confmap](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/connector](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/consumer](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/exporter](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension/auth](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension/zpagesextension](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/processor](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/receiver](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/semconv](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/service](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | --- <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> [`v1.17.4`](https://togithub.com/klauspost/compress/releases/tag/v1.17.4) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.3...v1.17.4) - huff0: Speed up symbol counting by [@&open-telemetry#8203;greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/887](https://togithub.com/klauspost/compress/pull/887) - huff0: Remove byteReader by [@&open-telemetry#8203;greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/886](https://togithub.com/klauspost/compress/pull/886) - gzhttp: Allow overriding decompression on transport by [@&open-telemetry#8203;klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/892](https://togithub.com/klauspost/compress/pull/892) - gzhttp: Clamp compression level by [@&open-telemetry#8203;klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/890](https://togithub.com/klauspost/compress/pull/890) - gzip: Error out if reserved bits are set by [@&open-telemetry#8203;klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/891](https://togithub.com/klauspost/compress/pull/891) - [@&open-telemetry#8203;teikjun](https://togithub.com/teikjun) made their first contribution in [https://github.com/klauspost/compress/pull/889](https://togithub.com/klauspost/compress/pull/889) **Full Changelog**: klauspost/compress@v1.17.3...v1.17.4 </details> <details> <summary>mikefarah/yq (github.com/mikefarah/yq/v4)</summary> [`v4.40.4`](https://togithub.com/mikefarah/yq/compare/v4.40.3...v4.40.4) [Compare Source](https://togithub.com/mikefarah/yq/compare/v4.40.3...v4.40.4) </details> <details> <summary>shirou/gopsutil (github.com/shirou/gopsutil/v3)</summary> [`v3.23.11`](https://togithub.com/shirou/gopsutil/releases/tag/v3.23.11) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v3.23.10...v3.23.11) <!-- Release notes generated using configuration in .github/release.yml at v3.23.11 --> - feat: use lsof for net_connections on FreeBSD by [@&open-telemetry#8203;wolf31o2](https://togithub.com/wolf31o2) in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) - [@&open-telemetry#8203;wolf31o2](https://togithub.com/wolf31o2) made their first contribution in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) **Full Changelog**: shirou/gopsutil@v3.23.10...v3.23.11 </details> <details> <summary>open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector)</summary> [`v0.90.1`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v0901) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.90.0...v0.90.1) - `exporterhelper`: Remove noisy log ([#&open-telemetry#8203;9017](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9017)) </details> --- 📅 **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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44MS4zIiwidXBkYXRlZEluVmVyIjoiMzcuODEuMyIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> --------- 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.
Use net.ConnectionsPidWithContext on FreeBSD, similarly to how it is done on Darwin. This uses common.CallLsofWithContext underneath the hood, which will use lsof under the hood, if available.
Tested on FreeBSD 13.2-RELEASE