Adds alias for nested lists

Author: an-mmx

receiver/azuremonitorreceiver/config.go

@@ -228,31 +228,33 @@ var (
 	}
 )
 
+type NestedListAlias = map[string]map[string][]string
+
 type DimensionsConfig struct {
-	Enabled   *bool                          `mapstructure:"enabled"`
-	Overrides map[string]map[string][]string `mapstructure:"overrides"`
+	Enabled   *bool           `mapstructure:"enabled"`
+	Overrides NestedListAlias `mapstructure:"overrides"`
 }
 
 // Config defines the configuration for the various elements of the receiver agent.
 type Config struct {
 	scraperhelper.ControllerConfig    `mapstructure:",squash"`
-	MetricsBuilderConfig              metadata.MetricsBuilderConfig  `mapstructure:",squash"`
-	Cloud                             string                         `mapstructure:"cloud"`
-	SubscriptionID                    string                         `mapstructure:"subscription_id"`
-	Authentication                    string                         `mapstructure:"auth"`
-	TenantID                          string                         `mapstructure:"tenant_id"`
-	ClientID                          string                         `mapstructure:"client_id"`
-	ClientSecret                      string                         `mapstructure:"client_secret"`
-	FederatedTokenFile                string                         `mapstructure:"federated_token_file"`
-	ResourceGroups                    []string                       `mapstructure:"resource_groups"`
-	Services                          []string                       `mapstructure:"services"`
-	Metrics                           map[string]map[string][]string `mapstructure:"metrics"`
-	CacheResources                    float64                        `mapstructure:"cache_resources"`
-	CacheResourcesDefinitions         float64                        `mapstructure:"cache_resources_definitions"`
-	MaximumNumberOfMetricsInACall     int                            `mapstructure:"maximum_number_of_metrics_in_a_call"`
-	MaximumNumberOfRecordsPerResource int32                          `mapstructure:"maximum_number_of_records_per_resource"`
-	AppendTagsAsAttributes            bool                           `mapstructure:"append_tags_as_attributes"`
-	Dimensions                        DimensionsConfig               `mapstructure:"dimensions"`
+	MetricsBuilderConfig              metadata.MetricsBuilderConfig `mapstructure:",squash"`
+	Cloud                             string                        `mapstructure:"cloud"`
+	SubscriptionID                    string                        `mapstructure:"subscription_id"`
+	Authentication                    string                        `mapstructure:"auth"`
+	TenantID                          string                        `mapstructure:"tenant_id"`
+	ClientID                          string                        `mapstructure:"client_id"`
+	ClientSecret                      string                        `mapstructure:"client_secret"`
+	FederatedTokenFile                string                        `mapstructure:"federated_token_file"`
+	ResourceGroups                    []string                      `mapstructure:"resource_groups"`
+	Services                          []string                      `mapstructure:"services"`
+	Metrics                           NestedListAlias               `mapstructure:"metrics"`
+	CacheResources                    float64                       `mapstructure:"cache_resources"`
+	CacheResourcesDefinitions         float64                       `mapstructure:"cache_resources_definitions"`
+	MaximumNumberOfMetricsInACall     int                           `mapstructure:"maximum_number_of_metrics_in_a_call"`
+	MaximumNumberOfRecordsPerResource int32                         `mapstructure:"maximum_number_of_records_per_resource"`
+	AppendTagsAsAttributes            bool                          `mapstructure:"append_tags_as_attributes"`
+	Dimensions                        DimensionsConfig              `mapstructure:"dimensions"`
 }
 
 const (

receiver/azuremonitorreceiver/dimension_test.go

@@ -65,7 +65,7 @@ func TestFilterDimensions(t *testing.T) {
 				},
 				cfg: DimensionsConfig{
 					Enabled: to.Ptr(true),
-					Overrides: map[string]map[string][]string{
+					Overrides: NestedListAlias{
 						"rt1": {
 							"m1": {
 								"foo",

receiver/azuremonitorreceiver/scraper.go

@@ -452,7 +452,7 @@ func getResourceMetricsValuesRequestOptions(
 	metrics []string,
 	dimensionsStr string,
 	timeGrain string,
-	aggregations string,
+	aggregationsStr string,
 	start int,
 	end int,
 	top int32,
@@ -461,7 +461,7 @@ func getResourceMetricsValuesRequestOptions(
 		Metricnames: to.Ptr(strings.Join(metrics[start:end], ",")),
 		Interval:    to.Ptr(timeGrain),
 		Timespan:    to.Ptr(timeGrain),
-		Aggregation: to.Ptr(aggregations),
+		Aggregation: to.Ptr(aggregationsStr),
 		Top:         to.Ptr(top),
 		Filter:      buildDimensionsFilter(dimensionsStr),
 	}
@@ -503,7 +503,7 @@ func (s *azureScraper) processTimeseriesData(
 	}
 }
 
-func getMetricAggregations(metricNamespace, metricName string, filters map[string]map[string][]string) []string {
+func getMetricAggregations(metricNamespace, metricName string, filters NestedListAlias) []string {
 	// default behavior when no metric filters specified: pass all metrics with all aggregations
 	if len(filters) == 0 {
 		return aggregations

receiver/azuremonitorreceiver/scraper_test.go

@@ -346,7 +346,7 @@ func TestAzureScraperScrape(t *testing.T) {
 
 	cfgLimitedMertics := createDefaultConfig().(*Config)
 	cfgLimitedMertics.MaximumNumberOfMetricsInACall = 2
-	cfgLimitedMertics.Metrics = map[string]map[string][]string{
+	cfgLimitedMertics.Metrics = NestedListAlias{
 		"namespace1": {
 			"metric1": {"*"},
 			"metric3": {"total"},
@@ -768,24 +768,24 @@ func TestGetMetricAggregations(t *testing.T) {
 	testMetricName := "MetricName"
 	tests := []struct {
 		name    string
-		filters map[string]map[string][]string
+		filters NestedListAlias
 		want    []string
 	}{
 		{
 			"should return all aggregations when metrics filter empty",
-			map[string]map[string][]string{},
+			NestedListAlias{},
 			aggregations,
 		},
 		{
 			"should return all aggregations when namespace not in filters",
-			map[string]map[string][]string{
+			NestedListAlias{
 				"another.namespace": nil,
 			},
 			aggregations,
 		},
 		{
 			"should return all aggregations when metric in filters",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					testMetricName: {},
 				},
@@ -794,7 +794,7 @@ func TestGetMetricAggregations(t *testing.T) {
 		},
 		{
 			"should return all aggregations ignoring metric name case",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					strings.ToLower(testMetricName): {},
 				},
@@ -803,7 +803,7 @@ func TestGetMetricAggregations(t *testing.T) {
 		},
 		{
 			"should return all aggregations when asterisk in filters",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					testMetricName: {filterAllAggregations},
 				},
@@ -812,7 +812,7 @@ func TestGetMetricAggregations(t *testing.T) {
 		},
 		{
 			"should be empty when metric not in filters",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					"not_this_metric": {},
 				},
@@ -821,7 +821,7 @@ func TestGetMetricAggregations(t *testing.T) {
 		},
 		{
 			"should return one aggregations",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					testMetricName: {aggregations[0]},
 				},
@@ -830,7 +830,7 @@ func TestGetMetricAggregations(t *testing.T) {
 		},
 		{
 			"should return one aggregations ignoring aggregation case",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					testMetricName: {strings.ToLower(aggregations[0])},
 				},
@@ -839,7 +839,7 @@ func TestGetMetricAggregations(t *testing.T) {
 		},
 		{
 			"should return many aggregations",
-			map[string]map[string][]string{
+			NestedListAlias{
 				testNamespaceName: {
 					testMetricName: {aggregations[0], aggregations[2]},
 				},