Skip to content

Commit

Permalink
Merge pull request #791 from msherif1234/xlat-icmp
Browse files Browse the repository at this point in the history
update flp to latest agent changes and fix ut
  • Loading branch information
msherif1234 authored Jan 15, 2025
2 parents ef1dc16 + a172647 commit 9a7b51e
Show file tree
Hide file tree
Showing 17 changed files with 256 additions and 186 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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-20220927092034-f37122a54500
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213165959-7e7f8c42a3f6
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250115132126-73256abeed31
github.com/netsampler/goflow2 v1.3.7
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.20.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,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-20220927092034-f37122a54500 h1:RmnoJe/ci5q+QdM7upFdxiU+D8F3L3qTd5wXCwwHefw=
github.com/netobserv/loki-client-go v0.0.0-20220927092034-f37122a54500/go.mod h1:LHXpc5tjKvsfZn0pwLKrvlgEhZcCaw3Di9mUEZGAI4E=
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213165959-7e7f8c42a3f6 h1:ZuEAJ7Ui0fsMX8tGSz70cXDjlzRnviHjzqlJfWJh9VY=
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213165959-7e7f8c42a3f6/go.mod h1:20e1OPAs7h3k9PvNZWS9D6BnXEtkTk2LlfzD66uhvxY=
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250115132126-73256abeed31 h1:fQB0tCcX0Fkk+I2lvzzVj2cQpeAYlh8UFmL45s3Nh5w=
github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250115132126-73256abeed31/go.mod h1:2UT/wN+zmU+pCajg0crx8+0KOmzS8pBNql5VqXAGY5I=
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=
Expand Down
12 changes: 9 additions & 3 deletions pkg/pipeline/pipeline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,13 @@ parameters:
someDuration := endTime.Sub(startTime)
_, err = flowSender.Client().Send(context.Background(), &pbflow.Records{
Entries: []*pbflow.Record{{
Interface: "eth0",
Interface: "eth0",
DupList: []*pbflow.DupMapEntry{
{
Interface: "eth0",
Direction: pbflow.Direction_EGRESS,
},
},
EthProtocol: 2048,
Bytes: 456,
Packets: 123,
Expand Down Expand Up @@ -213,7 +219,7 @@ parameters:
DnsLatency: durationpb.New(someDuration),
DnsId: 1,
DnsFlags: 0x80,
DnsErrno: 1,
DnsErrno: 22,
TimeFlowRtt: durationpb.New(someDuration),
}},
})
Expand Down Expand Up @@ -252,7 +258,7 @@ parameters:
"DnsLatencyMs": float64(someDuration.Milliseconds()),
"DnsId": float64(1),
"DnsFlags": float64(0x80),
"DnsErrno": float64(1),
"DnsErrno": float64(22),
"DnsFlagsResponseCode": "NoError",
"TimeFlowRttNs": float64(someDuration.Nanoseconds()),
}, capturedRecord)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading

0 comments on commit 9a7b51e

Please sign in to comment.