diff --git a/go.mod b/go.mod index 9f76ba19e..02bbb0656 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/netobserv/gopipes v0.3.0 github.com/netobserv/loki-client-go v0.0.0-20250425113517-526b43e51847 - github.com/netobserv/netobserv-ebpf-agent v1.9.1-community + github.com/netobserv/netobserv-ebpf-agent v1.9.2-community github.com/netsampler/goflow2 v1.3.7 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.23.0 diff --git a/go.sum b/go.sum index e3e8f5f99..9ed3f45cb 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ github.com/netobserv/gopipes v0.3.0 h1:IYmPnnAVCdSK7VmHmpFhrVBOEm45qpgbZmJz1sSW+ github.com/netobserv/gopipes v0.3.0/go.mod h1:N7/Gz05EOF0CQQSKWsv3eof22Cj2PB08Pbttw98YFYU= github.com/netobserv/loki-client-go v0.0.0-20250425113517-526b43e51847 h1:hjzhVZSSKIOmAzHbGUV4JhVIPkgKs/UtrWDx6JSVKMw= github.com/netobserv/loki-client-go v0.0.0-20250425113517-526b43e51847/go.mod h1:Zb/jtD3Lnu88Poo+jnhTASzxYnvncmHOoZaT93xQjJ8= -github.com/netobserv/netobserv-ebpf-agent v1.9.1-community h1:l50a9N/d6n8QtpEOyRLEhrz7A4EBYBZt1M+CjIHNpAo= -github.com/netobserv/netobserv-ebpf-agent v1.9.1-community/go.mod h1:U9PSiTTI9htDHQ04u4/RibleTcNQXRHV+hmQo492cz0= +github.com/netobserv/netobserv-ebpf-agent v1.9.2-community h1:ghW16OO4QRWj0Uh1gMYX+NjAlgx2sZmCsO3Tkwoj4Do= +github.com/netobserv/netobserv-ebpf-agent v1.9.2-community/go.mod h1:17OaUNAwx0LxoeV/SaHlJIJP6bpN7zSvUP3GtZelESQ= github.com/netsampler/goflow2 v1.3.7 h1:XZaTy8kkMnGXpJ9hS3KbO1McyrFTpVNhVFEx9rNhMmc= github.com/netsampler/goflow2 v1.3.7/go.mod h1:4UZsVGVAs//iMCptUHn3WNScztJeUhZH7kDW2+/vDdQ= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -613,8 +613,8 @@ sigs.k8s.io/network-policy-api v0.1.5 h1:xyS7VAaM9EfyB428oFk7WjWaCK6B129i+ILUF4C sigs.k8s.io/network-policy-api v0.1.5/go.mod h1:D7Nkr43VLNd7iYryemnj8qf0N/WjBzTZDxYA+g4u1/Y= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= -sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI= -sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco= sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/decode/decode_protobuf.go b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/decode/decode_protobuf.go index 368c5718d..784330059 100644 --- a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/decode/decode_protobuf.go +++ b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/decode/decode_protobuf.go @@ -50,7 +50,7 @@ func PBFlowToMap(pb *pbflow.Record) config.GenericMap { } // RecordToMap converts the flow from Agent inner model into FLP GenericMap model -// nolint:golint,cyclop +// nolint:cyclop func RecordToMap(fr *model.Record) config.GenericMap { if fr == nil { return config.GenericMap{} diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_arm64_bpfel.o b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_arm64_bpfel.o index f646fb9de..54d7d1d9d 100644 Binary files a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_arm64_bpfel.o and b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_arm64_bpfel.o differ diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_powerpc_bpfel.o b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_powerpc_bpfel.o index b2ea70b78..ae6a7fe2c 100644 Binary files a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_powerpc_bpfel.o and b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_powerpc_bpfel.o differ diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_s390_bpfeb.o b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_s390_bpfeb.o index 21b413be5..aa38ced8a 100644 Binary files a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_s390_bpfeb.o and b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_s390_bpfeb.o differ diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_x86_bpfel.o b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_x86_bpfel.o index af1b46377..a1fdefe76 100644 Binary files a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_x86_bpfel.o and b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_x86_bpfel.o differ diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/packet_record.go b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/packet_record.go index eed8bd845..a9fe77946 100644 --- a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/packet_record.go +++ b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/packet_record.go @@ -28,25 +28,25 @@ func NewPacketRecord( return &pr } -// ReadRawPacket reads a PacketRecord from a binary source, in LittleEndian order +// ReadRawPacket reads a PacketRecord from a binary source, in NativeEndian order func ReadRawPacket(reader io.Reader) (*PacketRecord, error) { var pr PacketRecord currentTime := time.Now() monotonicTimeNow := monotime.Now() getLen := make([]byte, 4) packetTimestamp := make([]byte, 8) - // Read IfIndex and discard it: To be used in other usecases - _ = binary.Read(reader, binary.LittleEndian, make([]byte, 4)) - // Read Length of packet - _ = binary.Read(reader, binary.LittleEndian, getLen) - pr.Stream = make([]byte, binary.LittleEndian.Uint32(getLen)) - // Read TimeStamp of packet - _ = binary.Read(reader, binary.LittleEndian, packetTimestamp) + // Read IfIndex and discard it: To be used in other use cases + _ = binary.Read(reader, binary.NativeEndian, make([]byte, 4)) + // Read Length of a packet + _ = binary.Read(reader, binary.NativeEndian, getLen) + pr.Stream = make([]byte, binary.NativeEndian.Uint32(getLen)) + // Read TimeStamp of a packet + _ = binary.Read(reader, binary.NativeEndian, packetTimestamp) // The assumption is monotonic time should be as close to time recorded by ebpf. // The difference is considered the delta time from current time. - tsDelta := time.Duration(uint64(monotonicTimeNow) - binary.LittleEndian.Uint64(packetTimestamp)) + tsDelta := time.Duration(uint64(monotonicTimeNow) - binary.NativeEndian.Uint64(packetTimestamp)) pr.Time = currentTime.Add(-tsDelta) - err := binary.Read(reader, binary.LittleEndian, &pr.Stream) + err := binary.Read(reader, binary.NativeEndian, &pr.Stream) return &pr, err } diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/record.go b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/record.go index 4ec7c3d3e..9ff2b315a 100644 --- a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/record.go +++ b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/model/record.go @@ -200,10 +200,10 @@ func (m *MacAddr) MarshalJSON() ([]byte, error) { return []byte("\"" + m.String() + "\""), nil } -// ReadFrom reads a Record from a binary source, in LittleEndian order +// ReadFrom reads a Record from a binary source, in NativeEndian order func ReadFrom(reader io.Reader) (*RawRecord, error) { var fr RawRecord - err := binary.Read(reader, binary.LittleEndian, &fr) + err := binary.Read(reader, binary.NativeEndian, &fr) return &fr, err } diff --git a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/utils/utils.go b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/utils/utils.go index f0cb22cf3..3f6eac124 100644 --- a/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/utils/utils.go +++ b/vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/utils/utils.go @@ -1,4 +1,4 @@ -package utils +package utils //nolint:revive import ( "fmt" diff --git a/vendor/modules.txt b/vendor/modules.txt index 6b0d0464d..6087445e2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -314,8 +314,8 @@ github.com/netobserv/loki-client-go/pkg/labelutil github.com/netobserv/loki-client-go/pkg/logproto github.com/netobserv/loki-client-go/pkg/metric github.com/netobserv/loki-client-go/pkg/urlutil -# github.com/netobserv/netobserv-ebpf-agent v1.9.1-community -## explicit; go 1.23.0 +# github.com/netobserv/netobserv-ebpf-agent v1.9.2-community +## explicit; go 1.24.0 github.com/netobserv/netobserv-ebpf-agent/pkg/decode github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf github.com/netobserv/netobserv-ebpf-agent/pkg/grpc/flow