diff --git a/CHANGELOG.md b/CHANGELOG.md index bf90f441642..c9f258e43c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## 🛑 Breaking changes 🛑 - Rename `pdata.DoubleSum` to `pdata.Sum` (#3583) +- Rename `pdata.DoubleGauge` to `pdata.Gauge` (#3599) ## 🧰 Bug fixes 🧰 diff --git a/cmd/mdatagen/metricdata.go b/cmd/mdatagen/metricdata.go index 0c2aea30fe3..d4a91c6eb2b 100644 --- a/cmd/mdatagen/metricdata.go +++ b/cmd/mdatagen/metricdata.go @@ -22,7 +22,7 @@ var ( _ MetricData = &intGauge{} _ MetricData = &intSum{} _ MetricData = &intHistogram{} - _ MetricData = &doubleGauge{} + _ MetricData = &gauge{} _ MetricData = &sum{} _ MetricData = &histogram{} ) @@ -50,8 +50,8 @@ func (e *ymlMetricData) UnmarshalYAML(unmarshal func(interface{}) error) error { md = &intSum{} case "int histogram": md = &intHistogram{} - case "double gauge": - md = &doubleGauge{} + case "gauge": + md = &gauge{} case "sum": md = &sum{} case "histogram": @@ -116,18 +116,18 @@ func (i intGauge) HasAggregated() bool { return false } -type doubleGauge struct { +type gauge struct { } -func (d doubleGauge) Type() string { - return "DoubleGauge" +func (d gauge) Type() string { + return "Gauge" } -func (d doubleGauge) HasMonotonic() bool { +func (d gauge) HasMonotonic() bool { return false } -func (d doubleGauge) HasAggregated() bool { +func (d gauge) HasAggregated() bool { return false } diff --git a/cmd/mdatagen/metricdata_test.go b/cmd/mdatagen/metricdata_test.go index df13df2d20a..a96ceb8c31a 100644 --- a/cmd/mdatagen/metricdata_test.go +++ b/cmd/mdatagen/metricdata_test.go @@ -30,7 +30,7 @@ func TestMetricData(t *testing.T) { {&intGauge{}, "IntGauge", false, false}, {&intSum{}, "IntSum", true, true}, {&intHistogram{}, "IntHistogram", true, false}, - {&doubleGauge{}, "DoubleGauge", false, false}, + {&gauge{}, "Gauge", false, false}, {&sum{}, "Sum", true, true}, {&histogram{}, "Histogram", true, false}, } { diff --git a/cmd/pdatagen/internal/metrics_structs.go b/cmd/pdatagen/internal/metrics_structs.go index 5b61cf06a7b..ffa923bcfbc 100644 --- a/cmd/pdatagen/internal/metrics_structs.go +++ b/cmd/pdatagen/internal/metrics_structs.go @@ -141,8 +141,8 @@ var intGauge = &messageValueStruct{ } var doubleGauge = &messageValueStruct{ - structName: "DoubleGauge", - description: "// DoubleGauge represents the type of a double scalar metric that always exports the \"current value\" for every data point.", + structName: "Gauge", + description: "// Gauge represents the type of a double scalar metric that always exports the \"current value\" for every data point.", originFullName: "otlpmetrics.Gauge", fields: []baseField{ &sliceField{ diff --git a/docs/metric-metadata.yaml b/docs/metric-metadata.yaml index da71fd390bb..e68242a8907 100644 --- a/docs/metric-metadata.yaml +++ b/docs/metric-metadata.yaml @@ -23,7 +23,7 @@ metrics: unit: # Required data: - # Required: one of int gauge, int sum, int histogram, double gauge, sum, or histogram. + # Required: one of int gauge, int sum, int histogram, gauge, sum, or histogram. type: # Required for int sum and sum. monotonic: # true | false diff --git a/exporter/exporterhelper/resource_to_label.go b/exporter/exporterhelper/resource_to_label.go index 751c909a4d2..f539188515b 100644 --- a/exporter/exporterhelper/resource_to_label.go +++ b/exporter/exporterhelper/resource_to_label.go @@ -73,8 +73,8 @@ func addLabelsToMetric(metric *pdata.Metric, labelMap pdata.StringMap) { switch metric.DataType() { case pdata.MetricDataTypeIntGauge: addLabelsToIntDataPoints(metric.IntGauge().DataPoints(), labelMap) - case pdata.MetricDataTypeDoubleGauge: - addLabelsToDoubleDataPoints(metric.DoubleGauge().DataPoints(), labelMap) + case pdata.MetricDataTypeGauge: + addLabelsToDoubleDataPoints(metric.Gauge().DataPoints(), labelMap) case pdata.MetricDataTypeIntSum: addLabelsToIntDataPoints(metric.IntSum().DataPoints(), labelMap) case pdata.MetricDataTypeSum: diff --git a/exporter/exporterhelper/resource_to_label_test.go b/exporter/exporterhelper/resource_to_label_test.go index 6ad7a216faf..68753f4f22b 100644 --- a/exporter/exporterhelper/resource_to_label_test.go +++ b/exporter/exporterhelper/resource_to_label_test.go @@ -46,7 +46,7 @@ func TestConvertResourceToLabelsAllDataTypesEmptyDataPoint(t *testing.T) { // Before converting resource to labels assert.Equal(t, 1, md.ResourceMetrics().At(0).Resource().Attributes().Len()) - assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleGauge().DataPoints().At(0).LabelsMap().Len()) + assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Gauge().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(1).IntGauge().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2).Sum().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3).IntSum().DataPoints().At(0).LabelsMap().Len()) @@ -57,7 +57,7 @@ func TestConvertResourceToLabelsAllDataTypesEmptyDataPoint(t *testing.T) { // After converting resource to labels assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).Resource().Attributes().Len()) - assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleGauge().DataPoints().At(0).LabelsMap().Len()) + assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Gauge().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(1).IntGauge().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2).Sum().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3).IntSum().DataPoints().At(0).LabelsMap().Len()) @@ -65,7 +65,7 @@ func TestConvertResourceToLabelsAllDataTypesEmptyDataPoint(t *testing.T) { assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(5).IntHistogram().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 1, md.ResourceMetrics().At(0).Resource().Attributes().Len()) - assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleGauge().DataPoints().At(0).LabelsMap().Len()) + assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Gauge().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(1).IntGauge().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2).Sum().DataPoints().At(0).LabelsMap().Len()) assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3).IntSum().DataPoints().At(0).LabelsMap().Len()) diff --git a/exporter/prometheusexporter/accumulator.go b/exporter/prometheusexporter/accumulator.go index 435c21f51e6..f3a509e5ace 100644 --- a/exporter/prometheusexporter/accumulator.go +++ b/exporter/prometheusexporter/accumulator.go @@ -86,7 +86,7 @@ func (a *lastValueAccumulator) addMetric(metric pdata.Metric, il pdata.Instrumen return a.accumulateIntGauge(metric, il, now) case pdata.MetricDataTypeIntSum: return a.accumulateIntSum(metric, il, now) - case pdata.MetricDataTypeDoubleGauge: + case pdata.MetricDataTypeGauge: return a.accumulateDoubleGauge(metric, il, now) case pdata.MetricDataTypeSum: return a.accumulateSum(metric, il, now) @@ -162,7 +162,7 @@ func (a *lastValueAccumulator) accumulateIntGauge(metric pdata.Metric, il pdata. } func (a *lastValueAccumulator) accumulateDoubleGauge(metric pdata.Metric, il pdata.InstrumentationLibrary, now time.Time) (n int) { - dps := metric.DoubleGauge().DataPoints() + dps := metric.Gauge().DataPoints() for i := 0; i < dps.Len(); i++ { ip := dps.At(i) @@ -171,20 +171,20 @@ func (a *lastValueAccumulator) accumulateDoubleGauge(metric pdata.Metric, il pda v, ok := a.registeredMetrics.Load(signature) if !ok { m := createMetric(metric) - ip.CopyTo(m.DoubleGauge().DataPoints().AppendEmpty()) + ip.CopyTo(m.Gauge().DataPoints().AppendEmpty()) a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now}) n++ continue } mv := v.(*accumulatedValue) - if ip.Timestamp().AsTime().Before(mv.value.DoubleGauge().DataPoints().At(0).Timestamp().AsTime()) { + if ip.Timestamp().AsTime().Before(mv.value.Gauge().DataPoints().At(0).Timestamp().AsTime()) { // only keep datapoint with latest timestamp continue } m := createMetric(metric) - ip.CopyTo(m.DoubleGauge().DataPoints().AppendEmpty()) + ip.CopyTo(m.Gauge().DataPoints().AppendEmpty()) a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now}) n++ } diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go index 18ae758721a..0281b9b5bd1 100644 --- a/exporter/prometheusexporter/accumulator_test.go +++ b/exporter/prometheusexporter/accumulator_test.go @@ -138,13 +138,13 @@ func TestAccumulateMetrics(t *testing.T) { }, }, { - name: "DoubleGauge", + name: "Gauge", metric: func(ts time.Time, v float64, metrics pdata.MetricSlice) { metric := metrics.AppendEmpty() metric.SetName("test_metric") - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) + metric.SetDataType(pdata.MetricDataTypeGauge) metric.SetDescription("test description") - dp := metric.DoubleGauge().DataPoints().AppendEmpty() + dp := metric.Gauge().DataPoints().AppendEmpty() dp.SetValue(v) dp.LabelsMap().Insert("label_1", "1") dp.LabelsMap().Insert("label_2", "2") @@ -339,10 +339,10 @@ func getMerticProperties(metric pdata.Metric) ( value = float64(metric.IntSum().DataPoints().At(0).Value()) temporality = metric.IntSum().AggregationTemporality() isMonotonic = metric.IntSum().IsMonotonic() - case pdata.MetricDataTypeDoubleGauge: - labels = metric.DoubleGauge().DataPoints().At(0).LabelsMap() - ts = metric.DoubleGauge().DataPoints().At(0).Timestamp().AsTime() - value = metric.DoubleGauge().DataPoints().At(0).Value() + case pdata.MetricDataTypeGauge: + labels = metric.Gauge().DataPoints().At(0).LabelsMap() + ts = metric.Gauge().DataPoints().At(0).Timestamp().AsTime() + value = metric.Gauge().DataPoints().At(0).Value() temporality = pdata.AggregationTemporalityUnspecified isMonotonic = false case pdata.MetricDataTypeSum: diff --git a/exporter/prometheusexporter/collector.go b/exporter/prometheusexporter/collector.go index e2a7438a850..572de9ae129 100644 --- a/exporter/prometheusexporter/collector.go +++ b/exporter/prometheusexporter/collector.go @@ -62,7 +62,7 @@ func (c *collector) convertMetric(metric pdata.Metric) (prometheus.Metric, error return c.convertIntGauge(metric) case pdata.MetricDataTypeIntSum: return c.convertIntSum(metric) - case pdata.MetricDataTypeDoubleGauge: + case pdata.MetricDataTypeGauge: return c.convertDoubleGauge(metric) case pdata.MetricDataTypeSum: return c.convertSum(metric) @@ -118,7 +118,7 @@ func (c *collector) convertIntGauge(metric pdata.Metric) (prometheus.Metric, err } func (c *collector) convertDoubleGauge(metric pdata.Metric) (prometheus.Metric, error) { - ip := metric.DoubleGauge().DataPoints().At(0) + ip := metric.Gauge().DataPoints().At(0) desc, labels := c.getMetricMetadata(metric, ip.LabelsMap()) m, err := prometheus.NewConstMetric(desc, prometheus.GaugeValue, ip.Value(), labels...) diff --git a/exporter/prometheusexporter/collector_test.go b/exporter/prometheusexporter/collector_test.go index 7110789be62..997729c3ece 100644 --- a/exporter/prometheusexporter/collector_test.go +++ b/exporter/prometheusexporter/collector_test.go @@ -71,7 +71,7 @@ func TestConvertInvalidMetric(t *testing.T) { pdata.MetricDataTypeIntHistogram, pdata.MetricDataTypeSum, pdata.MetricDataTypeIntSum, - pdata.MetricDataTypeDoubleGauge, + pdata.MetricDataTypeGauge, pdata.MetricDataTypeIntGauge, } { metric := pdata.NewMetric() @@ -81,8 +81,8 @@ func TestConvertInvalidMetric(t *testing.T) { metric.IntGauge().DataPoints().AppendEmpty() case pdata.MetricDataTypeIntSum: metric.IntSum().DataPoints().AppendEmpty() - case pdata.MetricDataTypeDoubleGauge: - metric.DoubleGauge().DataPoints().AppendEmpty() + case pdata.MetricDataTypeGauge: + metric.Gauge().DataPoints().AppendEmpty() case pdata.MetricDataTypeSum: metric.Sum().DataPoints().AppendEmpty() case pdata.MetricDataTypeIntHistogram: @@ -187,15 +187,15 @@ func TestCollectMetrics(t *testing.T) { }, }, { - name: "DoubleGauge", + name: "Gauge", metricType: prometheus.GaugeValue, value: 42.42, metric: func(ts time.Time) (metric pdata.Metric) { metric = pdata.NewMetric() metric.SetName("test_metric") - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) + metric.SetDataType(pdata.MetricDataTypeGauge) metric.SetDescription("test description") - dp := metric.DoubleGauge().DataPoints().AppendEmpty() + dp := metric.Gauge().DataPoints().AppendEmpty() dp.SetValue(42.42) dp.LabelsMap().Insert("label_1", "1") dp.LabelsMap().Insert("label_2", "2") diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go index f97f2d22a05..1995ad826ba 100644 --- a/exporter/prometheusremotewriteexporter/exporter.go +++ b/exporter/prometheusremotewriteexporter/exporter.go @@ -130,8 +130,8 @@ func (prwe *PRWExporter) PushMetrics(ctx context.Context, md pdata.Metrics) erro // handle individual metric based on type switch metric.DataType() { - case pdata.MetricDataTypeDoubleGauge: - dataPoints := metric.DoubleGauge().DataPoints() + case pdata.MetricDataTypeGauge: + dataPoints := metric.Gauge().DataPoints() if err := prwe.addDoubleDataPointSlice(dataPoints, tsMap, resource, metric); err != nil { dropped++ errs = append(errs, err) diff --git a/exporter/prometheusremotewriteexporter/helper.go b/exporter/prometheusremotewriteexporter/helper.go index 815bf2618cc..894eb4be864 100644 --- a/exporter/prometheusremotewriteexporter/helper.go +++ b/exporter/prometheusremotewriteexporter/helper.go @@ -51,8 +51,8 @@ func (a ByLabelName) Swap(i, j int) { a[i], a[j] = a[j], a[i] } // matching metric type and field func validateMetrics(metric pdata.Metric) bool { switch metric.DataType() { - case pdata.MetricDataTypeDoubleGauge: - return metric.DoubleGauge().DataPoints().Len() != 0 + case pdata.MetricDataTypeGauge: + return metric.Gauge().DataPoints().Len() != 0 case pdata.MetricDataTypeIntGauge: return metric.IntGauge().DataPoints().Len() != 0 case pdata.MetricDataTypeSum: diff --git a/exporter/prometheusremotewriteexporter/testutil_test.go b/exporter/prometheusremotewriteexporter/testutil_test.go index 6eb17fbf830..a03b9986c9a 100644 --- a/exporter/prometheusremotewriteexporter/testutil_test.go +++ b/exporter/prometheusremotewriteexporter/testutil_test.go @@ -69,7 +69,7 @@ var ( ns1 = "test_ns" twoPointsSameTs = map[string]*prompb.TimeSeries{ - "DoubleGauge" + "-" + label11 + "-" + value11 + "-" + label12 + "-" + value12: getTimeSeries(getPromLabels(label11, value11, label12, value12), + "Gauge" + "-" + label11 + "-" + value11 + "-" + label12 + "-" + value12: getTimeSeries(getPromLabels(label11, value11, label12, value12), getSample(float64(intVal1), msTime1), getSample(float64(intVal2), msTime2)), } @@ -248,15 +248,15 @@ func getIntGaugeMetric(name string, labels pdata.StringMap, value int64, ts uint func getEmptyDoubleGaugeMetric(name string) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) + metric.SetDataType(pdata.MetricDataTypeGauge) return metric } func getDoubleGaugeMetric(name string, labels pdata.StringMap, value float64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) - dp := metric.DoubleGauge().DataPoints().AppendEmpty() + metric.SetDataType(pdata.MetricDataTypeGauge) + dp := metric.Gauge().DataPoints().AppendEmpty() dp.SetValue(value) labels.Range(func(k string, v string) bool { diff --git a/internal/goldendataset/metrics_gen.go b/internal/goldendataset/metrics_gen.go index 1b09a5e600c..79cad539ff6 100644 --- a/internal/goldendataset/metrics_gen.go +++ b/internal/goldendataset/metrics_gen.go @@ -120,9 +120,9 @@ func (g *metricGenerator) populateMetrics(cfg MetricsCfg, ilm pdata.Instrumentat case pdata.MetricDataTypeIntGauge: metric.SetDataType(pdata.MetricDataTypeIntGauge) populateIntPoints(cfg, metric.IntGauge().DataPoints()) - case pdata.MetricDataTypeDoubleGauge: - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) - populateDoublePoints(cfg, metric.DoubleGauge().DataPoints()) + case pdata.MetricDataTypeGauge: + metric.SetDataType(pdata.MetricDataTypeGauge) + populateDoublePoints(cfg, metric.Gauge().DataPoints()) case pdata.MetricDataTypeIntSum: metric.SetDataType(pdata.MetricDataTypeIntSum) sum := metric.IntSum() diff --git a/internal/goldendataset/metrics_gen_test.go b/internal/goldendataset/metrics_gen_test.go index 181189c3257..8c08cd1c4b1 100644 --- a/internal/goldendataset/metrics_gen_test.go +++ b/internal/goldendataset/metrics_gen_test.go @@ -115,10 +115,10 @@ func TestGenDoubleHistogram(t *testing.T) { func TestGenDoubleGauge(t *testing.T) { cfg := DefaultCfg() - cfg.MetricDescriptorType = pdata.MetricDataTypeDoubleGauge + cfg.MetricDescriptorType = pdata.MetricDataTypeGauge md := MetricsFromCfg(cfg) metric := getMetric(md) - pts := metric.DoubleGauge().DataPoints() + pts := metric.Gauge().DataPoints() require.Equal(t, 1, pts.Len()) pt := pts.At(0) require.EqualValues(t, 1, pt.Value()) diff --git a/internal/goldendataset/pict_metrics_gen.go b/internal/goldendataset/pict_metrics_gen.go index fa0c902e210..8c604e15661 100644 --- a/internal/goldendataset/pict_metrics_gen.go +++ b/internal/goldendataset/pict_metrics_gen.go @@ -73,7 +73,7 @@ func pictToCfg(inputs PICTMetricInputs) MetricsCfg { cfg.MetricDescriptorType = pdata.MetricDataTypeIntSum cfg.IsMonotonicSum = false case MetricTypeDoubleGauge: - cfg.MetricDescriptorType = pdata.MetricDataTypeDoubleGauge + cfg.MetricDescriptorType = pdata.MetricDataTypeGauge case MetricTypeMonotonicDoubleSum: cfg.MetricDescriptorType = pdata.MetricDataTypeSum cfg.IsMonotonicSum = true diff --git a/internal/goldendataset/pict_metrics_gen_test.go b/internal/goldendataset/pict_metrics_gen_test.go index 51072765a03..5edc7193540 100644 --- a/internal/goldendataset/pict_metrics_gen_test.go +++ b/internal/goldendataset/pict_metrics_gen_test.go @@ -60,7 +60,7 @@ func TestPICTtoCfg(t *testing.T) { cfg: MetricsCfg{ NumResourceAttrs: 1, NumPtsPerMetric: 1, - MetricDescriptorType: pdata.MetricDataTypeDoubleGauge, + MetricDescriptorType: pdata.MetricDataTypeGauge, NumPtLabels: 1, }, }, diff --git a/internal/otlptext/databuffer.go b/internal/otlptext/databuffer.go index 230e59f8dc3..85bd315910b 100644 --- a/internal/otlptext/databuffer.go +++ b/internal/otlptext/databuffer.go @@ -82,8 +82,8 @@ func (b *dataBuffer) logMetricDataPoints(m pdata.Metric) { return case pdata.MetricDataTypeIntGauge: b.logIntDataPoints(m.IntGauge().DataPoints()) - case pdata.MetricDataTypeDoubleGauge: - b.logDoubleDataPoints(m.DoubleGauge().DataPoints()) + case pdata.MetricDataTypeGauge: + b.logDoubleDataPoints(m.Gauge().DataPoints()) case pdata.MetricDataTypeIntSum: data := m.IntSum() b.logEntry(" -> IsMonotonic: %t", data.IsMonotonic()) diff --git a/internal/processor/filterexpr/matcher.go b/internal/processor/filterexpr/matcher.go index aea027831bb..b40ccc7b480 100644 --- a/internal/processor/filterexpr/matcher.go +++ b/internal/processor/filterexpr/matcher.go @@ -46,8 +46,8 @@ func (m *Matcher) MatchMetric(metric pdata.Metric) (bool, error) { switch metric.DataType() { case pdata.MetricDataTypeIntGauge: return m.matchIntGauge(metricName, metric.IntGauge()) - case pdata.MetricDataTypeDoubleGauge: - return m.matchDoubleGauge(metricName, metric.DoubleGauge()) + case pdata.MetricDataTypeGauge: + return m.matchGauge(metricName, metric.Gauge()) case pdata.MetricDataTypeIntSum: return m.matchIntSum(metricName, metric.IntSum()) case pdata.MetricDataTypeSum: @@ -75,7 +75,7 @@ func (m *Matcher) matchIntGauge(metricName string, gauge pdata.IntGauge) (bool, return false, nil } -func (m *Matcher) matchDoubleGauge(metricName string, gauge pdata.DoubleGauge) (bool, error) { +func (m *Matcher) matchGauge(metricName string, gauge pdata.Gauge) (bool, error) { pts := gauge.DataPoints() for i := 0; i < pts.Len(); i++ { matched, err := m.matchEnv(metricName, pts.At(i).LabelsMap()) diff --git a/internal/processor/filterexpr/matcher_test.go b/internal/processor/filterexpr/matcher_test.go index 82d75a6fc52..cec2de3a271 100644 --- a/internal/processor/filterexpr/matcher_test.go +++ b/internal/processor/filterexpr/matcher_test.go @@ -52,7 +52,7 @@ func TestNilIntGauge(t *testing.T) { } func TestNilDoubleGauge(t *testing.T) { - dataType := pdata.MetricDataTypeDoubleGauge + dataType := pdata.MetricDataTypeGauge testNilValue(t, dataType) } @@ -104,8 +104,8 @@ func TestDoubleGaugeEmptyDataPoint(t *testing.T) { require.NoError(t, err) m := pdata.NewMetric() m.SetName("my.metric") - m.SetDataType(pdata.MetricDataTypeDoubleGauge) - m.DoubleGauge().DataPoints().AppendEmpty() + m.SetDataType(pdata.MetricDataTypeGauge) + m.Gauge().DataPoints().AppendEmpty() matched, err := matcher.MatchMetric(m) assert.NoError(t, err) assert.True(t, matched) @@ -240,8 +240,8 @@ func testMatchDoubleGauge(t *testing.T, metricName string) bool { require.NoError(t, err) m := pdata.NewMetric() m.SetName(metricName) - m.SetDataType(pdata.MetricDataTypeDoubleGauge) - dps := m.DoubleGauge().DataPoints() + m.SetDataType(pdata.MetricDataTypeGauge) + dps := m.Gauge().DataPoints() dps.AppendEmpty() match, err := matcher.MatchMetric(m) assert.NoError(t, err) diff --git a/internal/testdata/metric.go b/internal/testdata/metric.go index 99e06b20750..fe2e26b7608 100644 --- a/internal/testdata/metric.go +++ b/internal/testdata/metric.go @@ -110,7 +110,7 @@ func GenerateMetricsAllTypesNoDataPoints() pdata.Metrics { md := GenerateMetricsOneEmptyInstrumentationLibrary() ilm0 := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0) ms := ilm0.Metrics() - initMetric(ms.AppendEmpty(), TestGaugeDoubleMetricName, pdata.MetricDataTypeDoubleGauge) + initMetric(ms.AppendEmpty(), TestGaugeDoubleMetricName, pdata.MetricDataTypeGauge) initMetric(ms.AppendEmpty(), TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge) initMetric(ms.AppendEmpty(), TestCounterDoubleMetricName, pdata.MetricDataTypeSum) initMetric(ms.AppendEmpty(), TestCounterIntMetricName, pdata.MetricDataTypeIntSum) @@ -126,8 +126,8 @@ func GenerateMetricsAllTypesEmptyDataPoint() pdata.Metrics { ms := ilm0.Metrics() doubleGauge := ms.AppendEmpty() - initMetric(doubleGauge, TestGaugeDoubleMetricName, pdata.MetricDataTypeDoubleGauge) - doubleGauge.DoubleGauge().DataPoints().AppendEmpty() + initMetric(doubleGauge, TestGaugeDoubleMetricName, pdata.MetricDataTypeGauge) + doubleGauge.Gauge().DataPoints().AppendEmpty() intGauge := ms.AppendEmpty() initMetric(intGauge, TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge) intGauge.IntGauge().DataPoints().AppendEmpty() diff --git a/model/pdata/generated_metrics.go b/model/pdata/generated_metrics.go index 9126ef15868..63e5532d197 100644 --- a/model/pdata/generated_metrics.go +++ b/model/pdata/generated_metrics.go @@ -589,35 +589,35 @@ func (ms IntGauge) CopyTo(dest IntGauge) { ms.DataPoints().CopyTo(dest.DataPoints()) } -// DoubleGauge represents the type of a double scalar metric that always exports the "current value" for every data point. +// Gauge represents the type of a double scalar metric that always exports the "current value" for every data point. // // This is a reference type, if passed by value and callee modifies it the // caller will see the modification. // -// Must use NewDoubleGauge function to create new instances. +// Must use NewGauge function to create new instances. // Important: zero-initialized instance is not valid for use. -type DoubleGauge struct { +type Gauge struct { orig *otlpmetrics.Gauge } -func newDoubleGauge(orig *otlpmetrics.Gauge) DoubleGauge { - return DoubleGauge{orig: orig} +func newGauge(orig *otlpmetrics.Gauge) Gauge { + return Gauge{orig: orig} } -// NewDoubleGauge creates a new empty DoubleGauge. +// NewGauge creates a new empty Gauge. // // This must be used only in testing code since no "Set" method available. -func NewDoubleGauge() DoubleGauge { - return newDoubleGauge(&otlpmetrics.Gauge{}) +func NewGauge() Gauge { + return newGauge(&otlpmetrics.Gauge{}) } -// DataPoints returns the DataPoints associated with this DoubleGauge. -func (ms DoubleGauge) DataPoints() DoubleDataPointSlice { +// DataPoints returns the DataPoints associated with this Gauge. +func (ms Gauge) DataPoints() DoubleDataPointSlice { return newDoubleDataPointSlice(&(*ms.orig).DataPoints) } // CopyTo copies all properties from the current struct to the dest. -func (ms DoubleGauge) CopyTo(dest DoubleGauge) { +func (ms Gauge) CopyTo(dest Gauge) { ms.DataPoints().CopyTo(dest.DataPoints()) } diff --git a/model/pdata/generated_metrics_test.go b/model/pdata/generated_metrics_test.go index d9a7b475819..33469b2719f 100644 --- a/model/pdata/generated_metrics_test.go +++ b/model/pdata/generated_metrics_test.go @@ -460,14 +460,14 @@ func TestIntGauge_DataPoints(t *testing.T) { assert.EqualValues(t, testValDataPoints, ms.DataPoints()) } -func TestDoubleGauge_CopyTo(t *testing.T) { - ms := NewDoubleGauge() - generateTestDoubleGauge().CopyTo(ms) - assert.EqualValues(t, generateTestDoubleGauge(), ms) +func TestGauge_CopyTo(t *testing.T) { + ms := NewGauge() + generateTestGauge().CopyTo(ms) + assert.EqualValues(t, generateTestGauge(), ms) } -func TestDoubleGauge_DataPoints(t *testing.T) { - ms := NewDoubleGauge() +func TestGauge_DataPoints(t *testing.T) { + ms := NewGauge() assert.EqualValues(t, NewDoubleDataPointSlice(), ms.DataPoints()) fillTestDoubleDataPointSlice(ms.DataPoints()) testValDataPoints := generateTestDoubleDataPointSlice() @@ -1981,13 +1981,13 @@ func fillTestIntGauge(tv IntGauge) { fillTestIntDataPointSlice(tv.DataPoints()) } -func generateTestDoubleGauge() DoubleGauge { - tv := NewDoubleGauge() - fillTestDoubleGauge(tv) +func generateTestGauge() Gauge { + tv := NewGauge() + fillTestGauge(tv) return tv } -func fillTestDoubleGauge(tv DoubleGauge) { +func fillTestGauge(tv Gauge) { fillTestDoubleDataPointSlice(tv.DataPoints()) } diff --git a/model/pdata/metrics.go b/model/pdata/metrics.go index f19a3d74d77..63bb51f19a6 100644 --- a/model/pdata/metrics.go +++ b/model/pdata/metrics.go @@ -107,8 +107,8 @@ func (md Metrics) DataPointCount() (dataPointCount int) { switch m.DataType() { case MetricDataTypeIntGauge: dataPointCount += m.IntGauge().DataPoints().Len() - case MetricDataTypeDoubleGauge: - dataPointCount += m.DoubleGauge().DataPoints().Len() + case MetricDataTypeGauge: + dataPointCount += m.Gauge().DataPoints().Len() case MetricDataTypeIntSum: dataPointCount += m.IntSum().DataPoints().Len() case MetricDataTypeSum: @@ -132,7 +132,7 @@ type MetricDataType int32 const ( MetricDataTypeNone MetricDataType = iota MetricDataTypeIntGauge - MetricDataTypeDoubleGauge + MetricDataTypeGauge MetricDataTypeIntSum MetricDataTypeSum MetricDataTypeIntHistogram @@ -147,8 +147,8 @@ func (mdt MetricDataType) String() string { return "None" case MetricDataTypeIntGauge: return "IntGauge" - case MetricDataTypeDoubleGauge: - return "DoubleGauge" + case MetricDataTypeGauge: + return "Gauge" case MetricDataTypeIntSum: return "IntSum" case MetricDataTypeSum: @@ -170,7 +170,7 @@ func (ms Metric) DataType() MetricDataType { case *otlpmetrics.Metric_IntGauge: return MetricDataTypeIntGauge case *otlpmetrics.Metric_Gauge: - return MetricDataTypeDoubleGauge + return MetricDataTypeGauge case *otlpmetrics.Metric_IntSum: return MetricDataTypeIntSum case *otlpmetrics.Metric_Sum: @@ -191,7 +191,7 @@ func (ms Metric) SetDataType(ty MetricDataType) { switch ty { case MetricDataTypeIntGauge: ms.orig.Data = &otlpmetrics.Metric_IntGauge{IntGauge: &otlpmetrics.IntGauge{}} - case MetricDataTypeDoubleGauge: + case MetricDataTypeGauge: ms.orig.Data = &otlpmetrics.Metric_Gauge{Gauge: &otlpmetrics.Gauge{}} case MetricDataTypeIntSum: ms.orig.Data = &otlpmetrics.Metric_IntSum{IntSum: &otlpmetrics.IntSum{}} @@ -213,11 +213,11 @@ func (ms Metric) IntGauge() IntGauge { return newIntGauge(ms.orig.Data.(*otlpmetrics.Metric_IntGauge).IntGauge) } -// DoubleGauge returns the data as DoubleGauge. -// Calling this function when DataType() != MetricDataTypeDoubleGauge will cause a panic. +// Gauge returns the data as Gauge. +// Calling this function when DataType() != MetricDataTypeGauge will cause a panic. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) DoubleGauge() DoubleGauge { - return newDoubleGauge(ms.orig.Data.(*otlpmetrics.Metric_Gauge).Gauge) +func (ms Metric) Gauge() Gauge { + return newGauge(ms.orig.Data.(*otlpmetrics.Metric_Gauge).Gauge) } // IntSum returns the data as IntSum. @@ -263,7 +263,7 @@ func copyData(src, dest *otlpmetrics.Metric) { dest.Data = data case *otlpmetrics.Metric_Gauge: data := &otlpmetrics.Metric_Gauge{Gauge: &otlpmetrics.Gauge{}} - newDoubleGauge(srcData.Gauge).CopyTo(newDoubleGauge(data.Gauge)) + newGauge(srcData.Gauge).CopyTo(newGauge(data.Gauge)) dest.Data = data case *otlpmetrics.Metric_IntSum: data := &otlpmetrics.Metric_IntSum{IntSum: &otlpmetrics.IntSum{}} diff --git a/model/pdata/metrics_test.go b/model/pdata/metrics_test.go index 0751187289c..4390cc94d6a 100644 --- a/model/pdata/metrics_test.go +++ b/model/pdata/metrics_test.go @@ -49,7 +49,7 @@ func TestCopyData(t *testing.T) { }, }, { - name: "DoubleGauge", + name: "Gauge", src: &otlpmetrics.Metric{ Data: &otlpmetrics.Metric_Gauge{ Gauge: &otlpmetrics.Gauge{}, @@ -106,8 +106,8 @@ func TestDataType(t *testing.T) { assert.Equal(t, MetricDataTypeNone, m.DataType()) m.SetDataType(MetricDataTypeIntGauge) assert.Equal(t, MetricDataTypeIntGauge, m.DataType()) - m.SetDataType(MetricDataTypeDoubleGauge) - assert.Equal(t, MetricDataTypeDoubleGauge, m.DataType()) + m.SetDataType(MetricDataTypeGauge) + assert.Equal(t, MetricDataTypeGauge, m.DataType()) m.SetDataType(MetricDataTypeIntSum) assert.Equal(t, MetricDataTypeIntSum, m.DataType()) m.SetDataType(MetricDataTypeSum) @@ -230,8 +230,8 @@ func TestMetricAndDataPointCount(t *testing.T) { ilms.Resize(1) ilms.At(0).Metrics().Resize(5) assert.EqualValues(t, 0, md.DataPointCount()) - ilms.At(0).Metrics().At(1).SetDataType(MetricDataTypeDoubleGauge) - doubleGauge := ilms.At(0).Metrics().At(1).DoubleGauge() + ilms.At(0).Metrics().At(1).SetDataType(MetricDataTypeGauge) + doubleGauge := ilms.At(0).Metrics().At(1).Gauge() doubleGauge.DataPoints().Resize(1) ilms.At(0).Metrics().At(3).SetDataType(MetricDataTypeIntHistogram) intHistogram := ilms.At(0).Metrics().At(3).IntHistogram() @@ -252,7 +252,7 @@ func TestDataPointCountWithNilDataPoints(t *testing.T) { intGauge := ilm.Metrics().AppendEmpty() intGauge.SetDataType(MetricDataTypeIntGauge) doubleGauge := ilm.Metrics().AppendEmpty() - doubleGauge.SetDataType(MetricDataTypeDoubleGauge) + doubleGauge.SetDataType(MetricDataTypeGauge) intHistogram := ilm.Metrics().AppendEmpty() intHistogram.SetDataType(MetricDataTypeIntHistogram) doubleHistogram := ilm.Metrics().AppendEmpty() diff --git a/processor/batchprocessor/splitmetrics.go b/processor/batchprocessor/splitmetrics.go index 6c7346f964a..7db335c716d 100644 --- a/processor/batchprocessor/splitmetrics.go +++ b/processor/batchprocessor/splitmetrics.go @@ -84,8 +84,8 @@ func metricDataPointCount(ms pdata.Metric) (dataPointCount int) { switch ms.DataType() { case pdata.MetricDataTypeIntGauge: dataPointCount = ms.IntGauge().DataPoints().Len() - case pdata.MetricDataTypeDoubleGauge: - dataPointCount = ms.DoubleGauge().DataPoints().Len() + case pdata.MetricDataTypeGauge: + dataPointCount = ms.Gauge().DataPoints().Len() case pdata.MetricDataTypeIntSum: dataPointCount = ms.IntSum().DataPoints().Len() case pdata.MetricDataTypeSum: @@ -116,9 +116,9 @@ func splitMetric(ms, dest pdata.Metric, size int) (int, bool) { ms.IntGauge().DataPoints().RemoveIf(func(_ pdata.IntDataPoint) bool { return filterDataPoints() }) - case pdata.MetricDataTypeDoubleGauge: - dest.DoubleGauge().DataPoints().Resize(size) - ms.DoubleGauge().DataPoints().RemoveIf(func(_ pdata.DoubleDataPoint) bool { + case pdata.MetricDataTypeGauge: + dest.Gauge().DataPoints().Resize(size) + ms.Gauge().DataPoints().RemoveIf(func(_ pdata.DoubleDataPoint) bool { return filterDataPoints() }) case pdata.MetricDataTypeIntSum: diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index 6b04ff94141..24afae6b244 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -57,7 +57,7 @@ func testMatchError(t *testing.T, mdType pdata.MetricDataType) { func TestExprProcessor(t *testing.T) { testFilter(t, pdata.MetricDataTypeIntGauge) - testFilter(t, pdata.MetricDataTypeDoubleGauge) + testFilter(t, pdata.MetricDataTypeGauge) testFilter(t, pdata.MetricDataTypeIntSum) testFilter(t, pdata.MetricDataTypeSum) testFilter(t, pdata.MetricDataTypeIntHistogram) @@ -95,8 +95,8 @@ func testFilter(t *testing.T, mdType pdata.MetricDataType) { for l := 0; l < pts.Len(); l++ { assertFiltered(t, pts.At(l).LabelsMap()) } - case pdata.MetricDataTypeDoubleGauge: - pts := metric.DoubleGauge().DataPoints() + case pdata.MetricDataTypeGauge: + pts := metric.Gauge().DataPoints() for l := 0; l < pts.Len(); l++ { assertFiltered(t, pts.At(l).LabelsMap()) } diff --git a/processor/filterprocessor/filter_processor_test.go b/processor/filterprocessor/filter_processor_test.go index 74981c562f5..004f660e36b 100644 --- a/processor/filterprocessor/filter_processor_test.go +++ b/processor/filterprocessor/filter_processor_test.go @@ -354,8 +354,8 @@ func testResourceMetrics(mwrs []metricWithResource) pdata.Metrics { for _, name := range mwr.metricNames { m := ms.AppendEmpty() m.SetName(name) - m.SetDataType(pdata.MetricDataTypeDoubleGauge) - dp := m.DoubleGauge().DataPoints().AppendEmpty() + m.SetDataType(pdata.MetricDataTypeGauge) + dp := m.Gauge().DataPoints().AppendEmpty() dp.SetTimestamp(pdata.TimestampFromTime(now.Add(10 * time.Second))) dp.SetValue(123) } diff --git a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go index 2308f052d87..988ace499eb 100644 --- a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go @@ -240,7 +240,7 @@ var Metrics = &metricStruct{ metric.SetName("system.cpu.load_average.15m") metric.SetDescription("Average CPU Load over 15 minutes.") metric.SetUnit("1") - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) + metric.SetDataType(pdata.MetricDataTypeGauge) }, }, &metricImpl{ @@ -249,7 +249,7 @@ var Metrics = &metricStruct{ metric.SetName("system.cpu.load_average.1m") metric.SetDescription("Average CPU Load over 1 minute.") metric.SetUnit("1") - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) + metric.SetDataType(pdata.MetricDataTypeGauge) }, }, &metricImpl{ @@ -258,7 +258,7 @@ var Metrics = &metricStruct{ metric.SetName("system.cpu.load_average.5m") metric.SetDescription("Average CPU Load over 5 minutes.") metric.SetUnit("1") - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) + metric.SetDataType(pdata.MetricDataTypeGauge) }, }, &metricImpl{ diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go index 42cda0f3dc7..21b2e0d0301 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go @@ -73,7 +73,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { func initializeLoadMetric(metric pdata.Metric, metricDescriptor metadata.MetricIntf, now pdata.Timestamp, value float64) { metricDescriptor.Init(metric) - dp := metric.DoubleGauge().DataPoints().AppendEmpty() + dp := metric.Gauge().DataPoints().AppendEmpty() dp.SetTimestamp(now) dp.SetValue(value) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go index 94ad2cb13fe..8bbdd13c039 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go @@ -89,5 +89,5 @@ func TestScrape(t *testing.T) { func assertMetricHasSingleDatapoint(t *testing.T, metric pdata.Metric, descriptor pdata.Metric) { internal.AssertDescriptorEqual(t, descriptor, metric) - assert.Equal(t, 1, metric.DoubleGauge().DataPoints().Len()) + assert.Equal(t, 1, metric.Gauge().DataPoints().Len()) } diff --git a/receiver/hostmetricsreceiver/metadata.yaml b/receiver/hostmetricsreceiver/metadata.yaml index 31be0862c3c..3b1b60ea51b 100644 --- a/receiver/hostmetricsreceiver/metadata.yaml +++ b/receiver/hostmetricsreceiver/metadata.yaml @@ -153,19 +153,19 @@ metrics: description: Average CPU Load over 1 minute. unit: 1 data: - type: double gauge + type: gauge system.cpu.load_average.5m: description: Average CPU Load over 5 minutes. unit: 1 data: - type: double gauge + type: gauge system.cpu.load_average.15m: description: Average CPU Load over 15 minutes. unit: 1 data: - type: double gauge + type: gauge system.disk.io: description: Disk bytes transferred. diff --git a/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go b/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go index 0975592eb07..ab2c9a7c6d1 100644 --- a/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go +++ b/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go @@ -63,7 +63,7 @@ func convToPdataMetricType(metricType textparse.MetricType) pdata.MetricDataType return pdata.MetricDataTypeSum // textparse.MetricTypeUnknown is converted to gauge by default to fix Prometheus untyped metrics from being dropped case textparse.MetricTypeGauge, textparse.MetricTypeUnknown: - return pdata.MetricDataTypeDoubleGauge + return pdata.MetricDataTypeGauge case textparse.MetricTypeHistogram: return pdata.MetricDataTypeHistogram // dropping support for gaugehistogram for now until we have an official spec of its implementation diff --git a/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go b/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go index b8962ed075b..b8331b03677 100644 --- a/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go +++ b/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go @@ -84,7 +84,7 @@ func TestGetBoundaryEquivalence(t *testing.T) { { name: "other data types without matches", mtype: metricspb.MetricDescriptor_GAUGE_DOUBLE, - pmtype: pdata.MetricDataTypeDoubleGauge, + pmtype: pdata.MetricDataTypeGauge, labels: labels.Labels{ {Name: model.BucketLabel, Value: "11.71"}, }, @@ -161,7 +161,7 @@ func TestGetBoundaryPdata(t *testing.T) { }, { name: "other data types without matches", - mtype: pdata.MetricDataTypeDoubleGauge, + mtype: pdata.MetricDataTypeGauge, labels: labels.Labels{ {Name: model.BucketLabel, Value: "11.71"}, }, @@ -204,7 +204,7 @@ func TestConvToPdataMetricType(t *testing.T) { { name: "textparse.unknown", mtype: textparse.MetricTypeUnknown, - want: pdata.MetricDataTypeDoubleGauge, + want: pdata.MetricDataTypeGauge, }, { name: "textparse.histogram", @@ -251,7 +251,7 @@ func TestIsusefulLabelPdata(t *testing.T) { }, mtypes: []pdata.MetricDataType{ pdata.MetricDataTypeSum, - pdata.MetricDataTypeDoubleGauge, + pdata.MetricDataTypeGauge, pdata.MetricDataTypeIntHistogram, pdata.MetricDataTypeHistogram, pdata.MetricDataTypeSummary, @@ -272,7 +272,7 @@ func TestIsusefulLabelPdata(t *testing.T) { name: `bucket label with non "int_histogram", "histogram":: useful`, mtypes: []pdata.MetricDataType{ pdata.MetricDataTypeSum, - pdata.MetricDataTypeDoubleGauge, + pdata.MetricDataTypeGauge, pdata.MetricDataTypeSummary, pdata.MetricDataTypeIntSum, pdata.MetricDataTypeNone, @@ -295,7 +295,7 @@ func TestIsusefulLabelPdata(t *testing.T) { labelKeys: []string{model.QuantileLabel}, mtypes: []pdata.MetricDataType{ pdata.MetricDataTypeSum, - pdata.MetricDataTypeDoubleGauge, + pdata.MetricDataTypeGauge, pdata.MetricDataTypeIntHistogram, pdata.MetricDataTypeHistogram, pdata.MetricDataTypeIntSum, @@ -310,7 +310,7 @@ func TestIsusefulLabelPdata(t *testing.T) { labelKeys: []string{"any_label", "foo.bar"}, mtypes: []pdata.MetricDataType{ pdata.MetricDataTypeSum, - pdata.MetricDataTypeDoubleGauge, + pdata.MetricDataTypeGauge, pdata.MetricDataTypeIntHistogram, pdata.MetricDataTypeHistogram, pdata.MetricDataTypeSummary, diff --git a/testbed/correctness/metrics/metric_diff.go b/testbed/correctness/metrics/metric_diff.go index 38ed74c4e33..d4856281a06 100644 --- a/testbed/correctness/metrics/metric_diff.go +++ b/testbed/correctness/metrics/metric_diff.go @@ -106,8 +106,8 @@ func DiffMetric(diffs []*MetricDiff, expected pdata.Metric, actual pdata.Metric) switch actual.DataType() { case pdata.MetricDataTypeIntGauge: diffs = diffIntPts(diffs, expected.IntGauge().DataPoints(), actual.IntGauge().DataPoints()) - case pdata.MetricDataTypeDoubleGauge: - diffs = diffDoublePts(diffs, expected.DoubleGauge().DataPoints(), actual.DoubleGauge().DataPoints()) + case pdata.MetricDataTypeGauge: + diffs = diffDoublePts(diffs, expected.Gauge().DataPoints(), actual.Gauge().DataPoints()) case pdata.MetricDataTypeIntSum: diffs = diff(diffs, expected.IntSum().IsMonotonic(), actual.IntSum().IsMonotonic(), "IntSum IsMonotonic") diffs = diff(diffs, expected.IntSum().AggregationTemporality(), actual.IntSum().AggregationTemporality(), "IntSum AggregationTemporality") diff --git a/testbed/correctness/metrics/metric_diff_test.go b/testbed/correctness/metrics/metric_diff_test.go index 870ad9437f0..33ac61c223b 100644 --- a/testbed/correctness/metrics/metric_diff_test.go +++ b/testbed/correctness/metrics/metric_diff_test.go @@ -64,7 +64,7 @@ func TestDifferentNumPts(t *testing.T) { func TestDifferentPtTypes(t *testing.T) { expected := goldendataset.MetricsFromCfg(goldendataset.DefaultCfg()) cfg := goldendataset.DefaultCfg() - cfg.MetricDescriptorType = pdata.MetricDataTypeDoubleGauge + cfg.MetricDescriptorType = pdata.MetricDataTypeGauge actual := goldendataset.MetricsFromCfg(cfg) diffs := diffMetricData(expected, actual) assert.Len(t, diffs, 1) diff --git a/testutil/metricstestutil/metricsutil.go b/testutil/metricstestutil/metricsutil.go index 1d528ebddd0..69d239385b9 100644 --- a/testutil/metricstestutil/metricsutil.go +++ b/testutil/metricstestutil/metricsutil.go @@ -172,9 +172,9 @@ func SortedMetrics(metrics pdata.Metrics) pdata.Metrics { for l := 0; l < m.IntSum().DataPoints().Len(); l++ { m.IntSum().DataPoints().At(l).LabelsMap().Sort() } - case pdata.MetricDataTypeDoubleGauge: - for l := 0; l < m.DoubleGauge().DataPoints().Len(); l++ { - m.DoubleGauge().DataPoints().At(l).LabelsMap().Sort() + case pdata.MetricDataTypeGauge: + for l := 0; l < m.Gauge().DataPoints().Len(); l++ { + m.Gauge().DataPoints().At(l).LabelsMap().Sort() } case pdata.MetricDataTypeSum: for l := 0; l < m.Sum().DataPoints().Len(); l++ { diff --git a/translator/internaldata/metrics_to_oc.go b/translator/internaldata/metrics_to_oc.go index ff6deb3961a..c85a823ed9a 100644 --- a/translator/internaldata/metrics_to_oc.go +++ b/translator/internaldata/metrics_to_oc.go @@ -88,8 +88,8 @@ func collectLabelKeys(metric pdata.Metric) *labelKeys { switch metric.DataType() { case pdata.MetricDataTypeIntGauge: collectLabelKeysIntDataPoints(metric.IntGauge().DataPoints(), keySet) - case pdata.MetricDataTypeDoubleGauge: - collectLabelKeysDoubleDataPoints(metric.DoubleGauge().DataPoints(), keySet) + case pdata.MetricDataTypeGauge: + collectLabelKeysDoubleDataPoints(metric.Gauge().DataPoints(), keySet) case pdata.MetricDataTypeIntSum: collectLabelKeysIntDataPoints(metric.IntSum().DataPoints(), keySet) case pdata.MetricDataTypeSum: @@ -185,7 +185,7 @@ func descriptorTypeToOC(metric pdata.Metric) ocmetrics.MetricDescriptor_Type { switch metric.DataType() { case pdata.MetricDataTypeIntGauge: return ocmetrics.MetricDescriptor_GAUGE_INT64 - case pdata.MetricDataTypeDoubleGauge: + case pdata.MetricDataTypeGauge: return ocmetrics.MetricDescriptor_GAUGE_DOUBLE case pdata.MetricDataTypeIntSum: sd := metric.IntSum() @@ -221,8 +221,8 @@ func dataPointsToTimeseries(metric pdata.Metric, labelKeys *labelKeys) []*ocmetr switch metric.DataType() { case pdata.MetricDataTypeIntGauge: return intPointsToOC(metric.IntGauge().DataPoints(), labelKeys) - case pdata.MetricDataTypeDoubleGauge: - return doublePointToOC(metric.DoubleGauge().DataPoints(), labelKeys) + case pdata.MetricDataTypeGauge: + return doublePointToOC(metric.Gauge().DataPoints(), labelKeys) case pdata.MetricDataTypeIntSum: return intPointsToOC(metric.IntSum().DataPoints(), labelKeys) case pdata.MetricDataTypeSum: diff --git a/translator/internaldata/metrics_to_oc_test.go b/translator/internaldata/metrics_to_oc_test.go index a0c77ec95c0..52865548ac1 100644 --- a/translator/internaldata/metrics_to_oc_test.go +++ b/translator/internaldata/metrics_to_oc_test.go @@ -183,7 +183,7 @@ func TestMetricsType(t *testing.T) { name: "double-gauge", internal: func() pdata.Metric { m := pdata.NewMetric() - m.SetDataType(pdata.MetricDataTypeDoubleGauge) + m.SetDataType(pdata.MetricDataTypeGauge) return m }, descType: ocmetrics.MetricDescriptor_GAUGE_DOUBLE, diff --git a/translator/internaldata/oc_to_metrics.go b/translator/internaldata/oc_to_metrics.go index 214c8a39110..a84c947c43e 100644 --- a/translator/internaldata/oc_to_metrics.go +++ b/translator/internaldata/oc_to_metrics.go @@ -173,8 +173,8 @@ func descriptorTypeToMetrics(t ocmetrics.MetricDescriptor_Type, metric pdata.Met metric.SetDataType(pdata.MetricDataTypeIntGauge) return pdata.MetricDataTypeIntGauge case ocmetrics.MetricDescriptor_GAUGE_DOUBLE: - metric.SetDataType(pdata.MetricDataTypeDoubleGauge) - return pdata.MetricDataTypeDoubleGauge + metric.SetDataType(pdata.MetricDataTypeGauge) + return pdata.MetricDataTypeGauge case ocmetrics.MetricDescriptor_CUMULATIVE_INT64: metric.SetDataType(pdata.MetricDataTypeIntSum) sum := metric.IntSum() @@ -205,8 +205,8 @@ func setDataPoints(ocMetric *ocmetrics.Metric, metric pdata.Metric) { switch metric.DataType() { case pdata.MetricDataTypeIntGauge: fillIntDataPoint(ocMetric, metric.IntGauge().DataPoints()) - case pdata.MetricDataTypeDoubleGauge: - fillDoubleDataPoint(ocMetric, metric.DoubleGauge().DataPoints()) + case pdata.MetricDataTypeGauge: + fillDoubleDataPoint(ocMetric, metric.Gauge().DataPoints()) case pdata.MetricDataTypeIntSum: fillIntDataPoint(ocMetric, metric.IntSum().DataPoints()) case pdata.MetricDataTypeSum: