Generate helper metrics equal functions to simplify asserts

cmd/mdatagen/internal/metric.go

@@ -350,7 +350,7 @@ func (d *Histogram) HasMonotonic() bool {
 }
 
 func (d *Histogram) HasAggregated() bool {
-	return false
+	return true
 }
 
 func (d *Histogram) Instrument() string {

cmd/mdatagen/internal/metric_test.go

@@ -29,7 +29,7 @@ func TestMetricData(t *testing.T) {
 		{&Sum{Async: true}, "Sum", true, true, "ObservableUpDownCounter", true},
 		{&Sum{MetricValueType: MetricValueType{pmetric.NumberDataPointValueTypeInt}, Async: true}, "Sum", true, true, "Int64ObservableUpDownCounter", true},
 		{&Sum{MetricValueType: MetricValueType{pmetric.NumberDataPointValueTypeDouble}, Async: true}, "Sum", true, true, "Float64ObservableUpDownCounter", true},
-		{&Histogram{}, "Histogram", false, false, "Histogram", false},
+		{&Histogram{}, "Histogram", true, false, "Histogram", false},
 	} {
 		assert.Equal(t, arg.wantType, arg.metricData.Type())
 		assert.Equal(t, arg.wantHasAggregated, arg.metricData.HasAggregated())

cmd/mdatagen/internal/templates/telemetrytest.go.tmpl

@@ -28,7 +28,7 @@ func SetupTelemetry() Telemetry {
 	return Telemetry{ Telemetry: componenttest.NewTelemetry() }
 }
 
-{{- 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,43 @@ 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 }}
+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 }}",
+		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 }}
+
+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 {
@@ -69,5 +97,4 @@ func lenMetrics(got metricdata.ResourceMetrics) int {
 	}
 
 	return metricsCount
-}
-
+}