Merge pull request #13 from essentialkaos/develop

Version 3.0.0

Author: andyone

.codebeatsettings

@@ -0,0 +1,9 @@
+{
+  "GOLANG": {
+    "ABC": [15, 25, 50, 70],
+    "LOC": [30, 45, 70, 100],
+    "TOO_MANY_IVARS": [12, 16, 20, 24],
+    "TOO_MANY_FUNCTIONS": [50, 70, 90, 120],
+    "TOTAL_LOC": [500, 750, 1000, 2000]
+  }
+}

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,42 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.

.github/CONTRIBUTING.md

@@ -1,21 +1,19 @@
-# Contributing Guidelines
-
-Contributing guidelines for open-source EK projects.
-
-**IMPORTANT! Contribute your code only if you have an excellent understanding of project idea and all existing code base. Otherwise, a nicely formatted issue will be more helpful to us.**
-
-### Issues
-
-1. Provide product version where the problem was found;
-2. Provide info about your environment;
-3. Provide detailed info about your problem;
-4. Provide steps to reproduce the problem;
-5. Provide actual and expected results.
-
-### Code
-
-1. Check your code **before** creating pull request;
-2. If tests are present in a project, add tests for your code;
-3. Add inline documentation for your code;
-4. Apply code style used throughout the project;
-5. Create your pull request to `develop` branch (_pull requests to other branches are not allowed_).
+# Contributing Guidelines
+
+**IMPORTANT! Contribute your code only if you have an excellent understanding of project idea and all existing code base. Otherwise, a nicely formatted issue will be more helpful to us.**
+
+### Issues
+
+1. Provide product version where the problem was found;
+2. Provide info about your environment;
+3. Provide detailed info about your problem;
+4. Provide steps to reproduce the problem;
+5. Provide actual and expected results.
+
+### Code
+
+1. Check your code **before** creating pull request;
+2. If tests are present in a project, add tests for your code;
+3. Add inline documentation for your code;
+4. Apply code style used throughout the project;
+5. Create your pull request to `develop` branch (_pull requests to other branches are not allowed_).

Makefile

@@ -1,13 +1,13 @@
-########################################################################################
+################################################################################
 
-# This Makefile generated by GoMakeGen 0.6.0 using next command:
+# This Makefile generated by GoMakeGen 0.6.1 using next command:
 # gomakegen .
 
-########################################################################################
+################################################################################
 
 .PHONY = fmt all clean deps
 
-########################################################################################
+################################################################################
 
 all: redis-latency-monitor
 
@@ -16,7 +16,6 @@ redis-latency-monitor:
 
 deps:
 	git config --global http.https://pkg.re.followRedirects true
-	go get -d -v github.com/montanaflynn/stats
 	go get -d -v pkg.re/essentialkaos/ek.v9
 
 fmt:
@@ -25,4 +24,4 @@ fmt:
 clean:
 	rm -f redis-latency-monitor
 
-########################################################################################
+################################################################################

common/redis-latency-monitor.spec

@@ -10,7 +10,7 @@
 
 Summary:         Tiny Redis client for latency measurement
 Name:            redis-latency-monitor
-Version:         2.4.0
+Version:         3.0.0
 Release:         0%{?dist}
 Group:           Applications/System
 License:         EKOL
@@ -58,6 +58,14 @@ rm -rf %{buildroot}
 ###############################################################################
 
 %changelog
+* Tue Dec 19 2017 Anton Novojilov <[email protected]> - 3.0.0-0
+- Fixed bug with percentile calculation
+- ek package updated to latest version
+- More precise latency calculation
+- Removed external packages
+- Improved UI
+- Code refactoring
+
 * Tue Oct 03 2017 Anton Novojilov <[email protected]> - 2.4.0-0
 - Added option -T/--timestamps for output time as unix timestamp
 

redis-latency-monitor.go

