perf: remove extra dict wrapper (#2396)

* perf: remove extra dict wrapper

Reduces matrix size and removes unnecessary indirection

cmd/collectors/power.go

@@ -5,7 +5,6 @@ import (
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/cmd/tools/rest"
 	"github.com/netapp/harvest/v2/pkg/conf"
-	"github.com/netapp/harvest/v2/pkg/dict"
 	"github.com/netapp/harvest/v2/pkg/logging"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/util"
@@ -384,7 +383,7 @@ type Sensor struct {
 	data           *matrix.Matrix
 	client         *rest.Client
 	instanceKeys   map[string]string
-	instanceLabels map[string]*dict.Dict
+	instanceLabels map[string]map[string]string
 }
 
 func (my *Sensor) Init() error {
@@ -406,7 +405,7 @@ func (my *Sensor) Init() error {
 
 	my.data = matrix.New(my.Parent+".Sensor", "environment_sensor", "environment_sensor")
 	my.instanceKeys = make(map[string]string)
-	my.instanceLabels = make(map[string]*dict.Dict)
+	my.instanceLabels = make(map[string]map[string]string)
 
 	// init environment metrics in plugin matrix
 	// create environment metric if not exists

cmd/collectors/rest/plugins/netroute/netroute.go

@@ -67,7 +67,7 @@ func (n *NetRoute) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, err
 
 	count := 0
 	for key, instance := range data.GetInstances() {
-		cluster := data.GetGlobalLabels().Get("cluster")
+		cluster := data.GetGlobalLabels()["cluster"]
 		routeID := instance.GetLabel("uuid")
 		interfaceName := instance.GetLabel("interface_name")
 		interfaceAddress := instance.GetLabel("interface_address")

cmd/collectors/rest/plugins/qtree/qtree.go

@@ -9,7 +9,6 @@ import (
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/cmd/tools/rest"
 	"github.com/netapp/harvest/v2/pkg/conf"
-	"github.com/netapp/harvest/v2/pkg/dict"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
@@ -24,7 +23,7 @@ type Qtree struct {
 	*plugin.AbstractPlugin
 	data             *matrix.Matrix
 	instanceKeys     map[string]string
-	instanceLabels   map[string]*dict.Dict
+	instanceLabels   map[string]map[string]string
 	client           *rest.Client
 	query            string
 	quotaType        []string
@@ -44,13 +43,13 @@ func (q *Qtree) Init() error {
 		"space.used.hard_limit_percent => disk_used_pct_disk_limit",
 		"space.used.soft_limit_percent => disk_used_pct_soft_disk_limit",
 		"space.soft_limit => soft_disk_limit",
-		//"disk-used-pct-threshold" # deprecated and workaround to use same as disk_used_pct_soft_disk_limit
+		// "disk-used-pct-threshold" # deprecated and workaround to use same as disk_used_pct_soft_disk_limit
 		"files.hard_limit => file_limit",
 		"files.used.total => files_used",
 		"files.used.hard_limit_percent => files_used_pct_file_limit",
 		"files.used.soft_limit_percent => files_used_pct_soft_file_limit",
 		"files.soft_limit => soft_file_limit",
-		//"threshold",   # deprecated
+		// "threshold",   # deprecated
 	}
 
 	if err = q.InitAbc(); err != nil {
@@ -78,7 +77,7 @@ func (q *Qtree) Init() error {
 
 	q.data = matrix.New(q.Parent+".Qtree", "quota", "quota")
 	q.instanceKeys = make(map[string]string)
-	q.instanceLabels = make(map[string]*dict.Dict)
+	q.instanceLabels = make(map[string]map[string]string)
 	q.historicalLabels = false
 
 	if q.Params.HasChildS("historicalLabels") {
@@ -87,7 +86,7 @@ func (q *Qtree) Init() error {
 
 		// apply all instance keys, instance labels from parent (qtree.yaml) to all quota metrics
 		if exportOption := q.ParentParams.GetChildS("export_options"); exportOption != nil {
-			//parent instancekeys would be added in plugin metrics
+			// parent instancekeys would be added in plugin metrics
 			if parentKeys := exportOption.GetChildS("instance_keys"); parentKeys != nil {
 				for _, parentKey := range parentKeys.GetAllChildContentS() {
 					instanceKeys.NewChildS("", parentKey)
@@ -167,7 +166,7 @@ func (q *Qtree) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error)
 	}
 
 	quotaCount := 0
-	cluster, _ := data.GetGlobalLabels().GetHas("cluster")
+	cluster := data.GetGlobalLabels()["cluster"]
 
 	if q.historicalLabels {
 		// In 22.05, populate metrics with qtree prefix and old labels
@@ -251,7 +250,7 @@ func (q *Qtree) handlingHistoricalMetrics(result []gjson.Result, data *matrix.Ma
 			}
 		}
 
-		//set labels
+		// set labels
 		quotaInstance.SetLabel("type", quotaType)
 		quotaInstance.SetLabel("qtree", tree)
 		quotaInstance.SetLabel("volume", volume)
@@ -320,7 +319,7 @@ func (q *Qtree) handlingQuotaMetrics(result []gjson.Result, cluster string, quot
 				q.Logger.Debug().Msgf("add (%s) instance: %v", attribute, err)
 				return err
 			}
-			//set labels
+			// set labels
 			quotaInstance.SetLabel("type", quotaType)
 			quotaInstance.SetLabel("qtree", tree)
 			quotaInstance.SetLabel("volume", volume)

cmd/collectors/rest/plugins/securityaccount/securityaccount.go

@@ -103,7 +103,7 @@ func (s *SecurityAccount) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matr
 						return nil, err
 					}
 
-					for k, v := range securityAccountInstance.GetLabels().Map() {
+					for k, v := range securityAccountInstance.GetLabels() {
 						securityAccountNewInstance.SetLabel(k, v)
 					}
 					securityAccountNewInstance.SetLabel("applications", application)

cmd/collectors/rest/plugins/snapmirror/snapmirror.go

@@ -91,7 +91,7 @@ func (my *SnapMirror) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix,
 	if my.currentVal >= PluginInvocationRate {
 		my.currentVal = 0
 
-		if cluster, ok := data.GetGlobalLabels().GetHas("cluster"); ok {
+		if cluster, ok := data.GetGlobalLabels()["cluster"]; ok {
 			if err := my.getSVMPeerData(cluster); err != nil {
 				return nil, err
 			}
@@ -135,7 +135,7 @@ func (my *SnapMirror) getSVMPeerData(cluster string) error {
 
 func (my *SnapMirror) updateSMLabels(data *matrix.Matrix) {
 	var keys []string
-	cluster, _ := data.GetGlobalLabels().GetHas("cluster")
+	cluster := data.GetGlobalLabels()["cluster"]
 
 	lastTransferSizeMetric := data.GetMetric("last_transfer_size")
 	lagTimeMetric := data.GetMetric("lag_time")
@@ -204,7 +204,7 @@ func (my *SnapMirror) handleCGRelationships(data *matrix.Matrix, keys []string)
 					continue
 				}
 
-				for k, v := range cgInstance.GetLabels().Map() {
+				for k, v := range cgInstance.GetLabels() {
 					cgVolumeInstance.SetLabel(k, v)
 				}
 				cgVolumeInstance.SetLabel("relationship_id", cgVolumeInstanceKey)

cmd/collectors/rest/plugins/volume/volume.go

@@ -165,7 +165,7 @@ func (my *Volume) handleARWProtection(data *matrix.Matrix) {
 		}
 	}
 
-	arwInstanceKey := data.GetGlobalLabels().Get("cluster") + data.GetGlobalLabels().Get("datacenter")
+	arwInstanceKey := data.GetGlobalLabels()["cluster"] + data.GetGlobalLabels()["datacenter"]
 	if arwInstance, err = my.arw.NewInstance(arwInstanceKey); err != nil {
 		my.Logger.Error().Err(err).Str("arwInstanceKey", arwInstanceKey).Msg("Failed to create arw instance")
 		return

cmd/collectors/rest/plugins/volumeanalytics/volumeanalytics.go

@@ -88,7 +88,7 @@ func (v *VolumeAnalytics) initMatrix() error {
 
 func (v *VolumeAnalytics) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error) {
 	data := dataMap[v.Object]
-	cluster, _ := data.GetGlobalLabels().GetHas("cluster")
+	cluster := data.GetGlobalLabels()["cluster"]
 	clusterVersion := v.client.Cluster().GetVersion()
 	ontapVersion, err := goversion.NewVersion(clusterVersion)
 	if err != nil {
@@ -152,7 +152,7 @@ func (v *VolumeAnalytics) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matr
 				instance.SetLabel("dir_name", name)
 				instance.SetLabel("index", cluster+"_"+strconv.Itoa(index))
 				// copy all labels
-				for k1, v1 := range dataInstance.GetLabels().Map() {
+				for k1, v1 := range dataInstance.GetLabels() {
 					instance.SetLabel(k1, v1)
 				}
 				if bytesUsed != "" {

cmd/collectors/restperf/plugins/disk/disk.go

@@ -4,7 +4,6 @@ import (
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/cmd/tools/rest"
 	"github.com/netapp/harvest/v2/pkg/conf"
-	"github.com/netapp/harvest/v2/pkg/dict"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
@@ -44,7 +43,7 @@ type Disk struct {
 	shelfData      map[string]*matrix.Matrix
 	powerData      map[string]*matrix.Matrix
 	instanceKeys   map[string]string
-	instanceLabels map[string]*dict.Dict
+	instanceLabels map[string]map[string]string
 	client         *rest.Client
 	query          string
 	aggrMap        map[string]*aggregate
@@ -169,7 +168,7 @@ func (d *Disk) Init() error {
 	d.powerData = make(map[string]*matrix.Matrix)
 
 	d.instanceKeys = make(map[string]string)
-	d.instanceLabels = make(map[string]*dict.Dict)
+	d.instanceLabels = make(map[string]map[string]string)
 
 	for attribute, childObj := range shelfMetric {
 
@@ -180,7 +179,7 @@ func (d *Disk) Init() error {
 			objectName = strings.TrimSpace(x[1])
 		}
 
-		d.instanceLabels[attribute] = dict.New()
+		d.instanceLabels[attribute] = make(map[string]string)
 
 		d.shelfData[attribute] = matrix.New(d.Parent+".Shelf", "shelf_"+objectName, "shelf_"+objectName)
 		d.shelfData[attribute].SetGlobalLabel("datacenter", d.ParentParams.GetChildContentS("datacenter"))
@@ -201,11 +200,11 @@ func (d *Disk) Init() error {
 			switch kind {
 			case "key":
 				d.instanceKeys[attribute] = metricName
-				d.instanceLabels[attribute].Set(metricName, display)
+				d.instanceLabels[attribute][metricName] = display
 				instanceKeys.NewChildS("", display)
 				d.Logger.Debug().Msgf("added instance key: (%s) [%s]", attribute, display)
 			case "label":
-				d.instanceLabels[attribute].Set(metricName, display)
+				d.instanceLabels[attribute][metricName] = display
 				instanceLabels.NewChildS("", display)
 				d.Logger.Debug().Msgf("added instance label: (%s) [%s]", attribute, display)
 			case "float":
@@ -305,7 +304,7 @@ func (d *Disk) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error)
 								}
 								d.Logger.Debug().Msgf("add (%s) instance: %s.%s.%s", attribute, shelfSerialNumber, attribute, key)
 
-								for label, labelDisplay := range d.instanceLabels[attribute].Map() {
+								for label, labelDisplay := range d.instanceLabels[attribute] {
 									if value := obj.Get(label); value.Exists() {
 										if value.IsArray() {
 											var labelArray []string
@@ -331,7 +330,7 @@ func (d *Disk) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error)
 								shelfChildInstance.SetLabel("shelf", shelfName)
 
 								// Each child would have different possible values which is an ugly way to write all of them,
-								// so normal value would be mapped to 1 and rest all are mapped to 0.
+								// so normal value would be mapped to 1, and the rest all are mapped to 0.
 								if shelfChildInstance.GetLabel("status") == "normal" {
 									_ = statusMetric.SetValueInt64(shelfChildInstance, 1)
 								} else {

cmd/collectors/restperf/plugins/volume/volume.go

@@ -4,6 +4,7 @@ import (
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/set"
+	"maps"
 	"regexp"
 	"sort"
 	"strings"
@@ -67,7 +68,7 @@ func (v *Volume) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error
 			key := i.GetLabel("svm") + "." + match[1]
 			if cache.GetInstance(key) == nil {
 				fg, _ := cache.NewInstance(key)
-				fg.SetLabels(i.GetLabels().Copy())
+				fg.SetLabels(maps.Clone(i.GetLabels()))
 				fg.SetLabel("volume", match[1])
 				// Flexgroup don't show any aggregate, node
 				fg.SetLabel("aggr", "")
@@ -77,7 +78,7 @@ func (v *Volume) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error
 
 			if volumeAggrmetric.GetInstance(key) == nil {
 				flexgroupInstance, _ := volumeAggrmetric.NewInstance(key)
-				flexgroupInstance.SetLabels(i.GetLabels().Copy())
+				flexgroupInstance.SetLabels(maps.Clone(i.GetLabels()))
 				flexgroupInstance.SetLabel("volume", match[1])
 				// Flexgroup don't show any node
 				flexgroupInstance.SetLabel("node", "")
@@ -98,7 +99,7 @@ func (v *Volume) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error
 				v.Logger.Error().Err(err).Str("key", key).Msg("Failed to create new instance")
 				continue
 			}
-			flexvolInstance.SetLabels(i.GetLabels().Copy())
+			flexvolInstance.SetLabels(maps.Clone(i.GetLabels()))
 			flexvolInstance.SetLabel(style, "flexvol")
 			if err := metric.SetValueFloat64(flexvolInstance, 1); err != nil {
 				v.Logger.Error().Err(err).Str("metric", metricName).Msg("Unable to set value on metric")
@@ -108,7 +109,7 @@ func (v *Volume) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error
 
 	v.Logger.Debug().Int("flexgroup volume count", len(cache.GetInstances())).Msg("")
 
-	//cache.Reset()
+	// cache.Reset()
 
 	// create summary
 	for _, i := range data.GetInstances() {

cmd/collectors/restperf/restperf.go

@@ -16,11 +16,13 @@ import (
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/cmd/tools/rest"
 	"github.com/netapp/harvest/v2/pkg/color"
+	"github.com/netapp/harvest/v2/pkg/dict"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/set"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
 	"github.com/netapp/harvest/v2/pkg/util"
+	"github.com/rs/zerolog"
 	"github.com/tidwall/gjson"
 	"path"
 	"strconv"
@@ -1450,7 +1452,13 @@ func (r *RestPerf) updateQosLabels(qos gjson.Result, instance *matrix.Instance,
 				r.Logger.Trace().Str("label", label).Str("key", key).Msg("Missing label")
 			}
 		}
-		r.Logger.Debug().Str("query", r.Prop.Query).Str("key", key).Str("qos labels", instance.GetLabels().String()).Send()
+		if r.Logger.GetLevel() == zerolog.DebugLevel {
+			r.Logger.Debug().
+				Str("query", r.Prop.Query).
+				Str("key", key).
+				Str("qos labels", dict.String(instance.GetLabels())).
+				Send()
+		}
 	}
 }
 

cmd/collectors/sensor_test.go

@@ -3,7 +3,6 @@ package collectors
 import (
 	"fmt"
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
-	"github.com/netapp/harvest/v2/pkg/dict"
 	"github.com/netapp/harvest/v2/pkg/logging"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/tree"
@@ -94,7 +93,7 @@ func loadTestdata() {
 
 	sensor.data = matrix.New("Sensor", "environment_sensor", "environment_sensor")
 	sensor.instanceKeys = make(map[string]string)
-	sensor.instanceLabels = make(map[string]*dict.Dict)
+	sensor.instanceLabels = make(map[string]map[string]string)
 	sensor.AbstractPlugin.Logger = logging.Get()
 
 	for _, k := range eMetrics {

cmd/collectors/zapi/plugins/qtree/qtree.go

@@ -6,7 +6,6 @@ import (
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/pkg/api/ontapi/zapi"
 	"github.com/netapp/harvest/v2/pkg/conf"
-	"github.com/netapp/harvest/v2/pkg/dict"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
@@ -23,7 +22,7 @@ type Qtree struct {
 	*plugin.AbstractPlugin
 	data             *matrix.Matrix
 	instanceKeys     map[string]string
-	instanceLabels   map[string]*dict.Dict
+	instanceLabels   map[string]map[string]string
 	batchSize        string
 	client           *zapi.Client
 	query            string
@@ -61,7 +60,7 @@ func (q *Qtree) Init() error {
 
 	q.data = matrix.New(q.Parent+".Qtree", "quota", "quota")
 	q.instanceKeys = make(map[string]string)
-	q.instanceLabels = make(map[string]*dict.Dict)
+	q.instanceLabels = make(map[string]map[string]string)
 	q.historicalLabels = false
 
 	if q.Params.HasChildS("historicalLabels") {
@@ -70,7 +69,7 @@ func (q *Qtree) Init() error {
 
 		// apply all instance keys, instance labels from parent (qtree.yaml) to all quota metrics
 		if exportOption := q.ParentParams.GetChildS("export_options"); exportOption != nil {
-			//parent instancekeys would be added in plugin metrics
+			// parent instancekeys would be added in plugin metrics
 			if parentKeys := exportOption.GetChildS("instance_keys"); parentKeys != nil {
 				for _, parentKey := range parentKeys.GetAllChildContentS() {
 					instanceKeys.NewChildS("", parentKey)
@@ -173,7 +172,7 @@ func (q *Qtree) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error)
 		}
 	}
 
-	cluster, _ := data.GetGlobalLabels().GetHas("cluster")
+	cluster := data.GetGlobalLabels()["cluster"]
 
 	for {
 		response, tag, ad, pd, err = q.client.InvokeBatchWithTimers(request, tag)
@@ -291,7 +290,7 @@ func (q *Qtree) handlingHistoricalMetrics(quotas []*node.Node, data *matrix.Matr
 					}
 				}
 
-				//set labels
+				// set labels
 				quotaInstance.SetLabel("type", quotaType)
 				quotaInstance.SetLabel("qtree", tree)
 				quotaInstance.SetLabel("volume", volume)
@@ -385,7 +384,7 @@ func (q *Qtree) handlingQuotaMetrics(quotas []*node.Node, cluster string, quotaI
 					q.Logger.Debug().Msgf("add (%s) instance: %v", attribute, err)
 					return err
 				}
-				//set labels
+				// set labels
 				quotaInstance.SetLabel("type", quotaType)
 				quotaInstance.SetLabel("qtree", tree)
 				quotaInstance.SetLabel("volume", volume)