From ebbc55f2e756201b374cdc195f4273a5748ea827 Mon Sep 17 00:00:00 2001 From: Pawel Zak Date: Fri, 18 Oct 2024 20:42:48 +0200 Subject: [PATCH] chore: Fix linter findings for `revive:enforce-slice-style` in `plugins/inputs/[p-z]*` --- plugins/inputs/p4runtime/p4runtime_test.go | 2 +- plugins/inputs/ping/ping.go | 4 ++-- plugins/inputs/postgresql/postgresql_test.go | 2 +- .../postgresql_extensible_test.go | 4 ++-- plugins/inputs/procstat/pgrep.go | 2 +- plugins/inputs/procstat/procstat_test.go | 5 +++-- plugins/inputs/sflow/decoder_test.go | 4 ++-- plugins/inputs/sflow/metricencoder.go | 2 +- plugins/inputs/sflow/packetdecoder.go | 2 +- plugins/inputs/smart/smart.go | 2 +- plugins/inputs/smart/smart_test.go | 4 ++-- plugins/inputs/snmp/snmp_test.go | 2 +- plugins/inputs/snmp_trap/snmp_trap_test.go | 2 -- plugins/inputs/sqlserver/sqlserver_test.go | 2 +- plugins/inputs/stackdriver/stackdriver.go | 4 ++-- .../inputs/stackdriver/stackdriver_test.go | 8 +++---- plugins/inputs/statsd/statsd_test.go | 2 +- plugins/inputs/supervisor/supervisor_test.go | 8 +++---- plugins/inputs/sysstat/sysstat.go | 2 +- plugins/inputs/system/system_test.go | 1 - plugins/inputs/varnish/varnish.go | 2 +- plugins/inputs/vsphere/client.go | 2 +- plugins/inputs/vsphere/vsan.go | 2 +- plugins/inputs/vsphere/vsphere_test.go | 22 +++++++++---------- plugins/inputs/wireguard/wireguard.go | 2 +- plugins/inputs/zfs/zfs_linux_test.go | 17 +++++++------- plugins/inputs/zipkin/codec/codec_test.go | 12 +++++----- .../inputs/zipkin/codec/thrift/thrift_test.go | 4 ++-- plugins/inputs/zipkin/convert_test.go | 5 +---- plugins/inputs/zipkin/handler_test.go | 4 ++-- 30 files changed, 64 insertions(+), 72 deletions(-) diff --git a/plugins/inputs/p4runtime/p4runtime_test.go b/plugins/inputs/p4runtime/p4runtime_test.go index 67a52c7a8e518..58dbb8336ceaa 100644 --- a/plugins/inputs/p4runtime/p4runtime_test.go +++ b/plugins/inputs/p4runtime/p4runtime_test.go @@ -443,7 +443,7 @@ func TestSingleEntitiesMultipleCounterRead(t *testing.T) { func TestNoCountersAvailable(t *testing.T) { forwardingPipelineConfig := &p4.ForwardingPipelineConfig{ - P4Info: &p4_config.P4Info{Counters: []*p4_config.Counter{}}, + P4Info: &p4_config.P4Info{Counters: make([]*p4_config.Counter, 0)}, } p4RtClient := &fakeP4RuntimeClient{ diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go index 6354670c15aeb..b2262218b89f8 100644 --- a/plugins/inputs/ping/ping.go +++ b/plugins/inputs/ping/ping.go @@ -336,8 +336,8 @@ func init() { Deadline: 10, Method: "exec", Binary: "ping", - Arguments: []string{}, - Percentiles: []int{}, + Arguments: make([]string, 0), + Percentiles: make([]int, 0), } p.nativePingFunc = p.nativePing return p diff --git a/plugins/inputs/postgresql/postgresql_test.go b/plugins/inputs/postgresql/postgresql_test.go index 124ddbe149f28..0a9f998ad1cae 100644 --- a/plugins/inputs/postgresql/postgresql_test.go +++ b/plugins/inputs/postgresql/postgresql_test.go @@ -89,7 +89,7 @@ func TestPostgresqlGeneratesMetricsIntegration(t *testing.T) { "sessions_abandoned", } - int32Metrics := []string{} + var int32Metrics []string floatMetrics := []string{ "blk_read_time", diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go index 85773eb128100..1335cd0da9774 100644 --- a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go +++ b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go @@ -88,7 +88,7 @@ func TestPostgresqlGeneratesMetricsIntegration(t *testing.T) { "datid", } - int32Metrics := []string{} + var int32Metrics []string floatMetrics := []string{ "blk_read_time", @@ -205,7 +205,7 @@ func TestPostgresqlFieldOutputIntegration(t *testing.T) { "datid", } - int32Metrics := []string{} + var int32Metrics []string floatMetrics := []string{ "blk_read_time", diff --git a/plugins/inputs/procstat/pgrep.go b/plugins/inputs/procstat/pgrep.go index e80ed640bbab7..8451210e94530 100644 --- a/plugins/inputs/procstat/pgrep.go +++ b/plugins/inputs/procstat/pgrep.go @@ -72,8 +72,8 @@ func (pg *Pgrep) find(args []string) ([]PID, error) { out := string(buf) // Parse the command output to extract the PIDs - pids := []PID{} fields := strings.Fields(out) + pids := make([]PID, 0, len(fields)) for _, field := range fields { pid, err := strconv.ParseInt(field, 10, 32) if err != nil { diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go index d986aea317384..aa833a86f9b24 100644 --- a/plugins/inputs/procstat/procstat_test.go +++ b/plugins/inputs/procstat/procstat_test.go @@ -33,7 +33,7 @@ func TestMockExecCommand(_ *testing.T) { var cmd []string //nolint:prealloc // Pre-allocated this slice would break the algorithm for _, arg := range os.Args { if arg == "--" { - cmd = []string{} + cmd = make([]string, 0) continue } if cmd == nil { @@ -139,7 +139,8 @@ func (p *testProc) SetTag(k, v string) { } func (p *testProc) MemoryMaps(bool) (*[]process.MemoryMapsStat, error) { - return &[]process.MemoryMapsStat{}, nil + stats := make([]process.MemoryMapsStat, 0) + return &stats, nil } func (p *testProc) Metrics(prefix string, cfg *collectionConfig, t time.Time) ([]telegraf.Metric, error) { diff --git a/plugins/inputs/sflow/decoder_test.go b/plugins/inputs/sflow/decoder_test.go index b2fa1396a66c7..9253e7a2e4a2a 100644 --- a/plugins/inputs/sflow/decoder_test.go +++ b/plugins/inputs/sflow/decoder_test.go @@ -64,7 +64,7 @@ func TestIPv4SW(t *testing.T) { packet, err := hex.DecodeString(str) require.NoError(t, err) - actual := []telegraf.Metric{} + actual := make([]telegraf.Metric, 0) dc := newDecoder() dc.OnPacket(func(p *v5Format) { metrics := makeMetrics(p) @@ -835,6 +835,6 @@ func TestFlowExpandCounter(t *testing.T) { actual := makeMetrics(p) // we don't do anything with samples yet - expected := []telegraf.Metric{} + expected := make([]telegraf.Metric, 0) testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime()) } diff --git a/plugins/inputs/sflow/metricencoder.go b/plugins/inputs/sflow/metricencoder.go index 13702c89e1a46..d657b3907fb4c 100644 --- a/plugins/inputs/sflow/metricencoder.go +++ b/plugins/inputs/sflow/metricencoder.go @@ -10,7 +10,7 @@ import ( func makeMetrics(p *v5Format) []telegraf.Metric { now := time.Now() - metrics := []telegraf.Metric{} + metrics := make([]telegraf.Metric, 0) tags := map[string]string{ "agent_address": p.AgentAddress.String(), } diff --git a/plugins/inputs/sflow/packetdecoder.go b/plugins/inputs/sflow/packetdecoder.go index d5cc0b493fa17..4e7ab329df2ad 100644 --- a/plugins/inputs/sflow/packetdecoder.go +++ b/plugins/inputs/sflow/packetdecoder.go @@ -94,13 +94,13 @@ func (d *packetDecoder) DecodeOnePacket(r io.Reader) (*v5Format, error) { } func (d *packetDecoder) decodeSamples(r io.Reader) ([]sample, error) { - result := []sample{} // # of samples var numOfSamples uint32 if err := read(r, &numOfSamples, "sample count"); err != nil { return nil, err } + result := make([]sample, 0, numOfSamples) for i := 0; i < int(numOfSamples); i++ { sam, err := d.decodeSample(r) if err != nil { diff --git a/plugins/inputs/smart/smart.go b/plugins/inputs/smart/smart.go index ac9d1a1789758..bb983e8d8efbf 100644 --- a/plugins/inputs/smart/smart.go +++ b/plugins/inputs/smart/smart.go @@ -511,7 +511,7 @@ func distinguishNVMeDevices(userDevices, availableNVMeDevices []string) []string func (m *Smart) scanDevices(ignoreExcludes bool, scanArgs ...string) ([]string, error) { out, err := runCmd(m.Timeout, m.UseSudo, m.PathSmartctl, scanArgs...) if err != nil { - return []string{}, fmt.Errorf("failed to run command '%s %s': %w - %s", m.PathSmartctl, scanArgs, err, string(out)) + return nil, fmt.Errorf("failed to run command '%s %s': %w - %s", m.PathSmartctl, scanArgs, err, string(out)) } var devices []string for _, line := range strings.Split(string(out), "\n") { diff --git a/plugins/inputs/smart/smart_test.go b/plugins/inputs/smart/smart_test.go index 63bb146ace531..a5e1265d2d7f0 100644 --- a/plugins/inputs/smart/smart_test.go +++ b/plugins/inputs/smart/smart_test.go @@ -140,7 +140,7 @@ func TestGatherInParallelMode(t *testing.T) { require.NoError(t, err) result := acc.GetTelegrafMetrics() - testutil.RequireMetricsEqual(t, []telegraf.Metric{}, result) + testutil.RequireMetricsEqual(t, make([]telegraf.Metric, 0), result) }) } @@ -186,7 +186,7 @@ func TestGatherNoAttributes(t *testing.T) { func TestExcludedDev(t *testing.T) { require.True(t, excludedDev([]string{"/dev/pass6"}, "/dev/pass6 -d atacam"), "Should be excluded.") - require.False(t, excludedDev([]string{}, "/dev/pass6 -d atacam"), "Shouldn't be excluded.") + require.False(t, excludedDev(make([]string, 0), "/dev/pass6 -d atacam"), "Shouldn't be excluded.") require.False(t, excludedDev([]string{"/dev/pass6"}, "/dev/pass1 -d atacam"), "Shouldn't be excluded.") } diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go index cb9a4622bed70..0746b4eb226c1 100644 --- a/plugins/inputs/snmp/snmp_test.go +++ b/plugins/inputs/snmp/snmp_test.go @@ -676,7 +676,7 @@ func TestSnmpInit_noTranslateGosmi(t *testing.T) { }}, }, ClientConfig: snmp.ClientConfig{ - Path: []string{}, + Path: make([]string, 0), Translator: "gosmi", }, } diff --git a/plugins/inputs/snmp_trap/snmp_trap_test.go b/plugins/inputs/snmp_trap/snmp_trap_test.go index 59dbfa01423d3..fd5ccb7f34b58 100644 --- a/plugins/inputs/snmp_trap/snmp_trap_test.go +++ b/plugins/inputs/snmp_trap/snmp_trap_test.go @@ -251,8 +251,6 @@ func TestReceiveTrap(t *testing.T) { }, }, }, - entries: []entry{}, // nothing in cache - metrics: []telegraf.Metric{}, }, // v1 enterprise specific trap { diff --git a/plugins/inputs/sqlserver/sqlserver_test.go b/plugins/inputs/sqlserver/sqlserver_test.go index 014bef8635c1f..c1c1d591f57af 100644 --- a/plugins/inputs/sqlserver/sqlserver_test.go +++ b/plugins/inputs/sqlserver/sqlserver_test.go @@ -16,7 +16,7 @@ import ( func TestSqlServer_QueriesInclusionExclusion(t *testing.T) { cases := []map[string]interface{}{ { - "IncludeQuery": []string{}, + "IncludeQuery": make([]string, 0), "ExcludeQuery": []string{"WaitStatsCategorized", "DatabaseIO", "ServerProperties", "MemoryClerk", "Schedulers", "VolumeSpace", "Cpu"}, "queries": []string{"PerformanceCounters", "SqlRequests"}, "queriesTotal": 2, diff --git a/plugins/inputs/stackdriver/stackdriver.go b/plugins/inputs/stackdriver/stackdriver.go index 116a1eb884eb1..db415fd4a6542 100644 --- a/plugins/inputs/stackdriver/stackdriver.go +++ b/plugins/inputs/stackdriver/stackdriver.go @@ -490,7 +490,7 @@ func (s *stackdriver) generatetimeSeriesConfs( return s.timeSeriesConfCache.TimeSeriesConfs, nil } - ret := []*timeSeriesConf{} + ret := make([]*timeSeriesConf, 0) req := &monitoringpb.ListMetricDescriptorsRequest{ Name: "projects/" + s.Project, } @@ -718,7 +718,7 @@ func init() { RateLimit: defaultRateLimit, Delay: defaultDelay, GatherRawDistributionBuckets: true, - DistributionAggregationAligners: []string{}, + DistributionAggregationAligners: make([]string, 0), } }) } diff --git a/plugins/inputs/stackdriver/stackdriver_test.go b/plugins/inputs/stackdriver/stackdriver_test.go index fa6bdec75aaba..6eeacd80de084 100644 --- a/plugins/inputs/stackdriver/stackdriver_test.go +++ b/plugins/inputs/stackdriver/stackdriver_test.go @@ -55,7 +55,7 @@ func (m *MockStackdriverClient) ListTimeSeries( } func (m *MockStackdriverClient) Close() error { - call := &Call{name: "Close", args: []interface{}{}} + call := &Call{name: "Close", args: make([]interface{}, 0)} m.Lock() m.calls = append(m.calls, call) m.Unlock() @@ -68,7 +68,7 @@ func TestInitAndRegister(t *testing.T) { RateLimit: defaultRateLimit, Delay: defaultDelay, GatherRawDistributionBuckets: true, - DistributionAggregationAligners: []string{}, + DistributionAggregationAligners: make([]string, 0), } require.Equal(t, expected, inputs.Inputs["stackdriver"]()) } @@ -751,7 +751,7 @@ func TestGather(t *testing.T) { require.Equalf(t, tt.wantAccErr, len(acc.Errors) > 0, "Accumulator errors. got=%v, want=%t", acc.Errors, tt.wantAccErr) - actual := []telegraf.Metric{} + actual := make([]telegraf.Metric, 0, len(acc.Metrics)) for _, m := range acc.Metrics { actual = append(actual, testutil.FromTestMetric(m)) } @@ -874,7 +874,7 @@ func TestGatherAlign(t *testing.T) { err := s.Gather(&acc) require.NoError(t, err) - actual := []telegraf.Metric{} + actual := make([]telegraf.Metric, 0, len(acc.Metrics)) for _, m := range acc.Metrics { actual = append(actual, testutil.FromTestMetric(m)) } diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go index 9ba0ccc96c4b3..938834f109fa0 100644 --- a/plugins/inputs/statsd/statsd_test.go +++ b/plugins/inputs/statsd/statsd_test.go @@ -1717,7 +1717,7 @@ func TestParse_TimingsMultipleFieldsWithTemplate(t *testing.T) { // In this case the behaviour should be the same as normal behaviour func TestParse_TimingsMultipleFieldsWithoutTemplate(t *testing.T) { s := NewTestStatsd() - s.Templates = []string{} + s.Templates = make([]string, 0) s.Percentiles = []Number{90.0} acc := &testutil.Accumulator{} diff --git a/plugins/inputs/supervisor/supervisor_test.go b/plugins/inputs/supervisor/supervisor_test.go index 5a1e913172c49..7cd3f0de4ec6d 100644 --- a/plugins/inputs/supervisor/supervisor_test.go +++ b/plugins/inputs/supervisor/supervisor_test.go @@ -104,8 +104,8 @@ func TestShort_SampleData(t *testing.T) { t.Run(tC.desc, func(t *testing.T) { s := &Supervisor{ Server: "http://example.org:9001/RPC2", - MetricsInc: []string{}, - MetricsExc: []string{}, + MetricsInc: make([]string, 0), + MetricsExc: make([]string, 0), } status := supervisorInfo{ StateCode: tC.supervisorData.StateCode, @@ -153,8 +153,8 @@ func TestIntegration_BasicGathering(t *testing.T) { defer ctr.Terminate() s := &Supervisor{ Server: "http://login:pass@" + testutil.GetLocalHost() + ":" + ctr.Ports[supervisorPort] + "/RPC2", - MetricsInc: []string{}, - MetricsExc: []string{}, + MetricsInc: make([]string, 0), + MetricsExc: make([]string, 0), } err = s.Init() require.NoError(t, err, "failed to run Init function") diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go index 37a9e6be3e8ef..9deb27669f70c 100644 --- a/plugins/inputs/sysstat/sysstat.go +++ b/plugins/inputs/sysstat/sysstat.go @@ -146,7 +146,7 @@ func (s *Sysstat) Gather(acc telegraf.Accumulator) error { // The above command collects system metrics during and // saves it in binary form to tmpFile. func (s *Sysstat) collect(tempfile string) error { - options := []string{} + options := make([]string, 0, len(s.Activities)) for _, act := range s.Activities { options = append(options, "-S", act) } diff --git a/plugins/inputs/system/system_test.go b/plugins/inputs/system/system_test.go index 52c7fcc6b03eb..24fe747589da3 100644 --- a/plugins/inputs/system/system_test.go +++ b/plugins/inputs/system/system_test.go @@ -23,7 +23,6 @@ func TestUniqueUsers(t *testing.T) { { name: "empty entry", expected: 0, - data: []host.UserStat{}, }, { name: "all duplicates", diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go index c5e755da2ff91..bb0c81eaa0cd1 100644 --- a/plugins/inputs/varnish/varnish.go +++ b/plugins/inputs/varnish/varnish.go @@ -408,7 +408,7 @@ func init() { UseSudo: false, InstanceName: "", Timeout: defaultTimeout, - Regexps: []string{}, + Regexps: make([]string, 0), } }) } diff --git a/plugins/inputs/vsphere/client.go b/plugins/inputs/vsphere/client.go index 30d2cd6c203af..972bbd965148f 100644 --- a/plugins/inputs/vsphere/client.go +++ b/plugins/inputs/vsphere/client.go @@ -208,7 +208,7 @@ func NewClient(ctx context.Context, vSphereURL *url.URL, vs *VSphere) (*Client, c.Timeout = time.Duration(vs.Timeout) m := view.NewManager(c.Client) - v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, []string{}, true) + v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, make([]string, 0), true) if err != nil { return nil, err } diff --git a/plugins/inputs/vsphere/vsan.go b/plugins/inputs/vsphere/vsan.go index 3565b44dcba53..74619912b30c2 100644 --- a/plugins/inputs/vsphere/vsan.go +++ b/plugins/inputs/vsphere/vsan.go @@ -388,7 +388,7 @@ func (e *Endpoint) queryResyncSummary(ctx context.Context, vsanClient *soap.Clie includeSummary := true request := vsantypes.VsanQuerySyncingVsanObjects{ This: vsanSystemEx, - Uuids: []string{}, // We only need summary information. + Uuids: make([]string, 0), // We only need summary information. Start: 0, IncludeSummary: &includeSummary, } diff --git a/plugins/inputs/vsphere/vsphere_test.go b/plugins/inputs/vsphere/vsphere_test.go index 9d9d8adc22aa0..7284c48dc98b8 100644 --- a/plugins/inputs/vsphere/vsphere_test.go +++ b/plugins/inputs/vsphere/vsphere_test.go @@ -291,19 +291,19 @@ func TestFinder(t *testing.T) { require.Len(t, host, 1) require.Equal(t, "DC0_H0", host[0].Name) - host = []mo.HostSystem{} + host = make([]mo.HostSystem, 0) err = f.Find(ctx, "HostSystem", "/DC0/host/DC0_C0/DC0_C0_H0", &host) require.NoError(t, err) require.Len(t, host, 1) require.Equal(t, "DC0_C0_H0", host[0].Name) - var resourcepool = []mo.ResourcePool{} + resourcepool := make([]mo.ResourcePool, 0) err = f.Find(ctx, "ResourcePool", "/DC0/host/DC0_C0/Resources/DC0_C0_RP0", &resourcepool) require.NoError(t, err) require.Len(t, host, 1) require.Equal(t, "DC0_C0_H0", host[0].Name) - host = []mo.HostSystem{} + host = make([]mo.HostSystem, 0) err = f.Find(ctx, "HostSystem", "/DC0/host/DC0_C0/*", &host) require.NoError(t, err) require.Len(t, host, 3) @@ -322,8 +322,8 @@ func TestFinder(t *testing.T) { testLookupVM(ctx, t, &f, "/*/host/**/*DC*VM*", 8, "") testLookupVM(ctx, t, &f, "/*/host/**/*DC*/*/*DC*", 4, "") - vm = []mo.VirtualMachine{} - err = f.FindAll(ctx, "VirtualMachine", []string{"/DC0/vm/DC0_H0*", "/DC0/vm/DC0_C0*"}, []string{}, &vm) + vm = make([]mo.VirtualMachine, 0) + err = f.FindAll(ctx, "VirtualMachine", []string{"/DC0/vm/DC0_H0*", "/DC0/vm/DC0_C0*"}, nil, &vm) require.NoError(t, err) require.Len(t, vm, 4) @@ -333,7 +333,7 @@ func TestFinder(t *testing.T) { excludePaths: []string{"/DC0/vm/DC0_H0_VM0"}, resType: "VirtualMachine", } - vm = []mo.VirtualMachine{} + vm = make([]mo.VirtualMachine, 0) require.NoError(t, rf.FindAll(ctx, &vm)) require.Len(t, vm, 3) @@ -343,7 +343,7 @@ func TestFinder(t *testing.T) { excludePaths: []string{"/**"}, resType: "VirtualMachine", } - vm = []mo.VirtualMachine{} + vm = make([]mo.VirtualMachine, 0) require.NoError(t, rf.FindAll(ctx, &vm)) require.Empty(t, vm) @@ -353,7 +353,7 @@ func TestFinder(t *testing.T) { excludePaths: []string{"/**"}, resType: "VirtualMachine", } - vm = []mo.VirtualMachine{} + vm = make([]mo.VirtualMachine, 0) require.NoError(t, rf.FindAll(ctx, &vm)) require.Empty(t, vm) @@ -363,7 +363,7 @@ func TestFinder(t *testing.T) { excludePaths: []string{"/this won't match anything"}, resType: "VirtualMachine", } - vm = []mo.VirtualMachine{} + vm = make([]mo.VirtualMachine, 0) require.NoError(t, rf.FindAll(ctx, &vm)) require.Len(t, vm, 8) @@ -373,7 +373,7 @@ func TestFinder(t *testing.T) { excludePaths: []string{"/**/*VM0"}, resType: "VirtualMachine", } - vm = []mo.VirtualMachine{} + vm = make([]mo.VirtualMachine, 0) require.NoError(t, rf.FindAll(ctx, &vm)) require.Len(t, vm, 4) } @@ -428,7 +428,7 @@ func TestVsanCmmds(t *testing.T) { f := Finder{c} var clusters []mo.ClusterComputeResource - err = f.FindAll(ctx, "ClusterComputeResource", []string{"/**"}, []string{}, &clusters) + err = f.FindAll(ctx, "ClusterComputeResource", []string{"/**"}, nil, &clusters) require.NoError(t, err) clusterObj := object.NewClusterComputeResource(c.Client.Client, clusters[0].Reference()) diff --git a/plugins/inputs/wireguard/wireguard.go b/plugins/inputs/wireguard/wireguard.go index f8eaeb05927cf..4c40806bfb543 100644 --- a/plugins/inputs/wireguard/wireguard.go +++ b/plugins/inputs/wireguard/wireguard.go @@ -116,7 +116,7 @@ func (wg *Wireguard) gatherDevicePeerMetrics(acc telegraf.Accumulator, device *w } if len(peer.AllowedIPs) > 0 { - cidrs := []string{} + cidrs := make([]string, 0, len(peer.AllowedIPs)) for _, ip := range peer.AllowedIPs { cidrs = append(cidrs, ip.String()) } diff --git a/plugins/inputs/zfs/zfs_linux_test.go b/plugins/inputs/zfs/zfs_linux_test.go index 2336d69a1b617..b1e289c082e8c 100644 --- a/plugins/inputs/zfs/zfs_linux_test.go +++ b/plugins/inputs/zfs/zfs_linux_test.go @@ -367,25 +367,24 @@ func TestGetTags(t *testing.T) { expected map[string]string }{ { - "no pools", - []poolInfo{}, - map[string]string{"pools": ""}, + name: "no pools", + expected: map[string]string{"pools": ""}, }, { - "single pool", - []poolInfo{ + name: "single pool", + pools: []poolInfo{ {"data", "/proc/spl/kstat/zfs/data/objset-0x9288", v2}, }, - map[string]string{"pools": "data"}, + expected: map[string]string{"pools": "data"}, }, { - "duplicate pool names", - []poolInfo{ + name: "duplicate pool names", + pools: []poolInfo{ {"pool", "/proc/spl/kstat/zfs/pool/objset-0x23ce1", v2}, {"pool", "/proc/spl/kstat/zfs/pool/objset-0x2e", v2}, {"data", "/proc/spl/kstat/zfs/data/objset-0x9288", v2}, }, - map[string]string{"pools": "pool::data"}, + expected: map[string]string{"pools": "pool::data"}, }, } diff --git a/plugins/inputs/zipkin/codec/codec_test.go b/plugins/inputs/zipkin/codec/codec_test.go index 775c3229a40cb..b3476aa4dff36 100644 --- a/plugins/inputs/zipkin/codec/codec_test.go +++ b/plugins/inputs/zipkin/codec/codec_test.go @@ -96,10 +96,8 @@ func Test_minMax(t *testing.T) { }, }, { - name: "No Annotations", - span: &MockSpan{ - Anno: []Annotation{}, - }, + name: "No Annotations", + span: &MockSpan{}, wantMin: time.Unix(2, 0).UTC(), wantMax: time.Unix(2, 0).UTC(), now: func() time.Time { @@ -459,8 +457,8 @@ func TestNewTrace(t *testing.T) { trace.Span{ ServiceName: "unknown", Timestamp: time.Unix(0, 0).UTC(), - Annotations: []trace.Annotation{}, - BinaryAnnotations: []trace.BinaryAnnotation{}, + Annotations: make([]trace.Annotation, 0), + BinaryAnnotations: make([]trace.BinaryAnnotation, 0), }, }, }, @@ -515,7 +513,7 @@ func TestNewTrace(t *testing.T) { ServiceName: "myname", }, }, - BinaryAnnotations: []trace.BinaryAnnotation{}, + BinaryAnnotations: make([]trace.BinaryAnnotation, 0), }, }, }, diff --git a/plugins/inputs/zipkin/codec/thrift/thrift_test.go b/plugins/inputs/zipkin/codec/thrift/thrift_test.go index ea566e4bfd0c8..642142605da8c 100644 --- a/plugins/inputs/zipkin/codec/thrift/thrift_test.go +++ b/plugins/inputs/zipkin/codec/thrift/thrift_test.go @@ -111,7 +111,7 @@ func TestUnmarshalThrift(t *testing.T) { ParentID: addr(22964302721410078), Timestamp: addr(1498688360851331), Duration: addr(53106), - Annotations: []*zipkincore.Annotation{}, + Annotations: make([]*zipkincore.Annotation, 0), BinaryAnnotations: []*zipkincore.BinaryAnnotation{ { Key: "lc", @@ -131,7 +131,7 @@ func TestUnmarshalThrift(t *testing.T) { ParentID: addr(22964302721410078), Timestamp: addr(1498688360904552), Duration: addr(50410), - Annotations: []*zipkincore.Annotation{}, + Annotations: make([]*zipkincore.Annotation, 0), BinaryAnnotations: []*zipkincore.BinaryAnnotation{ { Key: "lc", diff --git a/plugins/inputs/zipkin/convert_test.go b/plugins/inputs/zipkin/convert_test.go index 6c236310693d7..f13570bf7c41b 100644 --- a/plugins/inputs/zipkin/convert_test.go +++ b/plugins/inputs/zipkin/convert_test.go @@ -40,7 +40,6 @@ func TestLineProtocolConverter_Record(t *testing.T) { Timestamp: time.Unix(0, 1498688360851331000).UTC(), Duration: time.Duration(53106) * time.Microsecond, ServiceName: "trivial", - Annotations: []trace.Annotation{}, BinaryAnnotations: []trace.BinaryAnnotation{ { Key: "lc", @@ -58,7 +57,6 @@ func TestLineProtocolConverter_Record(t *testing.T) { Timestamp: time.Unix(0, 1498688360904552000).UTC(), Duration: time.Duration(50410) * time.Microsecond, ServiceName: "trivial", - Annotations: []trace.Annotation{}, BinaryAnnotations: []trace.BinaryAnnotation{ { Key: "lc", @@ -287,7 +285,6 @@ func TestLineProtocolConverter_Record(t *testing.T) { ServiceName: "go-zipkin-testclient", }, }, - BinaryAnnotations: []trace.BinaryAnnotation{}, }, }, }, @@ -336,7 +333,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { if err := l.Record(tt.args.t); (err != nil) != tt.wantErr { t.Errorf("LineProtocolConverter.Record() error = %v, wantErr %v", err, tt.wantErr) } - got := []testutil.Metric{} + got := make([]testutil.Metric, 0, len(mockAcc.Metrics)) for _, metric := range mockAcc.Metrics { got = append(got, *metric) } diff --git a/plugins/inputs/zipkin/handler_test.go b/plugins/inputs/zipkin/handler_test.go index f6e8bece80240..6eacbdb0cb30b 100644 --- a/plugins/inputs/zipkin/handler_test.go +++ b/plugins/inputs/zipkin/handler_test.go @@ -63,7 +63,7 @@ func TestSpanHandler(t *testing.T) { Timestamp: time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(), Duration: time.Duration(53106) * time.Microsecond, ServiceName: "trivial", - Annotations: []trace.Annotation{}, + Annotations: make([]trace.Annotation, 0), BinaryAnnotations: []trace.BinaryAnnotation{ { Key: "lc", @@ -81,7 +81,7 @@ func TestSpanHandler(t *testing.T) { Timestamp: time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(), Duration: time.Duration(50410) * time.Microsecond, ServiceName: "trivial", - Annotations: []trace.Annotation{}, + Annotations: make([]trace.Annotation, 0), BinaryAnnotations: []trace.BinaryAnnotation{ { Key: "lc",