From 611ad26d1be71be7f844e56928436992ea9dfc92 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Tue, 4 Aug 2015 16:09:59 -0600 Subject: [PATCH] go fmt fixes --- cmd/telegraf/telegraf.go | 1 + plugins/mysql/mysql.go | 6 +-- plugins/prometheus/prometheus_test.go | 9 ++-- plugins/system/ps/common/common_freebsd.go | 3 +- plugins/system/ps/host/host_linux_386.go | 50 +++++++++++----------- plugins/system/system_test.go | 4 +- 6 files changed, 36 insertions(+), 37 deletions(-) diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go index 04a292d2b..f34ffd1fd 100644 --- a/cmd/telegraf/telegraf.go +++ b/cmd/telegraf/telegraf.go @@ -21,6 +21,7 @@ var fPidfile = flag.String("pidfile", "", "file to write our pid to") // Telegraf version var Version = "unreleased" + // Telegraf commit var Commit = "" diff --git a/plugins/mysql/mysql.go b/plugins/mysql/mysql.go index b94b4f9b2..a55006a4d 100644 --- a/plugins/mysql/mysql.go +++ b/plugins/mysql/mysql.go @@ -72,9 +72,9 @@ var mappings = []*mapping{ inExport: "innodb_", }, { - onServer: "Tokudb_", - inExport: "tokudb_", - }, + onServer: "Tokudb_", + inExport: "tokudb_", + }, { onServer: "Threads_", inExport: "threads_", diff --git a/plugins/prometheus/prometheus_test.go b/plugins/prometheus/prometheus_test.go index be2b190e7..4f79822c1 100644 --- a/plugins/prometheus/prometheus_test.go +++ b/plugins/prometheus/prometheus_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" ) - const sampleTextFormat = `# HELP go_gc_duration_seconds A summary of the GC invocation durations. # TYPE go_gc_duration_seconds summary go_gc_duration_seconds{quantile="0"} 0.00010425500000000001 @@ -27,9 +26,9 @@ go_goroutines 15 ` func TestPrometheusGeneratesMetrics(t *testing.T) { - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintln(w, sampleTextFormat) - })) + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + fmt.Fprintln(w, sampleTextFormat) + })) defer ts.Close() p := &Prometheus{ @@ -44,7 +43,7 @@ func TestPrometheusGeneratesMetrics(t *testing.T) { expected := []struct { name string value float64 - tags map[string]string + tags map[string]string }{ {"go_gc_duration_seconds_count", 7, map[string]string{}}, {"go_goroutines", 15, map[string]string{}}, diff --git a/plugins/system/ps/common/common_freebsd.go b/plugins/system/ps/common/common_freebsd.go index 3c1124655..8ccd40e90 100644 --- a/plugins/system/ps/common/common_freebsd.go +++ b/plugins/system/ps/common/common_freebsd.go @@ -3,9 +3,9 @@ package common import ( - "syscall" "os/exec" "strings" + "syscall" "unsafe" ) @@ -58,4 +58,3 @@ func CallSyscall(mib []int32) ([]byte, uint64, error) { return buf, length, nil } - diff --git a/plugins/system/ps/host/host_linux_386.go b/plugins/system/ps/host/host_linux_386.go index d8f31c2f6..fb6d7a0f6 100644 --- a/plugins/system/ps/host/host_linux_386.go +++ b/plugins/system/ps/host/host_linux_386.go @@ -6,39 +6,39 @@ package host const ( - sizeofPtr = 0x4 - sizeofShort = 0x2 - sizeofInt = 0x4 - sizeofLong = 0x4 - sizeofLongLong = 0x8 + sizeofPtr = 0x4 + sizeofShort = 0x2 + sizeofInt = 0x4 + sizeofLong = 0x4 + sizeofLongLong = 0x8 ) type ( - _C_short int16 - _C_int int32 - _C_long int32 - _C_long_long int64 + _C_short int16 + _C_int int32 + _C_long int32 + _C_long_long int64 ) type utmp struct { - Type int16 - Pad_cgo_0 [2]byte - Pid int32 - Line [32]int8 - Id [4]int8 - User [32]int8 - Host [256]int8 - Exit exit_status - Session int32 - Tv UtTv - Addr_v6 [4]int32 - X__unused [20]int8 + Type int16 + Pad_cgo_0 [2]byte + Pid int32 + Line [32]int8 + Id [4]int8 + User [32]int8 + Host [256]int8 + Exit exit_status + Session int32 + Tv UtTv + Addr_v6 [4]int32 + X__unused [20]int8 } type exit_status struct { - Termination int16 - Exit int16 + Termination int16 + Exit int16 } type UtTv struct { - TvSec int32 - TvUsec int32 + TvSec int32 + TvUsec int32 } diff --git a/plugins/system/system_test.go b/plugins/system/system_test.go index 1c40b7f97..7a3d13570 100644 --- a/plugins/system/system_test.go +++ b/plugins/system/system_test.go @@ -272,8 +272,8 @@ func TestSystemStats_GenerateStats(t *testing.T) { require.NoError(t, err) dockertags := map[string]string{ - "name": "blah", - "id": "", + "name": "blah", + "id": "", "command": "", }