upd: struct layout + go1.17

Author: maier

agent/accumulator_test.go

@@ -71,11 +71,11 @@ func TestAccAddError(t *testing.T) {
 
 func TestSetPrecision(t *testing.T) {
 	tests := []struct {
-		name      string
-		unset     bool
-		precision time.Duration
 		timestamp time.Time
 		expected  time.Time
+		name      string
+		precision time.Duration
+		unset     bool
 	}{
 		{
 			name:      "default precision is nanosecond",

agent/agent_posix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package agent

agent/agent_test.go

@@ -118,12 +118,12 @@ func TestWindow(t *testing.T) {
 	}
 
 	tests := []struct {
-		name          string
 		start         time.Time
-		roundInterval bool
-		period        time.Duration
 		since         time.Time
 		until         time.Time
+		name          string
+		period        time.Duration
+		roundInterval bool
 	}{
 		{
 			name:          "round with exact alignment",

agent/agent_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent

agent/tick.go

@@ -31,12 +31,12 @@ type Ticker interface {
 // no maximum sleep, when using large intervals alignment is not corrected
 // until the next tick.
 type AlignedTicker struct {
+	wg          sync.WaitGroup
+	ch          chan time.Time
+	cancel      context.CancelFunc
 	interval    time.Duration
 	jitter      time.Duration
 	minInterval time.Duration
-	ch          chan time.Time
-	cancel      context.CancelFunc
-	wg          sync.WaitGroup
 }
 
 func NewAlignedTicker(now time.Time, interval, jitter time.Duration) *AlignedTicker {
@@ -118,11 +118,11 @@ func (t *AlignedTicker) Stop() {
 //
 // Ticks are dropped for slow consumers.
 type UnalignedTicker struct {
-	interval time.Duration
-	jitter   time.Duration
+	wg       sync.WaitGroup
 	ch       chan time.Time
 	cancel   context.CancelFunc
-	wg       sync.WaitGroup
+	interval time.Duration
+	jitter   time.Duration
 }
 
 func NewUnalignedTicker(interval, jitter time.Duration) *UnalignedTicker {
@@ -211,11 +211,11 @@ func (t *UnalignedTicker) Stop() {
 //
 // Ticks are dropped for slow consumers.
 type RollingTicker struct {
-	interval time.Duration
-	jitter   time.Duration
+	wg       sync.WaitGroup
 	ch       chan time.Time
 	cancel   context.CancelFunc
-	wg       sync.WaitGroup
+	interval time.Duration
+	jitter   time.Duration
 }
 
 func NewRollingTicker(interval, jitter time.Duration) *RollingTicker {

cmd/circonus-unified-agent/circonus-unified-agent.go

@@ -1,4 +1,5 @@
-// +build go1.16
+//go:build go1.17
+// +build go1.17
 
 package main
 
@@ -140,6 +141,7 @@ func runAgent(ctx context.Context,
 		if err != nil {
 			return fmt.Errorf("loaddir (%s): %w", *fConfigDirectory, err)
 		}
+		log.Printf("I! Completed loading configs from %s", *fConfigDirectory)
 	}
 
 	// mgm: add default plugins and agent plugins

cmd/circonus-unified-agent/circonus-unified-agent_posix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

cmd/circonus-unified-agent/circonus-unified-agent_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package main

cua/metric.go

@@ -26,8 +26,8 @@ type Tag struct {
 
 // Field represents a single field key and value.
 type Field struct {
-	Key   string
 	Value interface{}
+	Key   string
 }
 
 // Metric is the type of data that is processed by the agent.  Input plugins,

internal/exec_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package internal

internal/exec_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package internal

internal/goplugin/noplugin.go

@@ -1,3 +1,4 @@
+//go:build !goplugin
 // +build !goplugin
 
 package goplugin

internal/goplugin/plugin.go

@@ -1,3 +1,4 @@
+//go:build goplugin
 // +build goplugin
 
 package goplugin

internal/process/process.go

@@ -15,20 +15,19 @@ import (
 
 // Process is a long-running process manager that will restart processes if they stop.
 type Process struct {
-	Cmd          *exec.Cmd
+	mainLoopWg   sync.WaitGroup
 	Stdin        io.WriteCloser
 	Stdout       io.ReadCloser
 	Stderr       io.ReadCloser
-	ReadStdoutFn func(io.Reader)
+	Log          cua.Logger
+	Cmd          *exec.Cmd
 	ReadStderrFn func(io.Reader)
+	ReadStdoutFn func(io.Reader)
+	cancel       context.CancelFunc
+	name         string
+	args         []string
 	RestartDelay time.Duration
-	Log          cua.Logger
-
-	name       string
-	args       []string
-	pid        int32
-	cancel     context.CancelFunc
-	mainLoopWg sync.WaitGroup
+	pid          int32
 }
 
 // New creates a new process wrapper

internal/process/process_posix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package process

internal/process/process_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package process

internal/process/process_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package process

internal/usage.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package internal

internal/usage_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package internal

logger/event_logger_test.go

@@ -1,4 +1,5 @@
-//+build windows
+//go:build windows
+// +build windows
 
 package logger
 

logger/logger.go

@@ -22,22 +22,22 @@ const (
 
 // LogConfig contains the log configuration settings
 type LogConfig struct {
-	// will set the log level to DEBUG
-	Debug bool
-	// will set the log level to ERROR
-	Quiet bool
 	// stderr, stdout, file or eventlog (Windows only)
 	LogTarget string
 	// will direct the logging output to a file. Empty string is
 	// interpreted as stderr. If there is an error opening the file the
 	// logger will fallback to stderr
 	Logfile string
+	// maximum rotated files to keep (older ones will be deleted)
+	RotationMaxArchives int
 	// will rotate when current file at the specified time interval
 	RotationInterval internal.Duration
 	// will rotate when current file size exceeds this parameter.
 	RotationMaxSize internal.Size
-	// maximum rotated files to keep (older ones will be deleted)
-	RotationMaxArchives int
+	// will set the log level to ERROR
+	Quiet bool
+	// will set the log level to DEBUG
+	Debug bool
 }
 
 type Creator interface {

metric/metric.go

@@ -10,14 +10,14 @@ import (
 )
 
 type metric struct {
+	tm             time.Time
 	name           string
-	tags           []*cua.Tag
+	originInstance string
+	origin         string
 	fields         []*cua.Field
-	tm             time.Time
+	tags           []*cua.Tag
 	tp             cua.ValueType
 	aggregate      bool
-	origin         string
-	originInstance string
 }
 
 func New(

metric/tracking.go

@@ -45,11 +45,11 @@ func debugFinalizer(d *trackingData) {
 }
 
 type trackingData struct {
+	notifyFunc  NotifyFunc
 	id          cua.TrackingID
 	rc          int32
 	acceptCount int32
 	rejectCount int32
-	notifyFunc  NotifyFunc
 }
 
 func (d *trackingData) incr() {

metric/tracking_test.go

@@ -70,9 +70,9 @@ func TestNewTrackingID(t *testing.T) {
 
 func TestTracking(t *testing.T) {
 	tests := []struct {
-		name      string
 		metric    cua.Metric
 		actions   func(metric cua.Metric)
+		name      string
 		delivered bool
 	}{
 		{
@@ -174,9 +174,9 @@ func TestTracking(t *testing.T) {
 
 func TestGroupTracking(t *testing.T) {
 	tests := []struct {
+		actions   func(metrics []cua.Metric)
 		name      string
 		metrics   []cua.Metric
-		actions   func(metrics []cua.Metric)
 		delivered bool
 	}{
 		{

models/buffer.go

@@ -15,20 +15,18 @@ var (
 // Buffer stores metrics in a circular buffer.
 type Buffer struct {
 	sync.Mutex
-	buf   []cua.Metric
-	first int // index of the first/oldest metric
-	last  int // one after the index of the last/newest metric
-	size  int // number of metrics currently in the buffer
-	cap   int // the capacity of the buffer
-
-	batchFirst int // index of the first metric in the batch
-	batchSize  int // number of metrics currently in the batch
-
-	MetricsAdded   selfstat.Stat
-	MetricsWritten selfstat.Stat
-	MetricsDropped selfstat.Stat
 	BufferSize     selfstat.Stat
+	MetricsDropped selfstat.Stat
+	MetricsWritten selfstat.Stat
+	MetricsAdded   selfstat.Stat
 	BufferLimit    selfstat.Stat
+	buf            []cua.Metric
+	cap            int // the capacity of the buffer
+	batchSize      int // number of metrics currently in the batch
+	size           int // number of metrics currently in the buffer
+	last           int // one after the index of the last/newest metric
+	first          int // index of the first/oldest metric
+	batchFirst     int // index of the first metric in the batch
 }
 
 // NewBuffer returns a new empty Buffer with the given capacity.

models/filter.go

@@ -9,32 +9,28 @@ import (
 
 // TagFilter is the name of a tag, and the values on which to filter
 type TagFilter struct {
+	filter filter.Filter
 	Name   string
 	Filter []string
-	filter filter.Filter
 }
 
 // Filter containing drop/pass and tagdrop/tagpass rules
 type Filter struct {
-	NameDrop []string
-	nameDrop filter.Filter
-	NamePass []string
-	namePass filter.Filter
-
-	FieldDrop []string
-	fieldDrop filter.Filter
-	FieldPass []string
-	fieldPass filter.Filter
-
-	TagDrop []TagFilter
-	TagPass []TagFilter
-
-	TagExclude []string
+	fieldPass  filter.Filter
+	nameDrop   filter.Filter
+	tagInclude filter.Filter
+	namePass   filter.Filter
 	tagExclude filter.Filter
+	fieldDrop  filter.Filter
+	NameDrop   []string
+	FieldPass  []string
+	TagDrop    []TagFilter
+	TagPass    []TagFilter
+	TagExclude []string
+	FieldDrop  []string
 	TagInclude []string
-	tagInclude filter.Filter
-
-	isActive bool
+	NamePass   []string
+	isActive   bool
 }
 
 // Compile all Filter lists into filter.Filter objects.

models/filter_test.go

@@ -484,9 +484,9 @@ func TestFilter_FilterTagsPassAndDrop(t *testing.T) {
 
 func BenchmarkFilter(b *testing.B) {
 	tests := []struct {
+		metric cua.Metric
 		name   string
 		filter Filter
-		metric cua.Metric
 	}{
 		{
 			name:   "empty filter",

models/log.go

@@ -9,8 +9,8 @@ import (
 
 // Logger defines a logging structure for plugins.
 type Logger struct {
-	OnErrs []func()
 	Name   string // Name is the plugin name, will be printed in the `[]`.
+	OnErrs []func()
 }
 
 // NewLogger creates a new logger instance