Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

plot improvements and fixes #204

Merged
merged 1 commit into from
Dec 24, 2023
Merged

plot improvements and fixes #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dist/
report/
dnspyre

graphs*/
/graphs*/

# Jekyll documentation
_site
Expand Down
4 changes: 1 addition & 3 deletions cmd/benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ type Benchmark struct {

// PlotDir controls where the generated graphs are exported. If set to empty (""), which is default value. Then no graphs are generated.
PlotDir string
// PlotFormat controls the format of generated graphs. Supported values are "png" and "jpg".
// PlotFormat controls the format of generated graphs. Supported values are "svg", "png" and "jpg".
PlotFormat string

// DohMethod controls HTTP method used for sending DoH requests. Supported values are "post" and "get". Default is "post".
Expand Down Expand Up @@ -460,8 +460,6 @@ func (b *Benchmark) Run(ctx context.Context) ([]*ResultStats, error) {
edns0.SetDo(true)
}

st.Counters.Total++

start := time.Now()

reqTimeoutCtx, cancel := context.WithTimeout(ctx, b.RequestTimeout)
Expand Down
139 changes: 71 additions & 68 deletions cmd/plot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"image/color"
"os"
"sort"
"time"

"github.com/miekg/dns"
"github.com/montanaflynn/stats"
Expand All @@ -13,6 +14,7 @@
"gonum.org/v1/plot/plotter"
"gonum.org/v1/plot/plotutil"
"gonum.org/v1/plot/vg"
"gonum.org/v1/plot/vg/draw"
)

func plotHistogramLatency(file string, times []Datapoint) {
Expand All @@ -22,7 +24,7 @@
}
var values plotter.Values
for _, v := range times {
values = append(values, v.Duration)
values = append(values, float64(v.Duration.Milliseconds()))
}
p := plot.New()
p.Title.Text = "Latencies distribution"
Expand All @@ -35,7 +37,7 @@
p.X.Tick.Marker = hplot.Ticks{N: 3, Format: "%.0f"}
p.Y.Label.Text = "Number of requests"
p.Y.Tick.Marker = hplot.Ticks{N: 3, Format: "%.0f"}
hist.FillColor = color.RGBA{R: 175, G: 238, B: 238}
hist.FillColor = color.RGBA{R: 175, G: 238, B: 238, A: 255}
p.Add(hist)

if err := p.Save(6*vg.Inch, 6*vg.Inch, file); err != nil {
Expand All @@ -50,7 +52,7 @@
}
var values plotter.Values
for _, v := range times {
values = append(values, v.Duration)
values = append(values, float64(v.Duration.Milliseconds()))
}
p := plot.New()
p.Title.Text = "Latencies distribution"
Expand All @@ -62,7 +64,7 @@
if err != nil {
panic(err)
}
boxplot.FillColor = color.RGBA{R: 127, G: 188, B: 165, A: 1}
boxplot.FillColor = color.RGBA{R: 127, G: 188, B: 165, A: 255}
p.Add(boxplot)

if err := p.Save(6*vg.Inch, 6*vg.Inch, file); err != nil {
Expand All @@ -82,13 +84,13 @@
sort.Ints(sortedKeys)

colors := []color.Color{
color.RGBA{R: 122, G: 195, B: 106},
color.RGBA{R: 241, G: 90, B: 96},
color.RGBA{R: 90, G: 155, B: 212},
color.RGBA{R: 250, G: 167, B: 91},
color.RGBA{R: 158, G: 103, B: 171},
color.RGBA{R: 206, G: 112, B: 88},
color.RGBA{R: 215, G: 127, B: 180},
color.RGBA{R: 122, G: 195, B: 106, A: 255},
color.RGBA{R: 241, G: 90, B: 96, A: 255},
color.RGBA{R: 90, G: 155, B: 212, A: 255},
color.RGBA{R: 250, G: 167, B: 91, A: 255},
color.RGBA{R: 158, G: 103, B: 171, A: 255},
color.RGBA{R: 206, G: 112, B: 88, A: 255},
color.RGBA{R: 215, G: 127, B: 180, A: 255},
}
colors = append(colors, plotutil.DarkColors...)

Expand Down Expand Up @@ -122,7 +124,7 @@
}
}

