Merge branch 'main' into fix/14307-aix-crash

Author: EdgeN8v

.chloggen/add-metrics-scraper.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. receiver/otlp)
+component: pkg/scraperhelper
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Introduce `AddMetricsScraper` to be more explicit than `AddScraper`.
+
+# One or more tracking issues or pull requests related to the change
+issues: [14428]
+
+# (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: [api]

.chloggen/deprecate-add-scraper.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: deprecation
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
+component: pkg/scraperhelper
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Deprecate the `AddScraper` method.
+
+# One or more tracking issues or pull requests related to the change
+issues: [14428]
+
+# (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: [api]

.chloggen/otlpreceiver-profile-metrics.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. receiver/otlp)
+component: receiver/otlp
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add metrics tracking the number of receiver, refused and failed profile samples
+
+# One or more tracking issues or pull requests related to the change
+issues: [14226]
+
+# (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: [api]

.chloggen/receiverhelper-profile-metrics.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. receiver/otlp)
+component: pkg/receiverhelper
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add support for profile samples metrics
+
+# One or more tracking issues or pull requests related to the change
+issues: [14226]
+
+# (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: [api]

.chloggen/validate-entity-stability.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. receiver/otlp)
+component: cmd/mdatagen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Validate stability level for entities
+
+# One or more tracking issues or pull requests related to the change
+issues: [14425]
+
+# (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: []

cmd/mdatagen/go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.8.0 // indirect

cmd/mdatagen/go.sum

@@ -244,6 +244,14 @@ func TestLoadMetadata(t *testing.T) {
 						FullName:         "opt_in_bool_attr",
 						RequirementLevel: AttributeRequirementLevelOptIn,
 					},
+					"required_string_attr": {
+						Description: "A required attribute with a string value",
+						Type: ValueType{
+							ValueType: pcommon.ValueTypeStr,
+						},
+						FullName:         "required_string_attr",
+						RequirementLevel: AttributeRequirementLevelRequired,
+					},
 				},
 				Metrics: map[MetricName]Metric{
 					"default.metric": {
@@ -267,7 +275,7 @@ func TestLoadMetadata(t *testing.T) {
 					"reaggregate.metric": {
 						Signal: Signal{
 							Enabled:     true,
-							Description: "Metric for testing spacial reaggregation",
+							Description: "Metric for testing spatial reaggregation",
 							Stability:   Stability{Level: component.StabilityLevelBeta},
 							Attributes:  []AttributeName{"string_attr", "boolean_attr"},
 						},
@@ -276,6 +284,18 @@ func TestLoadMetadata(t *testing.T) {
 							MetricValueType: MetricValueType{pmetric.NumberDataPointValueTypeDouble},
 						},
 					},
+					"reaggregate.metric.with_required": {
+						Signal: Signal{
+							Enabled:     true,
+							Description: "Metric for testing spatial reaggregation with required attributes",
+							Stability:   Stability{Level: component.StabilityLevelBeta},
+							Attributes:  []AttributeName{"required_string_attr", "string_attr", "boolean_attr"},
+						},
+						Unit: strPtr("1"),
+						Gauge: &Gauge{
+							MetricValueType: MetricValueType{pmetric.NumberDataPointValueTypeDouble},
+						},
+					},
 					"system.cpu.time": {
 						Signal: Signal{
 							Enabled:               true,

cmd/mdatagen/internal/loader_test.go

@@ -11,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 
+	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/filter"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
@@ -628,7 +629,7 @@ type Entity struct {
 	// Brief is a brief description of the entity.
 	Brief string `mapstructure:"brief"`
 	// Stability is the stability level of the entity.
-	Stability string `mapstructure:"stability"`
+	Stability component.StabilityLevel `mapstructure:"stability"`
 	// Identity contains references to resource attributes that uniquely identify the entity.
 	Identity []EntityAttributeRef `mapstructure:"identity"`
 	// Description contains references to resource attributes that describe the entity.

cmd/mdatagen/internal/metadata.go

@@ -140,6 +140,10 @@ func TestValidate(t *testing.T) {
 			name:    "testdata/entity_duplicate_types.yaml",
 			wantErr: `duplicate entity type: host`,
 		},
+		{
+			name:    "testdata/invalid_entity_stability.yaml",
+			wantErr: `unsupported stability level: "stable42"`,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {