mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 21:37:23 +00:00
Switch the CRI integration layer from containerd's forked Kubernetes helpers and clients to the upstream Kubernetes modules, and finalize the dependency update to Kubernetes v0.36.0. Replace the remaining internal helper copies with upstream packages: - internal/cri/clock -> k8s.io/utils/clock - internal/cri/executil -> upstream CRI exec helpers - internal/cri/resourcequantity -> k8s.io/apimachinery/pkg/api/resource - internal/cri/setutils -> k8s.io/apimachinery/pkg/util/sets - internal/cri/types/labels.go -> internal/cri/labels - integration/cri-api/pkg/apis/services.go -> k8s.io/cri-api/pkg/apis/services.go Adopt the upstream CRI clients directly: - add k8s.io/cri-client v0.36.0, k8s.io/cri-streaming v0.36.0, and k8s.io/streaming v0.36.0 as direct dependencies - promote k8s.io/utils to a direct dependency and pull in k8s.io/component-base v0.36.0 indirectly - keep integration/remote as a thin containerd adapter around cri-client, because the integration tests still need the stream-shaped GetContainerEvents RPC Finalize the Kubernetes dependency update from v0.36.0-rc.0 to v0.36.0, refresh vendor/, and drop the obsolete internal utility copies. Also fix the protobuf MessageState mutex-copy vet failures exposed by the new APIs and close the temporary integration CRI clients explicitly. Signed-off-by: Davanum Srinivas <davanum@gmail.com>
206 lines
6.3 KiB
Go
206 lines
6.3 KiB
Go
// Copyright The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package procfs
|
|
|
|
import (
|
|
"bufio"
|
|
"errors"
|
|
"os"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// NetDevLine is single line parsed from /proc/net/dev or /proc/[pid]/net/dev.
|
|
type NetDevLine struct {
|
|
Name string `json:"name"` // The name of the interface.
|
|
RxBytes uint64 `json:"rx_bytes"` // Cumulative count of bytes received.
|
|
RxPackets uint64 `json:"rx_packets"` // Cumulative count of packets received.
|
|
RxErrors uint64 `json:"rx_errors"` // Cumulative count of receive errors encountered.
|
|
RxDropped uint64 `json:"rx_dropped"` // Cumulative count of packets dropped while receiving.
|
|
RxFIFO uint64 `json:"rx_fifo"` // Cumulative count of FIFO buffer errors.
|
|
RxFrame uint64 `json:"rx_frame"` // Cumulative count of packet framing errors.
|
|
RxCompressed uint64 `json:"rx_compressed"` // Cumulative count of compressed packets received by the device driver.
|
|
RxMulticast uint64 `json:"rx_multicast"` // Cumulative count of multicast frames received by the device driver.
|
|
TxBytes uint64 `json:"tx_bytes"` // Cumulative count of bytes transmitted.
|
|
TxPackets uint64 `json:"tx_packets"` // Cumulative count of packets transmitted.
|
|
TxErrors uint64 `json:"tx_errors"` // Cumulative count of transmit errors encountered.
|
|
TxDropped uint64 `json:"tx_dropped"` // Cumulative count of packets dropped while transmitting.
|
|
TxFIFO uint64 `json:"tx_fifo"` // Cumulative count of FIFO buffer errors.
|
|
TxCollisions uint64 `json:"tx_collisions"` // Cumulative count of collisions detected on the interface.
|
|
TxCarrier uint64 `json:"tx_carrier"` // Cumulative count of carrier losses detected by the device driver.
|
|
TxCompressed uint64 `json:"tx_compressed"` // Cumulative count of compressed packets transmitted by the device driver.
|
|
}
|
|
|
|
// NetDev is parsed from /proc/net/dev or /proc/[pid]/net/dev. The map keys
|
|
// are interface names.
|
|
type NetDev map[string]NetDevLine
|
|
|
|
// NetDev returns kernel/system statistics read from /proc/net/dev.
|
|
func (fs FS) NetDev() (NetDev, error) {
|
|
return newNetDev(fs.proc.Path("net/dev"))
|
|
}
|
|
|
|
// NetDev returns kernel/system statistics read from /proc/[pid]/net/dev.
|
|
func (p Proc) NetDev() (NetDev, error) {
|
|
return newNetDev(p.path("net/dev"))
|
|
}
|
|
|
|
// newNetDev creates a new NetDev from the contents of the given file.
|
|
func newNetDev(file string) (NetDev, error) {
|
|
f, err := os.Open(file)
|
|
if err != nil {
|
|
return NetDev{}, err
|
|
}
|
|
defer f.Close()
|
|
|
|
netDev := NetDev{}
|
|
s := bufio.NewScanner(f)
|
|
for n := 0; s.Scan(); n++ {
|
|
// Skip the 2 header lines.
|
|
if n < 2 {
|
|
continue
|
|
}
|
|
|
|
line, err := netDev.parseLine(s.Text())
|
|
if err != nil {
|
|
return netDev, err
|
|
}
|
|
|
|
netDev[line.Name] = *line
|
|
}
|
|
|
|
return netDev, s.Err()
|
|
}
|
|
|
|
// parseLine parses a single line from the /proc/net/dev file. Header lines
|
|
// must be filtered prior to calling this method.
|
|
func (netDev NetDev) parseLine(rawLine string) (*NetDevLine, error) {
|
|
idx := strings.LastIndex(rawLine, ":")
|
|
if idx == -1 {
|
|
return nil, errors.New("invalid net/dev line, missing colon")
|
|
}
|
|
fields := strings.Fields(strings.TrimSpace(rawLine[idx+1:]))
|
|
|
|
var err error
|
|
line := &NetDevLine{}
|
|
|
|
// Interface Name
|
|
line.Name = strings.TrimSpace(rawLine[:idx])
|
|
if line.Name == "" {
|
|
return nil, errors.New("invalid net/dev line, empty interface name")
|
|
}
|
|
|
|
// RX
|
|
line.RxBytes, err = strconv.ParseUint(fields[0], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxPackets, err = strconv.ParseUint(fields[1], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxErrors, err = strconv.ParseUint(fields[2], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxDropped, err = strconv.ParseUint(fields[3], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxFIFO, err = strconv.ParseUint(fields[4], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxFrame, err = strconv.ParseUint(fields[5], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxCompressed, err = strconv.ParseUint(fields[6], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.RxMulticast, err = strconv.ParseUint(fields[7], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// TX
|
|
line.TxBytes, err = strconv.ParseUint(fields[8], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxPackets, err = strconv.ParseUint(fields[9], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxErrors, err = strconv.ParseUint(fields[10], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxDropped, err = strconv.ParseUint(fields[11], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxFIFO, err = strconv.ParseUint(fields[12], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxCollisions, err = strconv.ParseUint(fields[13], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxCarrier, err = strconv.ParseUint(fields[14], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
line.TxCompressed, err = strconv.ParseUint(fields[15], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return line, nil
|
|
}
|
|
|
|
// Total aggregates the values across interfaces and returns a new NetDevLine.
|
|
// The Name field will be a sorted comma separated list of interface names.
|
|
func (netDev NetDev) Total() NetDevLine {
|
|
total := NetDevLine{}
|
|
|
|
names := make([]string, 0, len(netDev))
|
|
for _, ifc := range netDev {
|
|
names = append(names, ifc.Name)
|
|
total.RxBytes += ifc.RxBytes
|
|
total.RxPackets += ifc.RxPackets
|
|
total.RxErrors += ifc.RxErrors
|
|
total.RxDropped += ifc.RxDropped
|
|
total.RxFIFO += ifc.RxFIFO
|
|
total.RxFrame += ifc.RxFrame
|
|
total.RxCompressed += ifc.RxCompressed
|
|
total.RxMulticast += ifc.RxMulticast
|
|
total.TxBytes += ifc.TxBytes
|
|
total.TxPackets += ifc.TxPackets
|
|
total.TxErrors += ifc.TxErrors
|
|
total.TxDropped += ifc.TxDropped
|
|
total.TxFIFO += ifc.TxFIFO
|
|
total.TxCollisions += ifc.TxCollisions
|
|
total.TxCarrier += ifc.TxCarrier
|
|
total.TxCompressed += ifc.TxCompressed
|
|
}
|
|
sort.Strings(names)
|
|
total.Name = strings.Join(names, ", ")
|
|
|
|
return total
|
|
}
|