func plotLineThroughput(file string, times []Datapoint) {
func plotLineThroughput(file string, benchStart time.Time, times []Datapoint) {
if len(times) == 0 {
// nothing to plot
return
Expand All @@ -131,14 +133,12 @@
m := make(map[int64]int64)

if len(times) != 0 {
first := times[0].Start.Unix()

for _, v := range times {
unix := v.Start.Unix() - first
if _, ok := m[unix]; !ok {
m[unix] = 0
offset := v.Start.Unix() - benchStart.Unix()
if _, ok := m[offset]; !ok {
m[offset] = 0
}
m[unix]++
m[offset]++
}
}

Expand All @@ -158,13 +158,16 @@
p.Y.Tick.Marker = hplot.Ticks{N: 3, Format: "%.0f"}

l, err := plotter.NewLine(values)
l.FillColor = color.RGBA{R: 175, G: 238, B: 238}
l.Width = vg.Points(0.5)
l.FillColor = color.RGBA{R: 175, G: 238, B: 238, A: 255}
if err != nil {
panic(err)
}
p.Add(l)

scatter, err := plotter.NewScatter(values)
scatter.GlyphStyle.Shape = draw.CircleGlyph{}

if err != nil {
panic(err)
}
Expand All @@ -182,58 +185,32 @@
p50 float64
}

func plotLineLatencies(file string, times []Datapoint) {
func plotLineLatencies(file string, benchStart time.Time, times []Datapoint) {
if len(times) == 0 {
// nothing to plot
return
}
m := make(map[int64]latencyMeasurements)

measurements := make(map[int64]latencyMeasurements)
timings := make([]float64, 0)
if len(times) != 0 {
first := times[0].Start.Unix()
last := int64(0)
last := times[0].Start.Unix() - benchStart.Unix()

for _, v := range times {
unix := v.Start.Unix() - first
if _, ok := m[unix]; !ok {
m[unix] = latencyMeasurements{}
}
if unix != last {
p99, err := stats.Percentile(timings, 99)
if err != nil {
panic(err)
}
p95, err := stats.Percentile(timings, 95)
if err != nil {
panic(err)
}
p90, err := stats.Percentile(timings, 90)
if err != nil {
panic(err)
}
p50, err := stats.Percentile(timings, 50)
if err != nil {
panic(err)
}
measure := m[unix]
measure.p99 = p99
measure.p95 = p95
measure.p90 = p90
measure.p50 = p50
m[unix] = measure
last = unix
}
timings = append(timings, v.Duration)
for _, v := range times {
offset := v.Start.Unix() - benchStart.Unix()
if offset != last {
collectMeasurements(timings, measurements, last)
last = offset
}
timings = append(timings, float64(v.Duration.Milliseconds()))
}
collectMeasurements(timings, measurements, last)

var p99values plotter.XYs
var p95values plotter.XYs
var p90values plotter.XYs
var p50values plotter.XYs

for k, v := range m {
for k, v := range measurements {
p99values = append(p99values, plotter.XY{X: float64(k), Y: v.p99})
p95values = append(p95values, plotter.XY{X: float64(k), Y: v.p95})
p90values = append(p90values, plotter.XY{X: float64(k), Y: v.p90})
Expand Down Expand Up @@ -268,24 +245,45 @@
}
}

func plotErrorRate(file string, times []ErrorDatapoint) {
func collectMeasurements(timings []float64, measurements map[int64]latencyMeasurements, offset int64) {
p99, err := stats.Percentile(timings, 99)
if err != nil {
panic(err)

Check warning on line 251 in cmd/plot.go

View check run for this annotation

Codecov / codecov/patch

cmd/plot.go#L251 

Added line #L251 was not covered by tests
}
p95, err := stats.Percentile(timings, 95)
if err != nil {
panic(err)

Check warning on line 255 in cmd/plot.go

View check run for this annotation

Codecov / codecov/patch

cmd/plot.go#L255 

Added line #L255 was not covered by tests
}
p90, err := stats.Percentile(timings, 90)
if err != nil {
panic(err)

Check warning on line 259 in cmd/plot.go

View check run for this annotation

Codecov / codecov/patch

cmd/plot.go#L259 

Added line #L259 was not covered by tests
}
p50, err := stats.Percentile(timings, 50)
if err != nil {
panic(err)

Check warning on line 263 in cmd/plot.go

View check run for this annotation

Codecov / codecov/patch

cmd/plot.go#L263 

Added line #L263 was not covered by tests
}
measure := latencyMeasurements{}
measure.p99 = p99
measure.p95 = p95
measure.p90 = p90
measure.p50 = p50
measurements[offset] = measure
}

func plotErrorRate(file string, benchStart time.Time, times []ErrorDatapoint) {
if len(times) == 0 {
// nothing to plot
return
}
var values plotter.XYs
m := make(map[int64]int64)

if len(times) != 0 {
first := times[0].Start.Unix()

for _, v := range times {
unix := v.Start.Unix() - first
if _, ok := m[unix]; !ok {
m[unix] = 0
}
m[unix]++
for _, v := range times {
offset := v.Start.Unix() - benchStart.Unix()
if _, ok := m[offset]; !ok {
m[offset] = 0
}
m[offset]++
}

for k, v := range m {
Expand All @@ -304,7 +302,8 @@
p.Y.Tick.Marker = hplot.Ticks{N: 3, Format: "%.0f"}

l, err := plotter.NewLine(values)
l.FillColor = plotutil.SoftColors[0]
l.Width = vg.Points(0.5)

if err != nil {
panic(err)
}
Expand All @@ -314,6 +313,9 @@
if err != nil {
panic(err)
}
scatter.GlyphStyle.Color = color.RGBA{R: 238, G: 46, B: 47, A: 255}
scatter.GlyphStyle.Shape = draw.CircleGlyph{}

p.Add(scatter)

if err := p.Save(6*vg.Inch, 6*vg.Inch, file); err != nil {
Expand All @@ -334,6 +336,7 @@
if err != nil {
panic(err)
}
scatter.Color = color
scatter.GlyphStyle.Color = color
scatter.GlyphStyle.Shape = draw.CircleGlyph{}
p.Add(scatter)
}