Merge branch 'main' into pprofile-build-attributes-helper

Author: dmathieu

.chloggen/codeboten_update-config-dependency.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: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: remove custom code and instead use config package to instantiate meter provider.
+
+# One or more tracking issues or pull requests related to the change
+issues: [11611]
+
+# (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: []

.chloggen/generate-metric-assert-funcs.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: Generate assert function for each metric in mdatagen
+
+# One or more tracking issues or pull requests related to the change
+issues: [12179]
+
+# (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/mx-psi_metricslevel-detailed.yaml

@@ -0,0 +1,26 @@
+# 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. otlpreceiver)
+component: component
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Deprecate `component.TelemetrySettings.MetricsLevel` in favor of using views and 'Enabled' method.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12159]
+
+# (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: |
+  - Components will temporarily need the service to support using views.
+
+# 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/remove-deprecated-checkscrapermetrics.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: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: component/componenttest
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated `CheckScraperMetrics` functions
+
+# One or more tracking issues or pull requests related to the change
+issues: [12183]
+
+# (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/telemetry-async-err-ch.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: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service-telemetry
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: pass the missing async error channel into service telemetry settings
+
+# One or more tracking issues or pull requests related to the change
+issues: [11417]
+
+# (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/internal/samplereceiver/internal/metadatatest/generated_telemetrytest.go

