From f8b2b0a9147277b373f665104e253002d7a5eab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20=C5=BBak?= Date: Thu, 31 Oct 2024 22:21:21 +0100 Subject: [PATCH] chore: Fix linter findings for `revive:enforce-slice-style` in `plugins/inputs/[e-j]*` (#16088) --- .../elasticsearch_query_test.go | 7 -- plugins/inputs/ethtool/ethtool_linux.go | 6 +- plugins/inputs/ethtool/ethtool_test.go | 14 ++-- .../eventhub_consumer/eventhub_consumer.go | 4 +- plugins/inputs/execd/shim/goshim.go | 3 +- plugins/inputs/filecount/filecount.go | 6 +- plugins/inputs/gnmi/handler.go | 3 +- plugins/inputs/gnmi/path.go | 6 +- .../google_cloud_storage_test.go | 2 +- plugins/inputs/hugepages/hugepages_test.go | 2 +- plugins/inputs/icinga2/icinga2_test.go | 2 - plugins/inputs/intel_dlb/intel_dlb_test.go | 4 +- plugins/inputs/intel_pmt/intel_pmt_test.go | 2 +- plugins/inputs/intel_pmu/intel_pmu_test.go | 2 +- .../intel_powerstat/intel_powerstat_test.go | 65 +++++++++---------- plugins/inputs/interrupts/interrupts.go | 2 +- .../inputs/ipmi_sensor/ipmi_sensor_test.go | 4 +- plugins/inputs/iptables/iptables_test.go | 2 - plugins/inputs/jenkins/jenkins.go | 5 +- plugins/inputs/jenkins/jenkins_test.go | 8 +-- .../inputs/jolokia2_agent/jolokia2_agent.go | 1 - .../jolokia2_agent/jolokia2_agent_test.go | 1 - .../inputs/jolokia2_proxy/jolokia2_proxy.go | 1 - .../jolokia2_proxy/jolokia2_proxy_test.go | 1 - .../jti_openconfig_telemetry.go | 3 +- 25 files changed, 62 insertions(+), 94 deletions(-) diff --git a/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go b/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go index 305c16998..20d8d3a0c 100644 --- a/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go +++ b/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go @@ -331,7 +331,6 @@ var testEsAggregationData = []esAggregationQueryTest{ FilterQuery: "response: 200", DateField: "@timestamp", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{}, }, nil, @@ -357,7 +356,6 @@ var testEsAggregationData = []esAggregationQueryTest{ MetricFunction: "max", DateField: "@timestamp", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{"size": "long"}, }, []aggregationQueryData{ @@ -388,7 +386,6 @@ var testEsAggregationData = []esAggregationQueryTest{ MetricFunction: "average", DateField: "@timestamp", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{"size": "long"}, }, nil, @@ -405,7 +402,6 @@ var testEsAggregationData = []esAggregationQueryTest{ MetricFields: []string{"none"}, DateField: "@timestamp", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{}, }, nil, @@ -421,7 +417,6 @@ var testEsAggregationData = []esAggregationQueryTest{ MeasurementName: "measurement11", DateField: "@timestamp", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{}, }, nil, @@ -439,7 +434,6 @@ var testEsAggregationData = []esAggregationQueryTest{ MetricFunction: "avg", DateField: "@notatimestamp", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{"size": "long"}, }, []aggregationQueryData{ @@ -496,7 +490,6 @@ var testEsAggregationData = []esAggregationQueryTest{ DateField: "@timestamp", DateFieldFormat: "yyyy", QueryPeriod: queryPeriod, - Tags: []string{}, mapMetricFields: map[string]string{}, }, nil, diff --git a/plugins/inputs/ethtool/ethtool_linux.go b/plugins/inputs/ethtool/ethtool_linux.go index f3087ecd1..4629a8500 100644 --- a/plugins/inputs/ethtool/ethtool_linux.go +++ b/plugins/inputs/ethtool/ethtool_linux.go @@ -360,11 +360,7 @@ func (c *commandEthtool) interfaces(includeNamespaces bool) ([]namespacedInterfa func init() { inputs.Add(pluginName, func() telegraf.Input { return &Ethtool{ - InterfaceInclude: []string{}, - InterfaceExclude: []string{}, - NamespaceInclude: []string{}, - NamespaceExclude: []string{}, - command: newCommandEthtool(), + command: newCommandEthtool(), } }) } diff --git a/plugins/inputs/ethtool/ethtool_test.go b/plugins/inputs/ethtool/ethtool_test.go index 9f79d8965..0088a3f3c 100644 --- a/plugins/inputs/ethtool/ethtool_test.go +++ b/plugins/inputs/ethtool/ethtool_test.go @@ -580,10 +580,8 @@ func setup() { c := &commandEthtoolMock{interfaceMap} eth = &Ethtool{ - InterfaceInclude: []string{}, - InterfaceExclude: []string{}, - DownInterfaces: "expose", - command: c, + DownInterfaces: "expose", + command: c, } } @@ -932,7 +930,6 @@ func TestNormalizedKeys(t *testing.T) { }, }, { - normalization: []string{}, stats: map[string]interface{}{ " Port RX ": uint64(1), " Port_tx": uint64(0), @@ -946,7 +943,6 @@ func TestNormalizedKeys(t *testing.T) { }, }, { - normalization: []string{}, stats: map[string]interface{}{ " Port RX ": uint64(1), " Port_tx": uint64(0), @@ -972,10 +968,8 @@ func TestNormalizedKeys(t *testing.T) { cmd := &commandEthtoolMock{interfaceMap} eth = &Ethtool{ - InterfaceInclude: []string{}, - InterfaceExclude: []string{}, - NormalizeKeys: c.normalization, - command: cmd, + NormalizeKeys: c.normalization, + command: cmd, } err := eth.Init() diff --git a/plugins/inputs/eventhub_consumer/eventhub_consumer.go b/plugins/inputs/eventhub_consumer/eventhub_consumer.go index fff52b7e5..71646d217 100644 --- a/plugins/inputs/eventhub_consumer/eventhub_consumer.go +++ b/plugins/inputs/eventhub_consumer/eventhub_consumer.go @@ -81,7 +81,7 @@ func (e *EventHub) Init() (err error) { } // Set hub options - hubOpts := []eventhub.HubOption{} + hubOpts := make([]eventhub.HubOption, 0, 2) if e.PersistenceDir != "" { persister, err := persist.NewFilePersister(e.PersistenceDir) @@ -162,7 +162,7 @@ func (e *EventHub) Stop() { } func (e *EventHub) configureReceiver() []eventhub.ReceiveOption { - receiveOpts := []eventhub.ReceiveOption{} + receiveOpts := make([]eventhub.ReceiveOption, 0, 4) if e.ConsumerGroup != "" { receiveOpts = append(receiveOpts, eventhub.ReceiveWithConsumerGroup(e.ConsumerGroup)) diff --git a/plugins/inputs/execd/shim/goshim.go b/plugins/inputs/execd/shim/goshim.go index 7a06a342f..32e5d63f4 100644 --- a/plugins/inputs/execd/shim/goshim.go +++ b/plugins/inputs/execd/shim/goshim.go @@ -304,8 +304,7 @@ func getEnv(key string) string { } func loadConfigIntoInputs(md toml.MetaData, inputConfigs map[string][]toml.Primitive) ([]telegraf.Input, error) { - renderedInputs := []telegraf.Input{} - + renderedInputs := make([]telegraf.Input, 0, len(inputConfigs)) for name, primitives := range inputConfigs { inputCreator, ok := inputs.Inputs[name] if !ok { diff --git a/plugins/inputs/filecount/filecount.go b/plugins/inputs/filecount/filecount.go index 85c228b7b..bba922619 100644 --- a/plugins/inputs/filecount/filecount.go +++ b/plugins/inputs/filecount/filecount.go @@ -285,8 +285,9 @@ func (fc *FileCount) getDirs() []string { } func (fc *FileCount) initGlobPaths(acc telegraf.Accumulator) { - fc.globPaths = []globpath.GlobPath{} - for _, directory := range fc.getDirs() { + dirs := fc.getDirs() + fc.globPaths = make([]globpath.GlobPath, 0, len(dirs)) + for _, directory := range dirs { glob, err := globpath.Compile(directory) if err != nil { acc.AddError(err) @@ -299,7 +300,6 @@ func (fc *FileCount) initGlobPaths(acc telegraf.Accumulator) { func newFileCount() *FileCount { return &FileCount{ Directory: "", - Directories: []string{}, Name: "*", Recursive: true, RegularOnly: true, diff --git a/plugins/inputs/gnmi/handler.go b/plugins/inputs/gnmi/handler.go index a7dad5928..62c572bdd 100644 --- a/plugins/inputs/gnmi/handler.go +++ b/plugins/inputs/gnmi/handler.go @@ -330,9 +330,10 @@ func guessPrefixFromUpdate(fields []updateField) string { if len(fields) == 1 { return fields[0].path.dir() } + segments := make([]segment, 0, len(fields[0].path.segments)) commonPath := &pathInfo{ origin: fields[0].path.origin, - segments: append([]segment{}, fields[0].path.segments...), + segments: append(segments, fields[0].path.segments...), } for _, f := range fields[1:] { commonPath.keepCommonPart(f.path) diff --git a/plugins/inputs/gnmi/path.go b/plugins/inputs/gnmi/path.go index 70b2ba77d..e6600fb97 100644 --- a/plugins/inputs/gnmi/path.go +++ b/plugins/inputs/gnmi/path.go @@ -103,10 +103,11 @@ func (pi *pathInfo) empty() bool { func (pi *pathInfo) append(paths ...*gnmi.Path) *pathInfo { // Copy the existing info + segments := make([]segment, 0, len(pi.segments)) path := &pathInfo{ origin: pi.origin, target: pi.target, - segments: append([]segment{}, pi.segments...), + segments: append(segments, pi.segments...), keyValues: make([]keySegment, 0, len(pi.keyValues)), } for _, elem := range pi.keyValues { @@ -150,10 +151,11 @@ func (pi *pathInfo) append(paths ...*gnmi.Path) *pathInfo { func (pi *pathInfo) appendSegments(segments ...string) *pathInfo { // Copy the existing info + seg := make([]segment, 0, len(segments)) path := &pathInfo{ origin: pi.origin, target: pi.target, - segments: append([]segment{}, pi.segments...), + segments: append(seg, pi.segments...), keyValues: make([]keySegment, 0, len(pi.keyValues)), } for _, elem := range pi.keyValues { diff --git a/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go b/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go index f6208000c..b96cee48d 100644 --- a/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go +++ b/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go @@ -315,7 +315,7 @@ func stateFullGCSServer(t *testing.T) *httptest.Server { } else if pageToken == "page4" { objListing["items"] = []interface{}{fourthElement} } else if offset == "prefix/1604148850994" { - objListing["items"] = []interface{}{} + objListing["items"] = make([]interface{}, 0) } else { objListing["items"] = []interface{}{firstElement} objListing["nextPageToken"] = "page2" diff --git a/plugins/inputs/hugepages/hugepages_test.go b/plugins/inputs/hugepages/hugepages_test.go index 8540e3b9e..2946942dd 100644 --- a/plugins/inputs/hugepages/hugepages_test.go +++ b/plugins/inputs/hugepages/hugepages_test.go @@ -25,7 +25,7 @@ func TestInit(t *testing.T) { }) t.Run("when empty hugepages types is provided then plugin should fail to initialize", func(t *testing.T) { - h := Hugepages{Types: []string{}} + h := Hugepages{Types: make([]string, 0)} err := h.Init() require.Error(t, err) diff --git a/plugins/inputs/icinga2/icinga2_test.go b/plugins/inputs/icinga2/icinga2_test.go index d72ec6aaa..9345b9a91 100644 --- a/plugins/inputs/icinga2/icinga2_test.go +++ b/plugins/inputs/icinga2/icinga2_test.go @@ -30,7 +30,6 @@ func TestIcinga2Default(t *testing.T) { func TestIcinga2DeprecatedHostConfig(t *testing.T) { icinga2 := &Icinga2{ ObjectType: "hosts", // deprecated - Objects: []string{}, } require.NoError(t, icinga2.Init()) @@ -40,7 +39,6 @@ func TestIcinga2DeprecatedHostConfig(t *testing.T) { func TestIcinga2DeprecatedServicesConfig(t *testing.T) { icinga2 := &Icinga2{ ObjectType: "services", // deprecated - Objects: []string{}, } require.NoError(t, icinga2.Init()) diff --git a/plugins/inputs/intel_dlb/intel_dlb_test.go b/plugins/inputs/intel_dlb/intel_dlb_test.go index a5bef4af7..051ea44cb 100644 --- a/plugins/inputs/intel_dlb/intel_dlb_test.go +++ b/plugins/inputs/intel_dlb/intel_dlb_test.go @@ -149,7 +149,7 @@ func TestDLB_writeReadSocketMessage(t *testing.T) { connection: mockConn, Log: testutil.Logger{}, } - mockConn.On("Write", []byte{}).Return(0, errors.New("write error")).Once(). + mockConn.On("Write", make([]byte, 0)).Return(0, errors.New("write error")).Once(). On("Close").Return(nil).Once() _, _, err := dlb.writeReadSocketMessage("") @@ -180,7 +180,7 @@ func TestDLB_writeReadSocketMessage(t *testing.T) { connection: mockConn, Log: testutil.Logger{}, } - mockConn.On("Write", []byte{}).Return(0, nil).Once(). + mockConn.On("Write", make([]byte, 0)).Return(0, nil).Once(). On("Read", mock.Anything).Return(0, nil). On("Close").Return(nil).Once() diff --git a/plugins/inputs/intel_pmt/intel_pmt_test.go b/plugins/inputs/intel_pmt/intel_pmt_test.go index 4a35bc3bd..112761637 100644 --- a/plugins/inputs/intel_pmt/intel_pmt_test.go +++ b/plugins/inputs/intel_pmt/intel_pmt_test.go @@ -348,7 +348,7 @@ func TestGather(t *testing.T) { }, }, files: []testFile{ - {guid: "test-guid", content: []byte{}}, + {guid: "test-guid"}, }, wantErr: true, }, diff --git a/plugins/inputs/intel_pmu/intel_pmu_test.go b/plugins/inputs/intel_pmu/intel_pmu_test.go index 8b43d7bd0..6c75f68f6 100644 --- a/plugins/inputs/intel_pmu/intel_pmu_test.go +++ b/plugins/inputs/intel_pmu/intel_pmu_test.go @@ -472,7 +472,7 @@ func TestAddFiles(t *testing.T) { mError := errors.New("mock error") t.Run("no paths", func(t *testing.T) { - err := checkFiles([]string{}, mFileInfo) + err := checkFiles(nil, mFileInfo) require.Error(t, err) require.Contains(t, err.Error(), "no paths were given") }) diff --git a/plugins/inputs/intel_powerstat/intel_powerstat_test.go b/plugins/inputs/intel_powerstat/intel_powerstat_test.go index d84fda97d..d6dc94a90 100644 --- a/plugins/inputs/intel_powerstat/intel_powerstat_test.go +++ b/plugins/inputs/intel_powerstat/intel_powerstat_test.go @@ -42,8 +42,8 @@ func TestParsePackageMetrics(t *testing.T) { }, { name: "EmptySlice", - metrics: []packageMetricType{}, - parsed: []packageMetricType{}, + metrics: make([]packageMetricType, 0), + parsed: make([]packageMetricType, 0), }, { name: "HasDuplicates", @@ -84,8 +84,8 @@ func TestParseCPUMetrics(t *testing.T) { }, { name: "EmptySlice", - metrics: []cpuMetricType{}, - parsed: []cpuMetricType{}, + metrics: make([]cpuMetricType, 0), + parsed: make([]cpuMetricType, 0), }, { name: "HasDuplicates", @@ -121,8 +121,8 @@ func TestParseCPUTimeRelatedMsrMetrics(t *testing.T) { testCases := []parseCPUMetricTestCase{ { name: "EmptySlice", - metrics: []cpuMetricType{}, - parsed: []cpuMetricType{}, + metrics: make([]cpuMetricType, 0), + parsed: make([]cpuMetricType, 0), }, { name: "NotFound", @@ -138,7 +138,7 @@ func TestParseCPUTimeRelatedMsrMetrics(t *testing.T) { cpuC0SubstateC02Percent, cpuC0SubstateC0WaitPercent, }, - parsed: []cpuMetricType{}, + parsed: make([]cpuMetricType, 0), }, { name: "Found", @@ -190,8 +190,8 @@ func TestParseCPUPerfMetrics(t *testing.T) { testCases := []parseCPUMetricTestCase{ { name: "EmptySlice", - metrics: []cpuMetricType{}, - parsed: []cpuMetricType{}, + metrics: make([]cpuMetricType, 0), + parsed: make([]cpuMetricType, 0), }, { name: "NotFound", @@ -207,7 +207,7 @@ func TestParseCPUPerfMetrics(t *testing.T) { cpuC6StateResidency, cpuBusyFrequency, }, - parsed: []cpuMetricType{}, + parsed: make([]cpuMetricType, 0), }, { name: "Found", @@ -252,8 +252,8 @@ func TestParsePackageRaplMetrics(t *testing.T) { testCases := []parsePackageMetricTestCase{ { name: "EmptySlice", - metrics: []packageMetricType{}, - parsed: []packageMetricType{}, + metrics: make([]packageMetricType, 0), + parsed: make([]packageMetricType, 0), }, { name: "NotFound", @@ -263,7 +263,7 @@ func TestParsePackageRaplMetrics(t *testing.T) { packageCPUBaseFrequency, packageUncoreFrequency, }, - parsed: []packageMetricType{}, + parsed: make([]packageMetricType, 0), }, { name: "Found", @@ -302,8 +302,8 @@ func TestParsePackageMsrMetrics(t *testing.T) { testCases := []parsePackageMetricTestCase{ { name: "EmptySlice", - metrics: []packageMetricType{}, - parsed: []packageMetricType{}, + metrics: make([]packageMetricType, 0), + parsed: make([]packageMetricType, 0), }, { name: "NotFound", @@ -313,7 +313,7 @@ func TestParsePackageMsrMetrics(t *testing.T) { packageCurrentDramPowerConsumption, packageThermalDesignPower, }, - parsed: []packageMetricType{}, + parsed: make([]packageMetricType, 0), }, { name: "Found", @@ -503,12 +503,12 @@ func TestParseCores(t *testing.T) { { name: "CoresIsNil", coreGroups: nil, - cores: []int{}, + cores: make([]int, 0), }, { name: "CoresIsEmpty", - coreGroups: []string{}, - cores: []int{}, + coreGroups: make([]string, 0), + cores: make([]int, 0), }, { name: "Ok", @@ -598,7 +598,7 @@ func TestParseConfig(t *testing.T) { t.Run("NoMetricsProvided", func(t *testing.T) { p := &PowerStat{ // Disable default package metrics. - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), } require.ErrorContains(t, p.parseConfig(), "no metrics were found in the configuration file") @@ -610,7 +610,7 @@ func TestParseConfig(t *testing.T) { cpuBusyFrequency, }, // Disable default package metrics. - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), } require.NoError(t, p.parseConfig()) @@ -798,7 +798,7 @@ func TestGather(t *testing.T) { acc := &testutil.Accumulator{} p := &PowerStat{ - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), } require.NoError(t, p.Gather(acc)) @@ -918,7 +918,7 @@ func TestGather(t *testing.T) { p := &PowerStat{ // Disables package metrics - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), CPUMetrics: []cpuMetricType{ cpuFrequency, cpuTemperature, @@ -974,7 +974,7 @@ func TestGather(t *testing.T) { p := &PowerStat{ // Disables package metrics - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), CPUMetrics: []cpuMetricType{ cpuC0SubstateC01Percent, cpuC0SubstateC02Percent, @@ -1042,7 +1042,7 @@ func TestGather(t *testing.T) { p := &PowerStat{ // Disables package metrics - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), CPUMetrics: []cpuMetricType{ cpuC0SubstateC01Percent, cpuC0SubstateC02Percent, @@ -1299,7 +1299,7 @@ func TestDisableUnsupportedMetrics(t *testing.T) { // Metrics not relying on dts flag cpuBusyFrequency, }, - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), Log: logger, } @@ -1592,7 +1592,7 @@ func (m *fetcherMock) GetMaxTurboFreqList(packageID int) ([]ptel.MaxTurboFreq, e func TestAddCPUMetrics(t *testing.T) { // Disable package metrics when parseConfig method is called. - packageMetrics := []packageMetricType{} + packageMetrics := make([]packageMetricType, 0) t.Run("NoAvailableCPUs", func(t *testing.T) { acc := &testutil.Accumulator{} @@ -1900,7 +1900,7 @@ func TestAddCPUMetrics(t *testing.T) { func TestAddPerCPUMsrMetrics(t *testing.T) { // Disable package metrics when parseConfig method is called. - packageMetrics := []packageMetricType{} + packageMetrics := make([]packageMetricType, 0) t.Run("WithoutMsrMetrics", func(t *testing.T) { cpuID := 0 @@ -2233,7 +2233,7 @@ func TestAddCPUTimeRelatedMsrMetrics(t *testing.T) { cpuC6StateResidency, cpuBusyCycles, }, - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), EventDefinitions: "./testdata/sapphirerapids_core.json", fetcher: mFetcher, @@ -2326,7 +2326,7 @@ func TestAddCPUTimeRelatedMsrMetrics(t *testing.T) { func TestAddCPUPerfMetrics(t *testing.T) { // Disable package metrics when parseConfig method is called. - packageMetrics := []packageMetricType{} + packageMetrics := make([]packageMetricType, 0) t.Run("FailedToReadPerfEvents", func(t *testing.T) { acc := &testutil.Accumulator{} @@ -2402,7 +2402,7 @@ func TestAddCPUPerfMetrics(t *testing.T) { cpuC0SubstateC02Percent, cpuC0SubstateC0WaitPercent, }, - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), EventDefinitions: "./testdata/sapphirerapids_core.json", fetcher: mFetcher, @@ -2449,7 +2449,6 @@ func TestAddCPUPerfMetrics(t *testing.T) { cpuC0SubstateC02Percent, cpuC0SubstateC0WaitPercent, }, - PackageMetrics: []packageMetricType{}, EventDefinitions: "./testdata/sapphirerapids_core.json", fetcher: mFetcher, @@ -2659,7 +2658,7 @@ func TestAddPerCPUPerfMetrics(t *testing.T) { cpuC0SubstateC01Percent, cpuC0SubstateC02Percent, }, - PackageMetrics: []packageMetricType{}, + PackageMetrics: make([]packageMetricType, 0), EventDefinitions: "./testdata/sapphirerapids_core.json", fetcher: mFetcher, diff --git a/plugins/inputs/interrupts/interrupts.go b/plugins/inputs/interrupts/interrupts.go index 2b8abf743..4872fb989 100644 --- a/plugins/inputs/interrupts/interrupts.go +++ b/plugins/inputs/interrupts/interrupts.go @@ -135,7 +135,7 @@ func reportMetrics(measurement string, irqs []irq, acc telegraf.Accumulator, cpu } func newIRQ(id string) *irq { - return &irq{id: id, cpus: []int64{}} + return &irq{id: id} } func init() { diff --git a/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go b/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go index 4ff61340b..25b4576b6 100644 --- a/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go +++ b/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go @@ -928,9 +928,7 @@ func TestSanitizeIPMICmd(t *testing.T) { }, }, { - name: "empty args", - args: []string{}, - expected: []string{}, + name: "empty args", }, } for _, tt := range tests { diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go index ad2692d67..d528ff7bf 100644 --- a/plugins/inputs/iptables/iptables_test.go +++ b/plugins/inputs/iptables/iptables_test.go @@ -151,8 +151,6 @@ func TestIptables_Gather(t *testing.T) { a a ACCEPT all -- * * 1.3.5.7 0.0.0.0/0 /* test */ a a CLASSIFY all -- * * 1.3.5.7 0.0.0.0/0 /* test2 */ CLASSIFY set 1:4 `}, - tags: []map[string]string{}, - fields: [][]map[string]interface{}{}, }, { // 11 - all target and ports table: "all_recv", diff --git a/plugins/inputs/jenkins/jenkins.go b/plugins/inputs/jenkins/jenkins.go index 274766d94..ed3920fb3 100644 --- a/plugins/inputs/jenkins/jenkins.go +++ b/plugins/inputs/jenkins/jenkins.go @@ -244,9 +244,8 @@ func (j *Jenkins) gatherJobs(acc telegraf.Accumulator) { go func(name string, wg *sync.WaitGroup, acc telegraf.Accumulator) { defer wg.Done() if err := j.getJobDetail(jobRequest{ - name: name, - parents: []string{}, - layer: 0, + name: name, + layer: 0, }, acc); err != nil { acc.AddError(err) } diff --git a/plugins/inputs/jenkins/jenkins_test.go b/plugins/inputs/jenkins/jenkins_test.go index 6ee429ef7..8e249f65f 100644 --- a/plugins/inputs/jenkins/jenkins_test.go +++ b/plugins/inputs/jenkins/jenkins_test.go @@ -152,9 +152,7 @@ func TestGatherNodeData(t *testing.T) { }, }, }, - output: &testutil.Accumulator{ - Metrics: []*testutil.Metric{}, - }, + output: &testutil.Accumulator{}, }, { name: "filtered nodes (excluded)", @@ -797,9 +795,7 @@ func TestGatherJobs(t *testing.T) { {Name: "ignore-1"}, }, }, - "/job/ignore-1/api/json": &jobResponse{ - Jobs: []innerJob{}, - }, + "/job/ignore-1/api/json": &jobResponse{}, "/job/apps/api/json": &jobResponse{ Jobs: []innerJob{ {Name: "k8s-cloud"}, diff --git a/plugins/inputs/jolokia2_agent/jolokia2_agent.go b/plugins/inputs/jolokia2_agent/jolokia2_agent.go index 39e9adf8c..4bcdbd017 100644 --- a/plugins/inputs/jolokia2_agent/jolokia2_agent.go +++ b/plugins/inputs/jolokia2_agent/jolokia2_agent.go @@ -99,7 +99,6 @@ func (ja *JolokiaAgent) createClient(url string) (*common.Client, error) { func init() { inputs.Add("jolokia2_agent", func() telegraf.Input { return &JolokiaAgent{ - Metrics: []common.MetricConfig{}, DefaultFieldSeparator: ".", } }) diff --git a/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go b/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go index 256027f68..a79d9f8eb 100644 --- a/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go +++ b/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go @@ -914,7 +914,6 @@ func setupPlugin(t *testing.T, conf string) telegraf.Input { object := table.Fields[name] if name == "jolokia2_agent" { plugin := jolokia2_agent.JolokiaAgent{ - Metrics: []common.MetricConfig{}, DefaultFieldSeparator: ".", } diff --git a/plugins/inputs/jolokia2_proxy/jolokia2_proxy.go b/plugins/inputs/jolokia2_proxy/jolokia2_proxy.go index 60c0d11d5..107a0eb25 100644 --- a/plugins/inputs/jolokia2_proxy/jolokia2_proxy.go +++ b/plugins/inputs/jolokia2_proxy/jolokia2_proxy.go @@ -99,7 +99,6 @@ func (jp *JolokiaProxy) createClient() (*common.Client, error) { func init() { inputs.Add("jolokia2_proxy", func() telegraf.Input { return &JolokiaProxy{ - Metrics: []common.MetricConfig{}, DefaultFieldSeparator: ".", } }) diff --git a/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go b/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go index 037114719..62735606b 100644 --- a/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go +++ b/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go @@ -179,7 +179,6 @@ func setupPlugin(t *testing.T, conf string) telegraf.Input { object := table.Fields[name] if name == "jolokia2_proxy" { plugin := jolokia2_proxy.JolokiaProxy{ - Metrics: []common.MetricConfig{}, DefaultFieldSeparator: ".", } diff --git a/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go b/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go index 84cb9aba9..e60dda372 100644 --- a/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go +++ b/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go @@ -217,8 +217,7 @@ func (m *OpenConfigTelemetry) extractData(r *telemetry.OpenConfigData, grpcServe // Use empty prefix. We will update this when we iterate over key-value pairs prefix := "" - dgroups := []dataGroup{} - + dgroups := make([]dataGroup, 0, 5*len(r.Kv)) for _, v := range r.Kv { kv := make(map[string]interface{})