diff --git a/plugins/inputs/aliyuncms/aliyuncms.go b/plugins/inputs/aliyuncms/aliyuncms.go index c20464c0fc44b..fb96556d8c458 100644 --- a/plugins/inputs/aliyuncms/aliyuncms.go +++ b/plugins/inputs/aliyuncms/aliyuncms.go @@ -148,7 +148,7 @@ func (s *AliyunCMS) Init() error { if metric.Dimensions == "" { continue } - metric.dimensionsUdObj = map[string]string{} + metric.dimensionsUdObj = make(map[string]string) metric.dimensionsUdArr = []map[string]string{} // first try to unmarshal as an object @@ -295,9 +295,9 @@ func (s *AliyunCMS) gatherMetric(acc telegraf.Accumulator, metricName string, me NextDataPoint: for _, datapoint := range datapoints { - fields := map[string]interface{}{} + fields := make(map[string]interface{}, len(datapoint)) + tags := make(map[string]string, len(datapoint)) datapointTime := int64(0) - tags := map[string]string{} for key, value := range datapoint { switch key { case "instanceId", "BucketName": diff --git a/plugins/inputs/aliyuncms/discovery.go b/plugins/inputs/aliyuncms/discovery.go index 574570e14636f..a48172f7aa7c0 100644 --- a/plugins/inputs/aliyuncms/discovery.go +++ b/plugins/inputs/aliyuncms/discovery.go @@ -97,8 +97,6 @@ func newDiscoveryTool( discoveryInterval time.Duration, ) (*discoveryTool, error) { var ( - dscReq = map[string]discoveryRequest{} - cli = map[string]aliyunSdkClient{} responseRootKey string responseObjectIDKey string err error @@ -115,6 +113,8 @@ func newDiscoveryTool( rateLimit = 1 } + dscReq := make(map[string]discoveryRequest, len(regions)) + cli := make(map[string]aliyunSdkClient, len(regions)) for _, region := range regions { switch project { case "acs_ecs_dashboard": @@ -252,7 +252,7 @@ func newDiscoveryTool( func (dt *discoveryTool) parseDiscoveryResponse(resp *responses.CommonResponse) (*parsedDResp, error) { var ( - fullOutput = map[string]interface{}{} + fullOutput = make(map[string]interface{}) data []byte foundDataItem bool foundRootKey bool @@ -335,8 +335,8 @@ func (dt *discoveryTool) getDiscoveryData(cli aliyunSdkClient, req *requests.Com req.QueryParams["PageNumber"] = strconv.Itoa(pageNumber) if len(discoveryData) == totalCount { // All data received - // Map data to appropriate shape before return - preparedData := map[string]interface{}{} + // Map data to the appropriate shape before return + preparedData := make(map[string]interface{}, len(discoveryData)) for _, raw := range discoveryData { elem, ok := raw.(map[string]interface{}) @@ -353,10 +353,7 @@ func (dt *discoveryTool) getDiscoveryData(cli aliyunSdkClient, req *requests.Com } func (dt *discoveryTool) getDiscoveryDataAcrossRegions(lmtr chan bool) (map[string]interface{}, error) { - var ( - data map[string]interface{} - resultData = map[string]interface{}{} - ) + resultData := make(map[string]interface{}) for region, cli := range dt.cli { // Building common request, as the code below is the same no matter @@ -383,7 +380,7 @@ func (dt *discoveryTool) getDiscoveryDataAcrossRegions(lmtr chan bool) (map[stri commonRequest.TransToAcsRequest() // Get discovery data using common request - data, err = dt.getDiscoveryData(cli, commonRequest, lmtr) + data, err := dt.getDiscoveryData(cli, commonRequest, lmtr) if err != nil { return nil, err } @@ -428,8 +425,7 @@ func (dt *discoveryTool) start() { } if !reflect.DeepEqual(data, lastData) { - lastData = nil - lastData = map[string]interface{}{} + lastData = make(map[string]interface{}, len(data)) for k, v := range data { lastData[k] = v } diff --git a/plugins/inputs/amd_rocm_smi/amd_rocm_smi.go b/plugins/inputs/amd_rocm_smi/amd_rocm_smi.go index d30f13ba6a334..fbca6246ebd92 100644 --- a/plugins/inputs/amd_rocm_smi/amd_rocm_smi.go +++ b/plugins/inputs/amd_rocm_smi/amd_rocm_smi.go @@ -186,7 +186,6 @@ func genTagsFields(gpus map[string]gpu, system map[string]sysInfo) []metric { tags := map[string]string{ "name": cardID, } - fields := map[string]interface{}{} payload := gpus[cardID] //nolint:errcheck // silently treat as zero if malformed @@ -202,6 +201,7 @@ func genTagsFields(gpus map[string]gpu, system map[string]sysInfo) []metric { setTagIfUsed(tags, "gpu_unique_id", payload.GpuUniqueID) + fields := make(map[string]interface{}, 20) setIfUsed("int", fields, "driver_version", strings.ReplaceAll(system["system"].DriverVersion, ".", "")) setIfUsed("int", fields, "fan_speed", payload.GpuFanSpeedPercentage) setIfUsed("int64", fields, "memory_total", payload.GpuVRAMTotalMemory) diff --git a/plugins/inputs/ceph/ceph.go b/plugins/inputs/ceph/ceph.go index 6bb521345cbbf..2ef13b6788c21 100644 --- a/plugins/inputs/ceph/ceph.go +++ b/plugins/inputs/ceph/ceph.go @@ -505,7 +505,7 @@ func decodeStatusFsmap(acc telegraf.Accumulator, data *status) error { "up_standby": data.FSMap.NumUpStandby, "up": data.FSMap.NumUp, } - acc.AddFields("ceph_fsmap", fields, map[string]string{}) + acc.AddFields("ceph_fsmap", fields, make(map[string]string)) return nil } @@ -521,7 +521,7 @@ func decodeStatusHealth(acc telegraf.Accumulator, data *status) error { "status_code": statusCodes[data.Health.Status], "status": data.Health.Status, } - acc.AddFields("ceph_health", fields, map[string]string{}) + acc.AddFields("ceph_health", fields, make(map[string]string)) return nil } @@ -530,7 +530,7 @@ func decodeStatusMonmap(acc telegraf.Accumulator, data *status) error { fields := map[string]interface{}{ "num_mons": data.MonMap.NumMons, } - acc.AddFields("ceph_monmap", fields, map[string]string{}) + acc.AddFields("ceph_monmap", fields, make(map[string]string)) return nil } @@ -555,7 +555,7 @@ func decodeStatusOsdmap(acc telegraf.Accumulator, data *status) error { } } - acc.AddFields("ceph_osdmap", fields, map[string]string{}) + acc.AddFields("ceph_osdmap", fields, make(map[string]string)) return nil } @@ -586,7 +586,7 @@ func decodeStatusPgmap(acc telegraf.Accumulator, data *status) error { "write_bytes_sec": data.PGMap.WriteBytesSec, "write_op_per_sec": data.PGMap.WriteOpPerSec, } - acc.AddFields("ceph_pgmap", fields, map[string]string{}) + acc.AddFields("ceph_pgmap", fields, make(map[string]string)) return nil } @@ -654,14 +654,14 @@ func decodeDf(acc telegraf.Accumulator, input string) error { "total_used_raw_ratio": data.Stats.TotalUsedRawRatio, "total_used": data.Stats.TotalUsed, // pre ceph 0.84 } - acc.AddFields("ceph_usage", fields, map[string]string{}) + acc.AddFields("ceph_usage", fields, make(map[string]string)) // ceph.stats_by_class: records per device-class usage for class, stats := range data.StatsbyClass { tags := map[string]string{ "class": class, } - fields := map[string]interface{}{} + fields := make(map[string]interface{}) for key, value := range stats { fields[key] = value } diff --git a/plugins/inputs/chrony/chrony.go b/plugins/inputs/chrony/chrony.go index 6a76aa6e57b4d..f5c78f7e02382 100644 --- a/plugins/inputs/chrony/chrony.go +++ b/plugins/inputs/chrony/chrony.go @@ -227,7 +227,7 @@ func (c *Chrony) gatherActivity(acc telegraf.Accumulator) error { return fmt.Errorf("got unexpected response type %T while waiting for activity data", r) } - tags := map[string]string{} + tags := make(map[string]string, 1) if c.source != "" { tags["source"] = c.source } @@ -300,7 +300,7 @@ func (c *Chrony) gatherServerStats(acc telegraf.Accumulator) error { return fmt.Errorf("querying server statistics failed: %w", err) } - tags := map[string]string{} + tags := make(map[string]string, 1) if c.source != "" { tags["source"] = c.source } diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go index c40cc41a4823c..f3753542b3b0f 100644 --- a/plugins/inputs/cloudwatch/cloudwatch.go +++ b/plugins/inputs/cloudwatch/cloudwatch.go @@ -142,8 +142,7 @@ func (c *CloudWatch) Gather(acc telegraf.Accumulator) error { wg := sync.WaitGroup{} rLock := sync.Mutex{} - results := map[string][]types.MetricDataResult{} - + results := make(map[string][]types.MetricDataResult) for namespace, namespacedQueries := range queries { var batches [][]types.MetricDataQuery @@ -373,9 +372,8 @@ func (c *CloudWatch) getDataQueries(filteredMetrics []filteredMetric) map[string return c.metricCache.queries } - c.queryDimensions = map[string]*map[string]string{} - - dataQueries := map[string][]types.MetricDataQuery{} + c.queryDimensions = make(map[string]*map[string]string) + dataQueries := make(map[string][]types.MetricDataQuery) for i, filtered := range filteredMetrics { for j, singleMetric := range filtered.metrics { id := strconv.Itoa(j) + "_" + strconv.Itoa(i) @@ -460,8 +458,7 @@ func (c *CloudWatch) aggregateMetrics(acc telegraf.Accumulator, metricDataResult namespace = sanitizeMeasurement(namespace) for _, result := range results { - tags := map[string]string{} - + tags := make(map[string]string) if dimensions, ok := c.queryDimensions[*result.Id]; ok { tags = *dimensions } @@ -507,7 +504,7 @@ func snakeCase(s string) string { // ctod converts cloudwatch dimensions to regular dimensions. func ctod(cDimensions []types.Dimension) *map[string]string { - dimensions := map[string]string{} + dimensions := make(map[string]string, len(cDimensions)) for i := range cDimensions { dimensions[snakeCase(*cDimensions[i].Name)] = *cDimensions[i].Value } diff --git a/plugins/inputs/couchdb/couchdb.go b/plugins/inputs/couchdb/couchdb.go index c51d9f30d6da7..f24bd795621f3 100644 --- a/plugins/inputs/couchdb/couchdb.go +++ b/plugins/inputs/couchdb/couchdb.go @@ -149,8 +149,6 @@ func (c *CouchDB) fetchAndInsertData(accumulator telegraf.Accumulator, host stri return fmt.Errorf("failed to decode stats from couchdb: HTTP body %q", response.Body) } - fields := map[string]interface{}{} - // for couchdb 2.0 API changes requestTime := metaData{ Current: stats.Couchdb.RequestTime.Current, @@ -207,6 +205,7 @@ func (c *CouchDB) fetchAndInsertData(accumulator telegraf.Accumulator, host stri httpdStatusCodesStatus500 = stats.Couchdb.HttpdStatusCodes.Status500 } + fields := make(map[string]interface{}, 31) // CouchDB meta stats: c.generateFields(fields, "couchdb_auth_cache_misses", stats.Couchdb.AuthCacheMisses) c.generateFields(fields, "couchdb_database_writes", stats.Couchdb.DatabaseWrites) diff --git a/plugins/inputs/directory_monitor/directory_monitor.go b/plugins/inputs/directory_monitor/directory_monitor.go index 9e88ce49af201..2ef24a9fdafc9 100644 --- a/plugins/inputs/directory_monitor/directory_monitor.go +++ b/plugins/inputs/directory_monitor/directory_monitor.go @@ -100,9 +100,9 @@ func (monitor *DirectoryMonitor) Init() error { tags := map[string]string{ "directory": monitor.Directory, } - monitor.filesDropped = selfstat.Register("directory_monitor", "files_dropped", map[string]string{}) + monitor.filesDropped = selfstat.Register("directory_monitor", "files_dropped", make(map[string]string)) monitor.filesDroppedDir = selfstat.Register("directory_monitor", "files_dropped_per_dir", tags) - monitor.filesProcessed = selfstat.Register("directory_monitor", "files_processed", map[string]string{}) + monitor.filesProcessed = selfstat.Register("directory_monitor", "files_processed", make(map[string]string)) monitor.filesProcessedDir = selfstat.Register("directory_monitor", "files_processed_per_dir", tags) monitor.filesQueuedDir = selfstat.Register("directory_monitor", "files_queue_per_dir", tags) diff --git a/plugins/inputs/diskio/diskio.go b/plugins/inputs/diskio/diskio.go index da5252de77411..7db9e848d4ddd 100644 --- a/plugins/inputs/diskio/diskio.go +++ b/plugins/inputs/diskio/diskio.go @@ -81,7 +81,7 @@ func (d *DiskIO) Gather(acc telegraf.Accumulator) error { match = true } - tags := map[string]string{} + tags := make(map[string]string) var devLinks []string tags["name"], devLinks = d.diskName(io.Name) @@ -207,7 +207,7 @@ func (d *DiskIO) diskTags(devName string) map[string]string { return nil } - tags := map[string]string{} + tags := make(map[string]string, len(d.DeviceTags)) for _, dt := range d.DeviceTags { if v, ok := di[dt]; ok { tags[dt] = v diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go index a703da0cf1f41..b09eb347232c5 100644 --- a/plugins/inputs/docker/docker.go +++ b/plugins/inputs/docker/docker.go @@ -276,9 +276,6 @@ func (d *Docker) gatherSwarmInfo(acc telegraf.Accumulator) error { return err } - running := map[string]int{} - tasksNoShutdown := map[string]uint64{} - activeNodes := make(map[string]struct{}) for _, n := range nodes { if n.Status.State != swarm.NodeStateDown { @@ -286,6 +283,8 @@ func (d *Docker) gatherSwarmInfo(acc telegraf.Accumulator) error { } } + tasksNoShutdown := make(map[string]uint64, len(tasks)) + running := make(map[string]int, len(tasks)) for _, task := range tasks { if task.DesiredState != swarm.TaskStateShutdown { tasksNoShutdown[task.ServiceID]++ @@ -297,8 +296,8 @@ func (d *Docker) gatherSwarmInfo(acc telegraf.Accumulator) error { } for _, service := range services { - tags := map[string]string{} - fields := make(map[string]interface{}) + tags := make(map[string]string, 3) + fields := make(map[string]interface{}, 2) now := time.Now() tags["service_id"] = service.ID tags["service_name"] = service.Spec.Name @@ -375,7 +374,7 @@ func (d *Docker) gatherInfo(acc telegraf.Accumulator) error { var ( // "docker_devicemapper" measurement fields poolName string - deviceMapperFields = map[string]interface{}{} + deviceMapperFields = make(map[string]interface{}, len(info.DriverStatus)) ) for _, rawData := range info.DriverStatus { diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go index 199f2827190b3..2c25e8fc73bec 100644 --- a/plugins/inputs/elasticsearch/elasticsearch.go +++ b/plugins/inputs/elasticsearch/elasticsearch.go @@ -548,11 +548,11 @@ func (e *Elasticsearch) gatherIndicesStats(url string, acc telegraf.Accumulator) now := time.Now() // Total Shards Stats - shardsStats := map[string]interface{}{} + shardsStats := make(map[string]interface{}, len(indicesStats.Shards)) for k, v := range indicesStats.Shards { shardsStats[k] = v } - acc.AddFields("elasticsearch_indices_stats_shards_total", shardsStats, map[string]string{}, now) + acc.AddFields("elasticsearch_indices_stats_shards_total", shardsStats, make(map[string]string), now) // All Stats for m, s := range indicesStats.All { @@ -603,7 +603,7 @@ func (e *Elasticsearch) gatherIndividualIndicesStats(indices map[string]indexSta } func (e *Elasticsearch) categorizeIndices(indices map[string]indexStat) map[string][]string { - categorizedIndexNames := map[string][]string{} + categorizedIndexNames := make(map[string][]string, len(indices)) // If all indices are configured to be gathered, bucket them all together. if len(e.IndicesInclude) == 0 || e.IndicesInclude[0] == "_all" { @@ -768,8 +768,8 @@ func (e *Elasticsearch) gatherJSONData(url string, v interface{}) error { } func (e *Elasticsearch) compileIndexMatchers() (map[string]filter.Filter, error) { - indexMatchers := map[string]filter.Filter{} var err error + indexMatchers := make(map[string]filter.Filter, len(e.IndicesInclude)) // Compile each configured index into a glob matcher. for _, configuredIndex := range e.IndicesInclude { diff --git a/plugins/inputs/elasticsearch_query/aggregation_parser.go b/plugins/inputs/elasticsearch_query/aggregation_parser.go index 8a507bebd3c80..7529defa6be13 100644 --- a/plugins/inputs/elasticsearch_query/aggregation_parser.go +++ b/plugins/inputs/elasticsearch_query/aggregation_parser.go @@ -23,7 +23,7 @@ func parseSimpleResult(acc telegraf.Accumulator, measurement string, searchResul } func parseAggregationResult(acc telegraf.Accumulator, aggregationQueryList []aggregationQueryData, searchResult *elastic5.SearchResult) error { - measurements := map[string]map[string]string{} + measurements := make(map[string]map[string]string, len(aggregationQueryList)) // organize the aggregation query data by measurement for _, aggregationQuery := range aggregationQueryList { diff --git a/plugins/inputs/ethtool/ethtool_linux.go b/plugins/inputs/ethtool/ethtool_linux.go index d506a5a235309..cfee12e883656 100644 --- a/plugins/inputs/ethtool/ethtool_linux.go +++ b/plugins/inputs/ethtool/ethtool_linux.go @@ -289,7 +289,7 @@ func (c *CommandEthtool) Interfaces(includeNamespaces bool) ([]NamespacedInterfa // Handles are only used to create namespaced goroutines. We don't prefill // with the handle for the initial namespace because we've already created // its goroutine in Init(). - handles := map[string]netns.NsHandle{} + handles := make(map[string]netns.NsHandle) if includeNamespaces { namespaces, err := os.ReadDir(namespaceDirectory) diff --git a/plugins/inputs/fibaro/hc2/parser.go b/plugins/inputs/fibaro/hc2/parser.go index 28b002e2db3ea..010c1694a140b 100644 --- a/plugins/inputs/fibaro/hc2/parser.go +++ b/plugins/inputs/fibaro/hc2/parser.go @@ -13,7 +13,7 @@ func Parse(acc telegraf.Accumulator, sectionBytes, roomBytes, deviecsBytes []byt return err } - sections := map[uint16]string{} + sections := make(map[uint16]string, len(tmpSections)) for _, v := range tmpSections { sections[v.ID] = v.Name } @@ -22,7 +22,7 @@ func Parse(acc telegraf.Accumulator, sectionBytes, roomBytes, deviecsBytes []byt if err := json.Unmarshal(roomBytes, &tmpRooms); err != nil { return err } - rooms := map[uint16]LinkRoomsSections{} + rooms := make(map[uint16]LinkRoomsSections, len(tmpRooms)) for _, v := range tmpRooms { rooms[v.ID] = LinkRoomsSections{Name: v.Name, SectionID: v.SectionID} } diff --git a/plugins/inputs/hugepages/hugepages.go b/plugins/inputs/hugepages/hugepages.go index 926f10540e9c1..42f32576c274d 100644 --- a/plugins/inputs/hugepages/hugepages.go +++ b/plugins/inputs/hugepages/hugepages.go @@ -240,7 +240,7 @@ func (h *Hugepages) gatherStatsFromMeminfo(acc telegraf.Accumulator) error { metrics[metricName] = fieldValue } - acc.AddFields("hugepages_"+meminfoHugepages, metrics, map[string]string{}) + acc.AddFields("hugepages_"+meminfoHugepages, metrics, make(map[string]string)) return nil } diff --git a/plugins/inputs/intel_rdt/intel_rdt.go b/plugins/inputs/intel_rdt/intel_rdt.go index 7f4040dbb0d2d..838e62b460dd5 100644 --- a/plugins/inputs/intel_rdt/intel_rdt.go +++ b/plugins/inputs/intel_rdt/intel_rdt.go @@ -202,12 +202,12 @@ func (r *IntelRDT) checkPIDsAssociation(ctx context.Context) error { } func (r *IntelRDT) associateProcessesWithPIDs(providedProcesses []string) (map[string]string, error) { - mapProcessPIDs := map[string]string{} - availableProcesses, err := r.Processor.getAllProcesses() if err != nil { return nil, errors.New("cannot gather information of all available processes") } + + mapProcessPIDs := make(map[string]string, len(availableProcesses)) for _, availableProcess := range availableProcesses { if choice.Contains(availableProcess.Name, providedProcesses) { pid := availableProcess.PID diff --git a/plugins/inputs/intel_rdt/publisher.go b/plugins/inputs/intel_rdt/publisher.go index 0f33b2a53f2b3..feee61bae2cb1 100644 --- a/plugins/inputs/intel_rdt/publisher.go +++ b/plugins/inputs/intel_rdt/publisher.go @@ -112,8 +112,8 @@ func (p *Publisher) addToAccumulatorCores(measurement parsedCoresMeasurement) { continue } } - tags := map[string]string{} - fields := make(map[string]interface{}) + tags := make(map[string]string, 2) + fields := make(map[string]interface{}, 1) tags["cores"] = measurement.cores tags["name"] = pqosMetricOrder[i] @@ -163,8 +163,8 @@ func (p *Publisher) addToAccumulatorProcesses(measurement parsedProcessMeasureme continue } } - tags := map[string]string{} - fields := make(map[string]interface{}) + tags := make(map[string]string, 3) + fields := make(map[string]interface{}, 1) tags["process"] = measurement.process tags["cores"] = measurement.cores diff --git a/plugins/inputs/internal/internal.go b/plugins/inputs/internal/internal.go index 160a79d2acf88..71990b3dfda4f 100644 --- a/plugins/inputs/internal/internal.go +++ b/plugins/inputs/internal/internal.go @@ -66,7 +66,7 @@ func collectMemStat(acc telegraf.Accumulator) { "heap_objects": m.HeapObjects, // total number of allocated objects "num_gc": m.NumGC, } - acc.AddFields("internal_memstats", fields, map[string]string{}) + acc.AddFields("internal_memstats", fields, make(map[string]string)) } func collectGoStat(acc telegraf.Accumulator) { @@ -77,7 +77,7 @@ func collectGoStat(acc telegraf.Accumulator) { } metrics.Read(samples) - fields := map[string]any{} + fields := make(map[string]any, len(samples)) for _, sample := range samples { name := sanitizeName(sample.Name) diff --git a/plugins/inputs/jenkins/jenkins.go b/plugins/inputs/jenkins/jenkins.go index dfaa7f43f8002..62bd2ec9c3de8 100644 --- a/plugins/inputs/jenkins/jenkins.go +++ b/plugins/inputs/jenkins/jenkins.go @@ -146,12 +146,11 @@ func (j *Jenkins) initialize(client *http.Client) error { } func (j *Jenkins) gatherNodeData(n node, acc telegraf.Accumulator) error { - tags := map[string]string{} if n.DisplayName == "" { return errors.New("error empty node name") } - tags["node_name"] = n.DisplayName + tags := map[string]string{"node_name": n.DisplayName} // filter out excluded or not included node_name if !j.nodeFilter.Match(tags["node_name"]) { diff --git a/plugins/inputs/kernel/kernel.go b/plugins/inputs/kernel/kernel.go index 58e3af0448704..4b2c850661f65 100644 --- a/plugins/inputs/kernel/kernel.go +++ b/plugins/inputs/kernel/kernel.go @@ -155,7 +155,7 @@ func (k *Kernel) Gather(acc telegraf.Accumulator) error { fields["ksm_"+f] = m } } - acc.AddCounter("kernel", fields, map[string]string{}) + acc.AddCounter("kernel", fields, make(map[string]string)) if k.optCollect["psi"] { if err := k.gatherPressure(acc); err != nil { diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat.go b/plugins/inputs/kernel_vmstat/kernel_vmstat.go index 464b2c55f278c..a3f64b5e99f92 100644 --- a/plugins/inputs/kernel_vmstat/kernel_vmstat.go +++ b/plugins/inputs/kernel_vmstat/kernel_vmstat.go @@ -49,7 +49,7 @@ func (k *KernelVmstat) Gather(acc telegraf.Accumulator) error { } } - acc.AddFields("kernel_vmstat", fields, map[string]string{}) + acc.AddFields("kernel_vmstat", fields, make(map[string]string)) return nil } diff --git a/plugins/inputs/kube_inventory/node.go b/plugins/inputs/kube_inventory/node.go index 2f8dba928ccbe..8aa4e979a65c3 100644 --- a/plugins/inputs/kube_inventory/node.go +++ b/plugins/inputs/kube_inventory/node.go @@ -24,13 +24,13 @@ func collectNodes(ctx context.Context, acc telegraf.Accumulator, ki *KubernetesI func (ki *KubernetesInventory) gatherNodeCount(count int, acc telegraf.Accumulator) { fields := map[string]interface{}{"node_count": count} - tags := map[string]string{} + tags := make(map[string]string) acc.AddFields(nodeMeasurement, fields, tags) } func (ki *KubernetesInventory) gatherNode(n *corev1.Node, acc telegraf.Accumulator) { - fields := map[string]interface{}{} + fields := make(map[string]interface{}, len(n.Status.Capacity)+len(n.Status.Allocatable)+1) tags := map[string]string{ "node_name": n.Name, "cluster_namespace": n.Annotations["cluster.x-k8s.io/cluster-namespace"], @@ -62,7 +62,6 @@ func (ki *KubernetesInventory) gatherNode(n *corev1.Node, acc telegraf.Accumulat } for _, val := range n.Status.Conditions { - conditionfields := map[string]interface{}{} conditiontags := map[string]string{ "status": string(val.Status), "condition": string(val.Type), @@ -83,8 +82,10 @@ func (ki *KubernetesInventory) gatherNode(n *corev1.Node, acc telegraf.Accumulat } running = 2 } - conditionfields["status_condition"] = running - conditionfields["ready"] = nodeready + conditionfields := map[string]interface{}{ + "status_condition": running, + "ready": nodeready, + } acc.AddFields(nodeMeasurement, conditionfields, conditiontags) } diff --git a/plugins/inputs/kube_inventory/pod.go b/plugins/inputs/kube_inventory/pod.go index 10a566ce6d53d..2e73291c6dbf4 100644 --- a/plugins/inputs/kube_inventory/pod.go +++ b/plugins/inputs/kube_inventory/pod.go @@ -35,7 +35,7 @@ func (ki *KubernetesInventory) gatherPod(p *corev1.Pod, acc telegraf.Accumulator return } - containerList := map[string]*corev1.ContainerStatus{} + containerList := make(map[string]*corev1.ContainerStatus, len(p.Status.ContainerStatuses)) for i := range p.Status.ContainerStatuses { containerList[p.Status.ContainerStatuses[i].Name] = &p.Status.ContainerStatuses[i] } @@ -133,7 +133,6 @@ func (ki *KubernetesInventory) gatherPodContainer(p *corev1.Pod, cs corev1.Conta } for _, val := range p.Status.Conditions { - conditionfields := map[string]interface{}{} conditiontags := map[string]string{ "container_name": c.Name, "image": splitImage[0], @@ -159,8 +158,10 @@ func (ki *KubernetesInventory) gatherPodContainer(p *corev1.Pod, cs corev1.Conta } running = 2 } - conditionfields["status_condition"] = running - conditionfields["ready"] = podready + conditionfields := map[string]interface{}{ + "status_condition": running, + "ready": podready, + } acc.AddFields(podContainerMeasurement, conditionfields, conditiontags) } diff --git a/plugins/inputs/kube_inventory/resourcequotas.go b/plugins/inputs/kube_inventory/resourcequotas.go index 015d4dd84edf2..71207c8cbbb5d 100644 --- a/plugins/inputs/kube_inventory/resourcequotas.go +++ b/plugins/inputs/kube_inventory/resourcequotas.go @@ -21,7 +21,7 @@ func collectResourceQuotas(ctx context.Context, acc telegraf.Accumulator, ki *Ku } func (ki *KubernetesInventory) gatherResourceQuota(r corev1.ResourceQuota, acc telegraf.Accumulator) { - fields := map[string]interface{}{} + fields := make(map[string]interface{}, len(r.Status.Hard)+len(r.Status.Used)) tags := map[string]string{ "resource": r.Name, "namespace": r.Namespace, diff --git a/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go b/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go index 5caa5bc491f18..dff49d1c0ebe9 100644 --- a/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go +++ b/plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go @@ -74,7 +74,7 @@ func (*SysctlFS) SampleConfig() string { } func (sfs *SysctlFS) Gather(acc telegraf.Accumulator) error { - fields := map[string]interface{}{} + fields := make(map[string]interface{}) for _, n := range []string{"aio-nr", "aio-max-nr", "dquot-nr", "dquot-max", "super-nr", "super-max"} { if err := sfs.gatherOne(n, fields); err != nil { diff --git a/plugins/inputs/lustre2/lustre2.go b/plugins/inputs/lustre2/lustre2.go index aa6c2ababb022..7f8a582be4d5b 100644 --- a/plugins/inputs/lustre2/lustre2.go +++ b/plugins/inputs/lustre2/lustre2.go @@ -745,7 +745,7 @@ func (l *Lustre2) Gather(acc telegraf.Accumulator) error { } for tgs, fields := range l.allFields { - tags := map[string]string{} + tags := make(map[string]string, 5) if len(tgs.name) > 0 { tags["name"] = tgs.name } diff --git a/plugins/inputs/modbus/configuration.go b/plugins/inputs/modbus/configuration.go index a47af18b5db90..33a3655f50656 100644 --- a/plugins/inputs/modbus/configuration.go +++ b/plugins/inputs/modbus/configuration.go @@ -16,7 +16,7 @@ type Configuration interface { } func removeDuplicates(elements []uint16) []uint16 { - encountered := map[uint16]bool{} + encountered := make(map[uint16]bool, len(elements)) result := []uint16{} for _, addr := range elements { diff --git a/plugins/inputs/modbus/configuration_register.go b/plugins/inputs/modbus/configuration_register.go index 94dc7adcd5f97..91eb9e2e7c6cc 100644 --- a/plugins/inputs/modbus/configuration_register.go +++ b/plugins/inputs/modbus/configuration_register.go @@ -183,7 +183,7 @@ func (c *ConfigurationOriginal) newFieldFromDefinition(def fieldDefinition, type } func (c *ConfigurationOriginal) validateFieldDefinitions(fieldDefs []fieldDefinition, registerType string) error { - nameEncountered := map[string]bool{} + nameEncountered := make(map[string]bool, len(fieldDefs)) for _, item := range fieldDefs { // check empty name if item.Name == "" { diff --git a/plugins/inputs/modbus/configuration_request.go b/plugins/inputs/modbus/configuration_request.go index d266aba37c13c..d443016f27220 100644 --- a/plugins/inputs/modbus/configuration_request.go +++ b/plugins/inputs/modbus/configuration_request.go @@ -212,8 +212,7 @@ func (c *ConfigurationPerRequest) Check() error { } func (c *ConfigurationPerRequest) Process() (map[byte]requestSet, error) { - result := map[byte]requestSet{} - + result := make(map[byte]requestSet, len(c.Requests)) for _, def := range c.Requests { // Set default if def.RegisterType == "" { diff --git a/plugins/inputs/modbus/modbus.go b/plugins/inputs/modbus/modbus.go index 9b230d582f377..69ee6df174d06 100644 --- a/plugins/inputs/modbus/modbus.go +++ b/plugins/inputs/modbus/modbus.go @@ -522,7 +522,7 @@ func (m *Modbus) collectFields(acc telegraf.Accumulator, timestamp time.Time, ta for _, request := range requests { for _, field := range request.fields { // Collect tags from global and per-request - ftags := map[string]string{} + ftags := make(map[string]string, len(tags)+len(field.tags)) for k, v := range tags { ftags[k] = v } diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go index de41b81bac706..f3bd526690680 100644 --- a/plugins/inputs/mongodb/mongostat.go +++ b/plugins/inputs/mongodb/mongostat.go @@ -890,7 +890,7 @@ type topStatLine struct { } func parseLocks(stat serverStatus) map[string]lockUsage { - returnVal := map[string]lockUsage{} + returnVal := make(map[string]lockUsage, len(stat.Locks)) for namespace, lockInfo := range stat.Locks { returnVal[namespace] = lockUsage{ namespace, @@ -1454,7 +1454,7 @@ func NewStatLine(oldMongo, newMongo mongoStatus, key string, all bool, sampleSec returnVal.TotalAvailable = newShardStats.TotalAvailable returnVal.TotalCreated = newShardStats.TotalCreated returnVal.TotalRefreshing = newShardStats.TotalRefreshing - returnVal.ShardHostStatsLines = map[string]shardHostStatLine{} + returnVal.ShardHostStatsLines = make(map[string]shardHostStatLine, len(newShardStats.Hosts)) for host, stats := range newShardStats.Hosts { shardStatLine := &shardHostStatLine{ InUse: stats.InUse, diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go index 914ed01df0982..f1163be42b268 100644 --- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go +++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go @@ -114,7 +114,7 @@ func (m *MQTTConsumer) Init() error { return err } m.opts = opts - m.messages = map[telegraf.TrackingID]mqtt.Message{} + m.messages = make(map[telegraf.TrackingID]mqtt.Message) m.topicParsers = make([]*TopicParser, 0, len(m.TopicParserConfig)) for _, cfg := range m.TopicParserConfig { @@ -125,8 +125,8 @@ func (m *MQTTConsumer) Init() error { m.topicParsers = append(m.topicParsers, p) } - m.payloadSize = selfstat.Register("mqtt_consumer", "payload_size", map[string]string{}) - m.messagesRecv = selfstat.Register("mqtt_consumer", "messages_received", map[string]string{}) + m.payloadSize = selfstat.Register("mqtt_consumer", "payload_size", make(map[string]string)) + m.messagesRecv = selfstat.Register("mqtt_consumer", "messages_received", make(map[string]string)) return nil } func (m *MQTTConsumer) Start(acc telegraf.Accumulator) error { diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go index 7da0255eecb94..3f332f50eb700 100644 --- a/plugins/inputs/mysql/mysql.go +++ b/plugins/inputs/mysql/mysql.go @@ -992,7 +992,7 @@ func (m *Mysql) gatherUserStatisticsStatuses(db *sql.DB, servtag string, acc tel } tags := map[string]string{"server": servtag, "user": *read[0].(*string)} - fields := map[string]interface{}{} + fields := make(map[string]interface{}, len(cols)) for i := range cols { if i == 0 {