[mdatagen] Re-Aggregate Metric by Attributes

.chloggen/10726-reag.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: 'enhancement'
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: mdatagen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add support for metric re-aggregation by disabling attributes in metadata.yaml and user config"
+
+# One or more tracking issues or pull requests related to the change
+issues: [10726]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

cmd/mdatagen/internal/loader_test.go

@@ -153,6 +153,7 @@ func TestLoadMetadata(t *testing.T) {
 							ValueType: pcommon.ValueTypeStr,
 						},
 						FullName: "enum_attr",
+						Enabled:  true,
 					},
 					"string_attr": {
 						Description:  "Attribute with any string value.",
@@ -161,6 +162,7 @@ func TestLoadMetadata(t *testing.T) {
 							ValueType: pcommon.ValueTypeStr,
 						},
 						FullName: "string_attr",
+						Enabled:  false,
 					},
 					"overridden_int_attr": {
 						Description:  "Integer attribute with overridden name.",
@@ -169,34 +171,39 @@ func TestLoadMetadata(t *testing.T) {
 							ValueType: pcommon.ValueTypeInt,
 						},
 						FullName: "overridden_int_attr",
+						Enabled:  true,
 					},
 					"boolean_attr": {
 						Description: "Attribute with a boolean value.",
 						Type: ValueType{
 							ValueType: pcommon.ValueTypeBool,
 						},
 						FullName: "boolean_attr",
+						Enabled:  true,
 					},
 					"boolean_attr2": {
 						Description: "Another attribute with a boolean value.",
 						Type: ValueType{
 							ValueType: pcommon.ValueTypeBool,
 						},
 						FullName: "boolean_attr2",
+						Enabled:  true,
 					},
 					"slice_attr": {
 						Description: "Attribute with a slice value.",
 						Type: ValueType{
 							ValueType: pcommon.ValueTypeSlice,
 						},
 						FullName: "slice_attr",
+						Enabled:  true,
 					},
 					"map_attr": {
 						Description: "Attribute with a map value.",
 						Type: ValueType{
 							ValueType: pcommon.ValueTypeMap,
 						},
 						FullName: "map_attr",
+						Enabled:  true,
 					},
 					"optional_int_attr": {
 						Description: "An optional attribute with an integer value",
@@ -205,6 +212,7 @@ func TestLoadMetadata(t *testing.T) {
 						},
 						FullName: "optional_int_attr",
 						Optional: true,
+						Enabled:  true,
 					},
 					"optional_string_attr": {
 						Description: "An optional attribute with any string value",
@@ -213,8 +221,10 @@ func TestLoadMetadata(t *testing.T) {
 						},
 						FullName: "optional_string_attr",
 						Optional: true,
+						Enabled:  true,
 					},
 				},
