mirror of
https://github.com/hanzoai/traces.git
synced 2026-10-30 18:20:41 +00:00
7c0385ddf9
Bumps the opentelemetry-collector group with 19 updates: | Package | From | To | | --- | --- | --- | | [go.opentelemetry.io/collector/component](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/confmap](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/consumer](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/client](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/component/componenttest](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/config/configgrpc](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/config/confighttp](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/config/configopaque](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/config/configtls](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/exporter](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/exporter/exportertest](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/exporter/otlpexporter](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/exporter/otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/otelcol](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/pdata/testdata](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | | [go.opentelemetry.io/collector/processor](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/receiver](https://github.com/open-telemetry/opentelemetry-collector) | `1.29.0` | `1.30.0` | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector) | `0.123.0` | `0.124.0` | Updates `go.opentelemetry.io/collector/component` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/confmap` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/consumer` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/pdata` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/client` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/component/componenttest` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/config/configgrpc` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/config/confighttp` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/config/configopaque` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/config/configtls` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/exporter` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/exporter/exportertest` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/exporter/otlpexporter` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/exporter/otlphttpexporter` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/otelcol` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/pdata/testdata` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) Updates `go.opentelemetry.io/collector/processor` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/receiver` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.29.0...pdata/v1.30.0) Updates `go.opentelemetry.io/collector/receiver/otlpreceiver` from 0.123.0 to 0.124.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.123.0...v0.124.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/component dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/confmap dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/consumer dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/pdata dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/client dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/component/componenttest dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/configgrpc dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/confighttp dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/configopaque dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/configtls dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter/exportertest dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter/otlpexporter dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter/otlphttpexporter dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/otelcol dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/pdata/testdata dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/processor dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/receiver dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/receiver/otlpreceiver dependency-version: 0.124.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-collector ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
131 lines
3.3 KiB
Go
131 lines
3.3 KiB
Go
// SPDX-License-Identifier: BSD-3-Clause
|
|
//go:build darwin
|
|
|
|
package mem
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"unsafe"
|
|
|
|
"golang.org/x/sys/unix"
|
|
|
|
"github.com/shirou/gopsutil/v4/internal/common"
|
|
)
|
|
|
|
func getHwMemsize() (uint64, error) {
|
|
total, err := unix.SysctlUint64("hw.memsize")
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return total, nil
|
|
}
|
|
|
|
// xsw_usage in sys/sysctl.h
|
|
type swapUsage struct {
|
|
Total uint64
|
|
Avail uint64
|
|
Used uint64
|
|
Pagesize int32
|
|
Encrypted bool
|
|
}
|
|
|
|
// SwapMemory returns swapinfo.
|
|
func SwapMemory() (*SwapMemoryStat, error) {
|
|
return SwapMemoryWithContext(context.Background())
|
|
}
|
|
|
|
func SwapMemoryWithContext(_ context.Context) (*SwapMemoryStat, error) {
|
|
// https://github.com/yanllearnn/go-osstat/blob/ae8a279d26f52ec946a03698c7f50a26cfb427e3/memory/memory_darwin.go
|
|
var ret *SwapMemoryStat
|
|
|
|
value, err := unix.SysctlRaw("vm.swapusage")
|
|
if err != nil {
|
|
return ret, err
|
|
}
|
|
if len(value) != 32 {
|
|
return ret, fmt.Errorf("unexpected output of sysctl vm.swapusage: %v (len: %d)", value, len(value))
|
|
}
|
|
swap := (*swapUsage)(unsafe.Pointer(&value[0]))
|
|
|
|
u := float64(0)
|
|
if swap.Total != 0 {
|
|
u = ((float64(swap.Total) - float64(swap.Avail)) / float64(swap.Total)) * 100.0
|
|
}
|
|
|
|
ret = &SwapMemoryStat{
|
|
Total: swap.Total,
|
|
Used: swap.Used,
|
|
Free: swap.Avail,
|
|
UsedPercent: u,
|
|
}
|
|
|
|
return ret, nil
|
|
}
|
|
|
|
func SwapDevices() ([]*SwapDevice, error) {
|
|
return SwapDevicesWithContext(context.Background())
|
|
}
|
|
|
|
func SwapDevicesWithContext(_ context.Context) ([]*SwapDevice, error) {
|
|
return nil, common.ErrNotImplementedError
|
|
}
|
|
|
|
type vmStatisticsData struct {
|
|
freeCount uint32
|
|
activeCount uint32
|
|
inactiveCount uint32
|
|
wireCount uint32
|
|
_ [44]byte // Not used here
|
|
}
|
|
|
|
// VirtualMemory returns VirtualmemoryStat.
|
|
func VirtualMemory() (*VirtualMemoryStat, error) {
|
|
return VirtualMemoryWithContext(context.Background())
|
|
}
|
|
|
|
func VirtualMemoryWithContext(_ context.Context) (*VirtualMemoryStat, error) {
|
|
machLib, err := common.NewLibrary(common.System)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer machLib.Close()
|
|
|
|
hostStatistics := common.GetFunc[common.HostStatisticsFunc](machLib, common.HostStatisticsSym)
|
|
machHostSelf := common.GetFunc[common.MachHostSelfFunc](machLib, common.MachHostSelfSym)
|
|
|
|
count := uint32(common.HOST_VM_INFO_COUNT)
|
|
var vmstat vmStatisticsData
|
|
|
|
status := hostStatistics(machHostSelf(), common.HOST_VM_INFO,
|
|
uintptr(unsafe.Pointer(&vmstat)), &count)
|
|
|
|
if status != common.KERN_SUCCESS {
|
|
return nil, fmt.Errorf("host_statistics error=%d", status)
|
|
}
|
|
|
|
pageSizeAddr, _ := machLib.Dlsym("vm_kernel_page_size")
|
|
pageSize := **(**uint64)(unsafe.Pointer(&pageSizeAddr))
|
|
total, err := getHwMemsize()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
totalCount := uint32(total / pageSize)
|
|
|
|
availableCount := vmstat.inactiveCount + vmstat.freeCount
|
|
usedPercent := 100 * float64(totalCount-availableCount) / float64(totalCount)
|
|
|
|
usedCount := totalCount - availableCount
|
|
|
|
return &VirtualMemoryStat{
|
|
Total: total,
|
|
Available: pageSize * uint64(availableCount),
|
|
Used: pageSize * uint64(usedCount),
|
|
UsedPercent: usedPercent,
|
|
Free: pageSize * uint64(vmstat.freeCount),
|
|
Active: pageSize * uint64(vmstat.activeCount),
|
|
Inactive: pageSize * uint64(vmstat.inactiveCount),
|
|
Wired: pageSize * uint64(vmstat.wireCount),
|
|
}, nil
|
|
}
|