Skip to content

Commit 9a7b51e

Browse files
authored
Merge pull request #791 from msherif1234/xlat-icmp
update flp to latest agent changes and fix ut
2 parents ef1dc16 + a172647 commit 9a7b51e

File tree

17 files changed

+256
-186
lines changed

17 files changed

+256
-186
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ 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.20241213165959-7e7f8c42a3f6
21+
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250115132126-73256abeed31
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

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,8 @@ github.com/netobserv/gopipes v0.3.0 h1:IYmPnnAVCdSK7VmHmpFhrVBOEm45qpgbZmJz1sSW+
693693
github.com/netobserv/gopipes v0.3.0/go.mod h1:N7/Gz05EOF0CQQSKWsv3eof22Cj2PB08Pbttw98YFYU=
694694
github.com/netobserv/loki-client-go v0.0.0-20220927092034-f37122a54500 h1:RmnoJe/ci5q+QdM7upFdxiU+D8F3L3qTd5wXCwwHefw=
695695
github.com/netobserv/loki-client-go v0.0.0-20220927092034-f37122a54500/go.mod h1:LHXpc5tjKvsfZn0pwLKrvlgEhZcCaw3Di9mUEZGAI4E=
696-
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213165959-7e7f8c42a3f6 h1:ZuEAJ7Ui0fsMX8tGSz70cXDjlzRnviHjzqlJfWJh9VY=
697-
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213165959-7e7f8c42a3f6/go.mod h1:20e1OPAs7h3k9PvNZWS9D6BnXEtkTk2LlfzD66uhvxY=
696+
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250115132126-73256abeed31 h1:fQB0tCcX0Fkk+I2lvzzVj2cQpeAYlh8UFmL45s3Nh5w=
697+
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250115132126-73256abeed31/go.mod h1:2UT/wN+zmU+pCajg0crx8+0KOmzS8pBNql5VqXAGY5I=
698698
github.com/netsampler/goflow2 v1.3.7 h1:XZaTy8kkMnGXpJ9hS3KbO1McyrFTpVNhVFEx9rNhMmc=
699699
github.com/netsampler/goflow2 v1.3.7/go.mod h1:4UZsVGVAs//iMCptUHn3WNScztJeUhZH7kDW2+/vDdQ=
700700
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

pkg/pipeline/pipeline_test.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,13 @@ parameters:
177177
someDuration := endTime.Sub(startTime)
178178
_, err = flowSender.Client().Send(context.Background(), &pbflow.Records{
179179
Entries: []*pbflow.Record{{
180-
Interface: "eth0",
180+
Interface: "eth0",
181+
DupList: []*pbflow.DupMapEntry{
182+
{
183+
Interface: "eth0",
184+
Direction: pbflow.Direction_EGRESS,
185+
},
186+
},
181187
EthProtocol: 2048,
182188
Bytes: 456,
183189
Packets: 123,
@@ -213,7 +219,7 @@ parameters:
213219
DnsLatency: durationpb.New(someDuration),
214220
DnsId: 1,
215221
DnsFlags: 0x80,
216-
DnsErrno: 1,
222+
DnsErrno: 22,
217223
TimeFlowRtt: durationpb.New(someDuration),
218224
}},
219225
})
@@ -252,7 +258,7 @@ parameters:
252258
"DnsLatencyMs": float64(someDuration.Milliseconds()),
253259
"DnsId": float64(1),
254260
"DnsFlags": float64(0x80),
255-
"DnsErrno": float64(1),
261+
"DnsErrno": float64(22),
256262
"DnsFlagsResponseCode": "NoError",
257263
"TimeFlowRttNs": float64(someDuration.Nanoseconds()),
258264
}, capturedRecord)

vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/decode/decode_protobuf.go

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

vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_arm64_bpfel.go

Lines changed: 36 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

vendor/github.com/netobserv/netobserv-ebpf-agent/pkg/ebpf/bpf_powerpc_bpfel.go

Lines changed: 36 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

0 commit comments

Comments
 (0)