From 084a8a9c99a00c88257342c1af89b51cb55532e0 Mon Sep 17 00:00:00 2001 From: Jonas Bostoen Date: Wed, 14 Feb 2024 12:22:23 +0100 Subject: [PATCH] feat: print table --- fmt.go | 40 ++++++++++++++++++++++++++++++++-------- go.mod | 4 ++++ go.sum | 10 +++++++++- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/fmt.go b/fmt.go index 53d5905..a53d72f 100644 --- a/fmt.go +++ b/fmt.go @@ -2,25 +2,49 @@ package main import ( "fmt" - "strings" + "os" + "time" "github.com/chainbound/cbctl/api" + + "github.com/jedib0t/go-pretty/v6/table" ) func printMessageTrace(trace []*api.TraceEntry, showSource bool) { + t := table.NewWriter() + t.SetOutputMirror(os.Stdout) + t.SetStyle(table.StyleLight) + if showSource { - fmt.Printf("Timestamp\tNode ID\t\t\tRegion\t\t\tObservation Type\tSource\n") + t.AppendHeader(table.Row{"Timestamp", "Node ID", "Region", "Observation Type", "Source"}) } else { - fmt.Printf("Timestamp\tNode ID\t\t\tRegion\t\t\tObservation Type\n") - + t.AppendHeader(table.Row{"Timestamp", "Node ID", "Region", "Observation Type"}) } + + firstTimestamp := trace[0].Timestamp / 1000 + fiberPropagationTime := 0 + p2pPropagationTime := 0 + for _, entry := range trace { - chunks := strings.Split(entry.NodeID, "-")[:3] - id := strings.Join(chunks, "-") + id := entry.NodeID + + if entry.ObservationType == "fiber" { + fiberPropagationTime = int(entry.Timestamp/1000) - int(firstTimestamp) + } else if entry.ObservationType == "p2p" { + p2pPropagationTime = int(entry.Timestamp/1000) - int(firstTimestamp) + } + + timestamp := time.Unix(0, int64(entry.Timestamp/1000)*int64(time.Millisecond)) + timestampFmt := timestamp.Format("2006-01-02 15:04:05.000") if showSource { - fmt.Printf("[%d]\t%s\t(%s)\t\t%s\t\t\t%s\n", entry.Timestamp/1000, id, entry.Region, entry.ObservationType, entry.Source) + t.AppendRow(table.Row{timestampFmt, id, entry.Region, entry.ObservationType, entry.Source}) } else { - fmt.Printf("[%d]\t%s\t(%s)\t\t%s\n", entry.Timestamp/1000, id, entry.Region, entry.ObservationType) + t.AppendRow(table.Row{timestampFmt, id, entry.Region, entry.ObservationType}) } } + + t.AppendFooter(table.Row{"fiber propagation time", fmt.Sprint(fiberPropagationTime) + "ms"}) + t.AppendFooter(table.Row{"p2p propagation time", fmt.Sprint(p2pPropagationTime) + "ms"}) + + t.Render() } diff --git a/go.mod b/go.mod index 861e574..03eac4c 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,16 @@ module github.com/chainbound/cbctl go 1.20 require ( + github.com/jedib0t/go-pretty/v6 v6.5.4 github.com/pelletier/go-toml/v2 v2.0.7 github.com/urfave/cli/v2 v2.25.3 ) require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/rivo/uniseg v0.2.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + golang.org/x/sys v0.16.0 // indirect ) diff --git a/go.sum b/go.sum index 2e985c7..ece3f3e 100644 --- a/go.sum +++ b/go.sum @@ -3,10 +3,16 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/jedib0t/go-pretty/v6 v6.5.4 h1:gOGo0613MoqUcf0xCj+h/V3sHDaZasfv152G6/5l91s= +github.com/jedib0t/go-pretty/v6 v6.5.4/go.mod h1:5LQIxa52oJ/DlDSLv0HEkWOFMDGoWkJb9ss5KqPpJBg= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -14,12 +20,14 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/urfave/cli/v2 v2.25.3 h1:VJkt6wvEBOoSjPFQvOkv6iWIrsJyCrKGtCtxXWwmGeY= github.com/urfave/cli/v2 v2.25.3/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=