bpf/tests: use MonitorFormatter in bpf_test

Signed-off-by: Andrea Terzolo <andreaterzolo3@gmail.com>

Author: Andreagit97

bpf/tests/bpftest/bpf_test.go

@@ -35,10 +35,10 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/cilium/cilium/pkg/bpf"
-	"github.com/cilium/cilium/pkg/byteorder"
 	"github.com/cilium/cilium/pkg/datapath/link"
 	"github.com/cilium/cilium/pkg/maps/eventsmap"
-	"github.com/cilium/cilium/pkg/monitor"
+	"github.com/cilium/cilium/pkg/monitor/api"
+	"github.com/cilium/cilium/pkg/monitor/format"
 )
 
 var (
@@ -53,6 +53,16 @@ var (
 	dumpCtx = flag.Bool("dump-ctx", false, "If set, the program context will be dumped after a CHECK and SETUP run.")
 )
 
+type testLogWriter struct {
+	t *testing.T
+}
+
+func (w *testLogWriter) Write(p []byte) (n int, err error) {
+	// use the formatted output to avoid the new line
+	w.t.Logf("%s", string(p))
+	return len(p), nil
+}
+
 func TestBPF(t *testing.T) {
 	if testPath == nil || *testPath == "" {
 		t.Skip("Set -bpf-test-path to run BPF tests")
@@ -221,22 +231,14 @@ func loadAndRunSpec(t *testing.T, entry fs.DirEntry, instrLog io.Writer) []*cove
 		}
 		defer globalLogReader.Close()
 
-		linkCache := link.NewLinkCache()
-
+		formatter := format.NewMonitorFormatter(api.DEBUG, link.NewLinkCache(), &testLogWriter{t: t})
 		go func() {
 			for {
 				rec, err := globalLogReader.Read()
 				if err != nil {
 					return
 				}
-
-				dm := monitor.DebugMsg{}
-				reader := bytes.NewReader(rec.RawSample)
-				if err := binary.Read(reader, byteorder.Native, &dm); err != nil {
-					return
-				}
-
-				t.Log(dm.Message(linkCache))
+				formatter.FormatSample(rec.RawSample, rec.CPU)
 			}
 		}()
 	}