+
 				Metrics: map[MetricName]Metric{
 					"default.metric": {
 						Signal: Signal{
@@ -224,7 +234,8 @@ func TestLoadMetadata(t *testing.T) {
 							Warnings: Warnings{
 								IfEnabledNotSet: "This metric will be disabled by default soon.",
 							},
-							Attributes: []AttributeName{"string_attr", "overridden_int_attr", "enum_attr", "slice_attr", "map_attr", "optional_int_attr", "optional_string_attr"},
+							Attributes:    []AttributeName{"string_attr", "overridden_int_attr", "enum_attr", "slice_attr", "map_attr", "optional_int_attr", "optional_string_attr"},
+							NumAttributes: 7,
 						},
 						Unit: strPtr("s"),
 						Sum: &Sum{
@@ -240,7 +251,8 @@ func TestLoadMetadata(t *testing.T) {
 							Warnings: Warnings{
 								IfConfigured: "This metric is deprecated and will be removed soon.",
 							},
-							Attributes: []AttributeName{"string_attr", "boolean_attr", "boolean_attr2", "optional_string_attr"},
+							Attributes:    []AttributeName{"string_attr", "boolean_attr", "boolean_attr2", "optional_string_attr"},
+							NumAttributes: 4,
 						},
 						Unit: strPtr("1"),
 						Gauge: &Gauge{
@@ -254,7 +266,8 @@ func TestLoadMetadata(t *testing.T) {
 							Warnings: Warnings{
 								IfConfigured: "This metric is deprecated and will be removed soon.",
 							},
-							Attributes: []AttributeName{"string_attr", "boolean_attr"},
+							Attributes:    []AttributeName{"string_attr", "boolean_attr"},
+							NumAttributes: 2,
 						},
 						Unit: strPtr(""),
 						Gauge: &Gauge{
@@ -280,9 +293,10 @@ func TestLoadMetadata(t *testing.T) {
 					},
 					"metric.input_type": {
 						Signal: Signal{
-							Enabled:     true,
-							Description: "Monotonic cumulative sum int metric with string input_type enabled by default.",
-							Attributes:  []AttributeName{"string_attr", "overridden_int_attr", "enum_attr", "slice_attr", "map_attr"},
+							Enabled:       true,
+							Description:   "Monotonic cumulative sum int metric with string input_type enabled by default.",
+							Attributes:    []AttributeName{"string_attr", "overridden_int_attr", "enum_attr", "slice_attr", "map_attr"},
+							NumAttributes: 5,
 						},
 						Unit: strPtr("s"),
 						Sum: &Sum{
@@ -454,7 +468,7 @@ func TestLoadMetadata(t *testing.T) {
 		{
 			name:    "testdata/invalid_type_rattr.yaml",
 			want:    Metadata{},
-			wantErr: "decoding failed due to the following error(s):\n\n'resource_attributes[string.resource.attr].type' invalid type: \"invalidtype\"",
+			wantErr: "decoding failed due to the following error(s):\n\n'type' invalid type: \"invalidtype\"",
 		},
 		{
 			name:    "testdata/no_enabled.yaml",
@@ -484,7 +498,7 @@ func TestLoadMetadata(t *testing.T) {
 		{
 			name:    "testdata/invalid_type_attr.yaml",
 			want:    Metadata{},
-			wantErr: "decoding failed due to the following error(s):\n\n'attributes[used_attr].type' invalid type: \"invalidtype\"",
+			wantErr: "decoding failed due to the following error(s):\n\n'type' invalid type: \"invalidtype\"",
 		},
 		{
 			name:    "testdata/~~this file doesn't exist~~.yaml",

cmd/mdatagen/internal/metadata.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 
+	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/filter"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
@@ -310,6 +311,20 @@ type Attribute struct {
 	Optional bool `mapstructure:"optional"`
 }
 
+func (a *Attribute) Unmarshal(parser *confmap.Conf) error {
+	err := parser.Unmarshal(a)
+	if err != nil {
+		return err
+	}
+
+	// default enabled to true
+	if !parser.IsSet("enabled") {
+		a.Enabled = true
+	}
+
+	return nil
+}
+
 // Name returns actual name of the attribute that is set on the metric after applying NameOverride.
 func (a Attribute) Name() AttributeName {
 	if a.NameOverride != "" {
@@ -343,6 +358,32 @@ func (a Attribute) TestValue() string {
 	return ""
 }
 
+func (a Attribute) TestValueTwo() string {
+	if len(a.Enum) > 2 {
+		fmt.Printf("second %q", a.Enum[1])
+		return fmt.Sprintf(`%q`, a.Enum[1])
+	}
+	switch a.Type.ValueType {
+	case pcommon.ValueTypeEmpty:
+		return ""
+	case pcommon.ValueTypeStr:
+		return fmt.Sprintf(`"%s-val-2"`, a.FullName)
+	case pcommon.ValueTypeInt:
+		return strconv.Itoa(len(a.FullName) + 1)
+	case pcommon.ValueTypeDouble:
+		return fmt.Sprintf("%f", 1.1+float64(len(a.FullName)))
+	case pcommon.ValueTypeBool:
+		return strconv.FormatBool(len(a.FullName)%2 == 1)
+	case pcommon.ValueTypeMap:
+		return fmt.Sprintf(`map[string]any{"key3": "%s-val3", "key4": "%s-val4"}`, a.FullName, a.FullName)
+	case pcommon.ValueTypeSlice:
+		return fmt.Sprintf(`[]any{"%s-item3", "%s-item4"}`, a.FullName, a.FullName)
+	case pcommon.ValueTypeBytes:
+		return fmt.Sprintf(`[]byte("%s-val-2")`, a.FullName)
+	}
+	return ""
+}
+
 type Signal struct {
 	// Enabled defines whether the signal is enabled by default.
 	Enabled bool `mapstructure:"enabled"`
@@ -361,6 +402,9 @@ type Signal struct {
 
 	// Attributes is the list of attributes that the signal emits.
 	Attributes []AttributeName `mapstructure:"attributes"`
+
+	// NumAttributes is the length of the attribtues field.
+	NumAttributes int
 }
 
 func (s Signal) HasOptionalAttribute(attrs map[AttributeName]Attribute) bool {

cmd/mdatagen/internal/metric.go

@@ -91,7 +91,15 @@ func (m *Metric) Unmarshal(parser *confmap.Conf) error {
 	if !parser.IsSet("enabled") {
 		return errors.New("missing required field: `enabled`")
 	}
-	return parser.Unmarshal(m)
+
+	err := parser.Unmarshal(m)
+	if err != nil {
+		return err
+	}
+
+	m.NumAttributes = len(m.Attributes)
+
+	return nil
 }
 
 func (m Metric) Data() MetricData {