Update mdatagen to create factories of init instead of new (open-tele…

…metry#2978) * Update mdatagen to create factories of init instead of new Signed-off-by: Bogdan Drutu <[email protected]> * Revert New deletion, too many tests use that Signed-off-by: Bogdan Drutu <[email protected]>
pjanotti · Apr 21, 2021 · 0694cac · 0694cac
1 parent 8476727
commit 0694cac
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 44 deletions.
diff --git a/cmd/mdatagen/metrics.tmpl b/cmd/mdatagen/metrics.tmpl
@@ -79,10 +79,10 @@ func (m *metricStruct) ByName(n string) MetricIntf {
  return metricsByName[n]
 }
 
-func (m *metricStruct) FactoriesByName() map[string]func() pdata.Metric {
- return map[string]func() pdata.Metric {
+func (m *metricStruct) FactoriesByName() map[string]func(pdata.Metric) {
+ return map[string]func(pdata.Metric) {
  {{- range $name, $metric := .Metrics }}
- Metrics.{{ $name.Render }}.Name(): Metrics.{{ $name.Render }}.New,
+ Metrics.{{ $name.Render }}.Name(): Metrics.{{ $name.Render }}.Init,
  {{- end }}
  }
 }

diff --git a/consumer/simple/metrics.go b/consumer/simple/metrics.go
@@ -55,7 +55,7 @@ type Metrics struct {
  // is intended to be used with the metadata code generation modules but can
  // be used apart from that just as well. The returned metrics are expected
  // to be initialized.
- MetricFactoriesByName map[string]func() pdata.Metric
+ MetricFactoriesByName map[string]func(pdata.Metric)
 
  // If set, this instrumentation library name will be used for all metrics
  // generated by this builder. This is meant to be set once at builder
@@ -209,18 +209,14 @@ func (mb *Metrics) getOrCreateMetric(name string, typ pdata.MetricDataType) pdat
  return metricSlice.At(idx)
  }
 
- var metric pdata.Metric
+ metric := metricSlice.AppendEmpty()
  if fac, ok := mb.MetricFactoriesByName[name]; ok {
- metric = fac()
+ fac(metric)
  } else {
- metric = pdata.NewMetric()
-
  metric.SetName(name)
  metric.SetDataType(typ)
  }
 
- metricSlice.Append(metric)
-
  mb.metricIdxByName[name] = metricSlice.Len() - 1
  return metric
 }

diff --git a/consumer/simple/metrics_test.go b/consumer/simple/metrics_test.go
@@ -292,13 +292,11 @@ func TestMetrics(t *testing.T) {
 func TestMetricFactories(t *testing.T) {
  mb := Metrics{
  Metrics: pdata.NewMetrics(),
- MetricFactoriesByName: map[string]func() pdata.Metric{
- "disk.ops": func() pdata.Metric {
- m := pdata.NewMetric()
+ MetricFactoriesByName: map[string]func(pdata.Metric){
+ "disk.ops": func(m pdata.Metric) {
  m.SetName("disk.ops")
  m.SetDescription("This counts disk operations")
  m.SetDataType(pdata.MetricDataTypeIntSum)
- return m
  },
  },
  InstrumentationLibraryName: "example",

diff --git a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go