@@ -11,7 +11,6 @@ import (
 	"bufio"
 	"fmt"
 	"io"
-	"math"
 	"net"
 	"os"
 	"runtime"
@@ -22,26 +21,30 @@ import (
 	"pkg.re/essentialkaos/ek.v9/fmtutil"
 	"pkg.re/essentialkaos/ek.v9/fmtutil/table"
 	"pkg.re/essentialkaos/ek.v9/log"
+	"pkg.re/essentialkaos/ek.v9/mathutil"
 	"pkg.re/essentialkaos/ek.v9/options"
 	"pkg.re/essentialkaos/ek.v9/timeutil"
 	"pkg.re/essentialkaos/ek.v9/usage"
 
-	"github.com/montanaflynn/stats"
+	"github.com/essentialkaos/redis-latency-monitor/stats"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
+// App info
 const (
 	APP  = "Redis Latency Monitor"
-	VER  = "2.4.0"
+	VER  = "3.0.0"
 	DESC = "Tiny Redis client for latency measurement"
 )
 
+// Main constatnts
 const (
 	LATENCY_SAMPLE_RATE int = 10
 	CONNECT_SAMPLE_RATE     = 100
 )
 
+// Options
 const (
 	OPT_HOST       = "h:host"
 	OPT_PORT       = "p:port"
@@ -196,7 +199,7 @@ func connectToRedis(reconnect bool) error {
 // measureLatency measure latency
 func measureLatency(interval time.Duration, prettyOutput bool) {
 	var (
-		measurements   []float64
+		measurements   stats.Data
 		count, pointer int
 		t              *table.Table
 		sampleRate     int
@@ -232,7 +235,7 @@ func measureLatency(interval time.Duration, prettyOutput bool) {
 			errors += execCommand(buf)
 		}
 
-		dur := float64(time.Since(start)) / float64(time.Millisecond)
+		dur := uint64(time.Since(start) / time.Microsecond)
 		measurements[pointer] = dur
 
 		if time.Since(last) >= interval {
@@ -319,42 +322,43 @@ func makeConnection() int {
 }
 
 // printMeasurements calculate and print measurements
-func printMeasurements(t *table.Table, errors int, measurements []float64, prettyOutput bool) {
-	min, _ := stats.Min(measurements)
-	max, _ := stats.Max(measurements)
-	men, _ := stats.Mean(measurements)
-	med, _ := stats.Median(measurements)
-	mgh, _ := stats.Midhinge(measurements)
-	sdv, _ := stats.StandardDeviation(measurements)
-	p95, _ := stats.Percentile(measurements, 95.0)
-	p99, _ := stats.Percentile(measurements, 99.0)
+func printMeasurements(t *table.Table, errors int, measurements stats.Data, prettyOutput bool) {
+	measurements.Sort()
+
+	min := stats.Min(measurements)
+	max := stats.Max(measurements)
+	men := stats.Mean(measurements)
+	sdv := stats.StandardDeviation(measurements)
+	p95 := stats.Percentile(measurements, 95.0)
+	p99 := stats.Percentile(measurements, 99.0)
 
 	if prettyOutput {
 		t.Print(
 			timeutil.Format(time.Now(), "%H:%M:%S.%K"),
 			fmtutil.PrettyNum(len(measurements)),
 			fmtutil.PrettyNum(errors),
 			formatNumber(min), formatNumber(max),
-			formatNumber(men), formatNumber(med),
-			formatNumber(mgh), formatNumber(sdv),
+			formatNumber(men), formatNumber(sdv),
 			formatNumber(p95), formatNumber(p99),
 		)
 	} else {
 		if options.GetB(OPT_TIMESTAMPS) {
 			outputWriter.WriteString(
 				fmt.Sprintf(
-					"%d;%d;%d;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;\n",
+					"%d;%d;%d;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;\n",
 					time.Now().Unix(), len(measurements), errors,
-					min, max, men, med, mgh, sdv, p95, p99,
+					usToMs(min), usToMs(max), usToMs(men),
+					usToMs(sdv), usToMs(p95), usToMs(p99),
 				),
 			)
 		} else {
 			outputWriter.WriteString(
 				fmt.Sprintf(
-					"%s;%d;%d;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;\n",
+					"%s;%d;%d;%.03f;%.03f;%.03f;%.03f;%.03f;%.03f;\n",
 					timeutil.Format(time.Now(), "%Y/%m/%d %H:%M:%S.%K"),
 					len(measurements), errors,
-					min, max, men, med, mgh, sdv, p95, p99,
+					usToMs(min), usToMs(max), usToMs(men),
+					usToMs(sdv), usToMs(p95), usToMs(p99),
 				),
 			)
 		}
@@ -363,35 +367,43 @@ func printMeasurements(t *table.Table, errors int, measurements []float64, prett
 }
 
 // formatNumber format floating number
-func formatNumber(value float64) string {
-	if math.IsNaN(value) {
-		return "------"
+func formatNumber(value uint64) string {
+	if value == 0 {
+		return "{s-}------{!}"
 	}
 
-	if value == 0.0 {
-		return "0{s-}.001{!}"
-	}
+	fv := float64(value) / 1000.0
 
-	if value > 1000.0 {
-		value = math.Floor(value)
+	switch {
+	case fv > 1000.0:
+		fv = mathutil.Round(fv, 0)
+	case fv > 10:
+		fv = mathutil.Round(fv, 1)
+	case fv > 1:
+		fv = mathutil.Round(fv, 2)
 	}
 
-	return strings.Replace(fmtutil.PrettyNum(value), ".", "{s-}.", -1) + "{!}"
+	return strings.Replace(fmtutil.PrettyNum(fv), ".", "{s-}.", -1) + "{!}"
+}
+
+// usToMs convert us in uint64 to ms in float64
+func usToMs(us uint64) float64 {
+	return float64(us) / 1000.0
 }
 
 // createOutputTable create and configure output table struct
 func createOutputTable() *table.Table {
 	t := table.NewTable(
-		"TIME", "SAMPLES", "ERRORS", "MIN", "MAX", "MEAN",
-		"MEDIAN", "STDDEV", "PERC 95", "PERC 99",
+		"TIME", "SAMPLES", "ERRORS", "MIN", "MAX",
+		"MEAN", "STDDEV", "PERC 95", "PERC 99",
 	)
 
 	t.SetSizes(12, 8, 8, 8, 10, 8, 8, 8)
 
 	t.SetAlignments(
 		table.ALIGN_RIGHT, table.ALIGN_RIGHT, table.ALIGN_RIGHT,
 		table.ALIGN_RIGHT, table.ALIGN_RIGHT, table.ALIGN_RIGHT,
-		table.ALIGN_RIGHT, table.ALIGN_RIGHT,
+		table.ALIGN_RIGHT,
 	)
 
 	return t
@@ -419,9 +431,9 @@ func alignTime() time.Time {
 }
 
 // createMeasurementsSlice create float64 slice for measurements
-func createMeasurementsSlice(sampleRate int) []float64 {
+func createMeasurementsSlice(sampleRate int) []uint64 {
 	size := (options.GetI(OPT_INTERVAL) * 1000) / sampleRate
-	return make([]float64, size)
+	return make(stats.Data, size)
 }
 
 // flushOutput is function for flushing output