@@ -30,39 +30,22 @@ func TestComponentTelemetry(t *testing.T) {
 	factory := NewFactory()
 	receiver, err := factory.CreateMetrics(context.Background(), tt.NewSettings(), componenttest.NewNopHost(), new(consumertest.MetricsSink))
 	require.NoError(t, err)
-	tt.AssertMetrics(t, []metricdata.Metrics{
-		{
-			Name:        "otelcol_batch_size_trigger_send",
-			Description: "Number of times the batch was sent due to a size trigger [deprecated since v0.110.0]",
-			Unit:        "{times}",
-			Data: metricdata.Sum[int64]{
-				Temporality: metricdata.CumulativeTemporality,
-				IsMonotonic: true,
-				DataPoints: []metricdata.DataPoint[int64]{
-					{
-						Value: 1,
-					},
-				},
+	metadatatest.AssertEqualBatchSizeTriggerSend(t, tt.Telemetry,
+		[]metricdata.DataPoint[int64]{
+			{
+				Value: 1,
 			},
-		},
-		{
-			Name:        "otelcol_process_runtime_total_alloc_bytes",
-			Description: "Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')",
-			Unit:        "By",
-			Data: metricdata.Sum[int64]{
-				Temporality: metricdata.CumulativeTemporality,
-				IsMonotonic: true,
-				DataPoints: []metricdata.DataPoint[int64]{
-					{
-						Value: 2,
-					},
-				},
+		}, metricdatatest.IgnoreTimestamp())
+	metadatatest.AssertEqualProcessRuntimeTotalAllocBytes(t, tt.Telemetry,
+		[]metricdata.DataPoint[int64]{
+			{
+				Value: 2,
 			},
-		},
-	}, metricdatatest.IgnoreTimestamp())
+		}, metricdatatest.IgnoreTimestamp())
 	rcv, ok := receiver.(nopReceiver)
 	require.True(t, ok)
 	rcv.initOptionalMetric()
+	// TODO: this needs to be replaces once the optional metric is supported in AssertMetricEqual functions.
 	tt.AssertMetrics(t, []metricdata.Metrics{
 		{
 			Name:        "otelcol_batch_size_trigger_send",

cmd/mdatagen/internal/samplereceiver/internal/metadatatest/generated_telemetrytest_test.go

@@ -28,7 +28,7 @@ func SetupTelemetry(opts ...componenttest.TelemetryOption) Telemetry {
 	return Telemetry{ Telemetry: componenttest.NewTelemetry(opts...) }
 }
 
-{{- if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
+{{ if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
 func (tt *Telemetry) NewSettings() {{ .Status.Class }}.Settings {
 	set := {{ .Status.Class }}test.NewNopSettings()
 	set.ID = component.NewID(component.MustNewType("{{ .Type }}"))
@@ -42,15 +42,45 @@ func (tt *Telemetry) AssertMetrics(t *testing.T, expected []metricdata.Metrics,
 	require.NoError(t, tt.Reader.Collect(context.Background(), &md))
 	// ensure all required metrics are present
 	for _, want := range expected {
-		got := getMetric(want.Name, md)
+		got := getMetricFromResource(want.Name, md)
 		metricdatatest.AssertEqual(t, want, got, opts...)
 	}
 
 	// ensure no additional metrics are emitted
 	require.Equal(t, len(expected), lenMetrics(md))
 }
 
-func getMetric(name string, got metricdata.ResourceMetrics) metricdata.Metrics {
+{{ range $name, $metric := .Telemetry.Metrics }}
+{{ if not $metric.Optional }}
+func AssertEqual{{ $name.Render }}(t *testing.T, tt componenttest.Telemetry, dps []metricdata.{{- if eq $metric.Data.Type "Histogram" }} {{$metric.Data.Type}} {{- end }}DataPoint[{{ $metric.Data.BasicType }}], opts ...metricdatatest.Option) {
+	want := metricdata.Metrics{
+		Name:        "otelcol_{{ $name }}",
+		Description: "{{ $metric.Description }}{{ $metric.Stability }}",
+		Unit:        "{{ $metric.Unit }}",
+		Data:        metricdata.{{ $metric.Data.Type }}[{{ $metric.Data.BasicType }}]{
+			{{- if $metric.Data.HasAggregated }}
+			Temporality: metricdata.CumulativeTemporality,
+			{{- end }}
+			{{- if $metric.Data.HasMonotonic }}
+			IsMonotonic: {{ $metric.Data.Monotonic }},
+			{{- end }}
+			DataPoints: dps,
+		},
+	}
+	got := getMetric(t, tt, "otelcol_{{ $name }}")
+	metricdatatest.AssertEqual(t, want, got, opts...)
+}
+
+{{- end }}
+{{- end }}
+
+func getMetric(t *testing.T, tt componenttest.Telemetry, name string) metricdata.Metrics {
+	var md metricdata.ResourceMetrics
+	require.NoError(t, tt.Reader.Collect(context.Background(), &md))
+	return getMetricFromResource(name, md)
+}
+
+func getMetricFromResource(name string, got metricdata.ResourceMetrics) metricdata.Metrics {
 	for _, sm := range got.ScopeMetrics {
 		for _, m := range sm.Metrics {
 			if m.Name == name {
@@ -70,4 +100,3 @@ func lenMetrics(got metricdata.ResourceMetrics) int {
 
 	return metricsCount
 }
-

cmd/mdatagen/internal/samplereceiver/metrics_test.go

@@ -67,6 +67,20 @@ func TestSetupTelemetry(t *testing.T) {
         {{- end }}
     {{- end }}
     }, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreValue())
+
+    {{- range $name, $metric := .Telemetry.Metrics }}
+    {{ if not $metric.Optional }}
+    AssertEqual{{ $name.Render }}(t, testTel.Telemetry,
+        {{ if eq $metric.Data.Type "Gauge" -}}
+        []metricdata.DataPoint[{{ $metric.Gauge.MetricValueType.BasicType }}]{{"{{}}"}},
+        {{- else if eq $metric.Data.Type "Sum" -}}
+        []metricdata.DataPoint[{{ $metric.Sum.MetricValueType.BasicType }}]{{"{{}}"}},
+        {{- else if eq $metric.Data.Type "Histogram" -}}
+        []metricdata.HistogramDataPoint[{{ $metric.Histogram.MetricValueType.BasicType }}]{{"{{}}"}},
+        {{- end }}
+        metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreValue())
+    {{- end }}
+    {{- end }}
+
 	require.NoError(t, testTel.Shutdown(context.Background()))
 }
-