Skip to content

Commit 85ab89a

Browse files
authored
update ebpf agent pkg to point to latest and fix ipfix ut (#800)
Signed-off-by: Mohamed Mahmoud <[email protected]>
1 parent 87935c8 commit 85ab89a

File tree

583 files changed

+27305
-5128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

583 files changed

+27305
-5128
lines changed

go.mod

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ require (
1818
github.com/mitchellh/mapstructure v1.5.0
1919
github.com/netobserv/gopipes v0.3.0
2020
github.com/netobserv/loki-client-go v0.0.0-20220927092034-f37122a54500
21-
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250121105617-5110b52b3be7
21+
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250128120438-528ec8c1eb42
2222
github.com/netsampler/goflow2 v1.3.7
2323
github.com/pkg/errors v0.9.1
2424
github.com/prometheus/client_golang v1.20.5
2525
github.com/prometheus/client_model v0.6.1
26-
github.com/prometheus/common v0.55.0
26+
github.com/prometheus/common v0.59.1
2727
github.com/segmentio/kafka-go v0.4.47
2828
github.com/sirupsen/logrus v1.9.3
2929
github.com/spf13/cobra v1.8.1
3030
github.com/spf13/pflag v1.0.5
3131
github.com/spf13/viper v1.19.0
3232
github.com/stretchr/testify v1.10.0
33-
github.com/vladimirvivien/gexe v0.3.0
34-
github.com/vmware/go-ipfix v0.9.0
33+
github.com/vladimirvivien/gexe v0.4.1
34+
github.com/vmware/go-ipfix v0.12.0
3535
go.opentelemetry.io/otel v1.33.0
3636
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0
3737
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0
@@ -43,12 +43,12 @@ require (
4343
go.opentelemetry.io/otel/sdk/metric v1.32.0
4444
golang.org/x/net v0.34.0
4545
google.golang.org/grpc v1.70.0
46-
google.golang.org/protobuf v1.35.2
46+
google.golang.org/protobuf v1.36.4
4747
gopkg.in/yaml.v2 v2.4.0
48-
k8s.io/api v0.32.0
49-
k8s.io/apimachinery v0.32.0
50-
k8s.io/client-go v0.32.0
51-
sigs.k8s.io/e2e-framework v0.4.0
48+
k8s.io/api v0.32.1
49+
k8s.io/apimachinery v0.32.1
50+
k8s.io/client-go v0.32.1
51+
sigs.k8s.io/e2e-framework v0.6.0
5252
)
5353

5454
require (
@@ -67,7 +67,7 @@ require (
6767
github.com/dustin/go-humanize v1.0.1 // indirect
6868
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6969
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
70-
github.com/fsnotify/fsnotify v1.7.0 // indirect
70+
github.com/fsnotify/fsnotify v1.8.0 // indirect
7171
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7272
github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424 // indirect
7373
github.com/go-ini/ini v1.67.0 // indirect
@@ -106,11 +106,10 @@ require (
106106
github.com/ovn-org/libovsdb v0.7.1-0.20240820095311-ce1951614a20 // indirect
107107
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250116185920-20e7a0e40c93 // indirect
108108
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
109-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
110-
github.com/pion/dtls/v2 v2.2.4 // indirect
109+
github.com/pierrec/lz4/v4 v4.1.21 // indirect
110+
github.com/pion/dtls/v2 v2.2.12 // indirect
111111
github.com/pion/logging v0.2.2 // indirect
112-
github.com/pion/transport/v2 v2.0.0 // indirect
113-
github.com/pion/udp v0.1.4 // indirect
112+
github.com/pion/transport/v2 v2.2.10 // indirect
114113
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
115114
github.com/prometheus/procfs v0.15.1 // indirect
116115
github.com/prometheus/prometheus v1.8.2-0.20201028100903-3245b3267b24 // indirect
@@ -126,7 +125,7 @@ require (
126125
github.com/subosito/gotenv v1.6.0 // indirect
127126
github.com/urfave/cli/v2 v2.27.2 // indirect
128127
github.com/vishvananda/netlink v1.3.0 // indirect
129-
github.com/vishvananda/netns v0.0.4 // indirect
128+
github.com/vishvananda/netns v0.0.5 // indirect
130129
github.com/x448/float16 v0.8.4 // indirect
131130
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
132131
github.com/xdg-go/scram v1.1.2 // indirect
@@ -138,7 +137,7 @@ require (
138137
go.uber.org/atomic v1.9.0 // indirect
139138
go.uber.org/multierr v1.11.0 // indirect
140139
golang.org/x/crypto v0.32.0 // indirect
141-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
140+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
142141
golang.org/x/oauth2 v0.24.0 // indirect
143142
golang.org/x/sys v0.29.0 // indirect
144143
golang.org/x/term v0.28.0 // indirect
@@ -153,12 +152,12 @@ require (
153152
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
154153
gopkg.in/warnings.v0 v0.1.2 // indirect
155154
gopkg.in/yaml.v3 v3.0.1 // indirect
156-
k8s.io/component-base v0.31.1 // indirect
155+
k8s.io/component-base v0.32.1 // indirect
157156
k8s.io/klog/v2 v2.130.1 // indirect
158157
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
159158
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
160159
lukechampine.com/uint128 v1.2.0 // indirect
161-
sigs.k8s.io/controller-runtime v0.19.0 // indirect
160+
sigs.k8s.io/controller-runtime v0.20.0 // indirect
162161
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
163162
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
164163
sigs.k8s.io/yaml v1.4.0 // indirect

go.sum

Lines changed: 52 additions & 49 deletions
Large diffs are not rendered by default.

pkg/pipeline/write/testnorace/write_ipfix_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ func TestEnrichedIPFIXFlow(t *testing.T) {
116116
<-cp.GetMsgChan()
117117
// 3rd = data record
118118
dataMsg := <-cp.GetMsgChan()
119-
cp.CloseMsgChan()
120119
cp.Stop()
121120

122121
expectedFields := write.IPv4IANAFields
@@ -178,7 +177,6 @@ func TestEnrichedIPFIXPartialFlow(t *testing.T) {
178177
<-cp.GetMsgChan()
179178
// 3rd = data record
180179
dataMsg := <-cp.GetMsgChan()
181-
cp.CloseMsgChan()
182180
cp.Stop()
183181

184182
expectedFields := write.IPv4IANAFields
@@ -237,7 +235,6 @@ func TestBasicIPFIXFlow(t *testing.T) {
237235
<-cp.GetMsgChan()
238236
// 3rd = data record
239237
dataMsg := <-cp.GetMsgChan()
240-
cp.CloseMsgChan()
241238
cp.Stop()
242239

243240
// Check template

vendor/github.com/fsnotify/fsnotify/.cirrus.yml

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/fsnotify/fsnotify/.editorconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

vendor/github.com/fsnotify/fsnotify/.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/fsnotify/fsnotify/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/fsnotify/fsnotify/CHANGELOG.md

Lines changed: 31 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/fsnotify/fsnotify/CONTRIBUTING.md

Lines changed: 119 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)