update flp to latest agent PR

Signed-off-by: Mohamed Mahmoud <[email protected]>

Author: msherif1234

go.mod

@@ -16,7 +16,11 @@ 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
+<<<<<<< HEAD
 	github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213131924-a76ccd3fceb0
+=======
+	github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241212073613-70003f209b56
+>>>>>>> 5304b040 (update flp to latest agent PR)
 	github.com/netsampler/goflow2 v1.3.7
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.20.5

go.sum

@@ -696,8 +696,13 @@ 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=
+<<<<<<< HEAD
 github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213131924-a76ccd3fceb0 h1:D4pwGJYz1iEmPhFe/22zotNUbCJUSEbUnKhkCxntq+8=
 github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241213131924-a76ccd3fceb0/go.mod h1:20e1OPAs7h3k9PvNZWS9D6BnXEtkTk2LlfzD66uhvxY=
+=======
+github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241212073613-70003f209b56 h1:3CKyoiZYxK82dHdGVlaHGgPRf/wW97YH/uMGTlPQ+RE=
+github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20241212073613-70003f209b56/go.mod h1:20e1OPAs7h3k9PvNZWS9D6BnXEtkTk2LlfzD66uhvxY=
+>>>>>>> 5304b040 (update flp to latest agent PR)
 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=