Skip to content

Commit f9dacb8

Browse files
author
alrex
authored
rename DoubleGauge -> Gauge (#3599)
1 parent 388157b commit f9dacb8

File tree

41 files changed

+147
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+147
-146
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
## 🛑 Breaking changes 🛑
66

77
- Rename `pdata.DoubleSum` to `pdata.Sum` (#3583)
8+
- Rename `pdata.DoubleGauge` to `pdata.Gauge` (#3599)
89

910
## 🧰 Bug fixes 🧰
1011

‎cmd/mdatagen/metricdata.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222
_ MetricData = &intGauge{}
2323
_ MetricData = &intSum{}
2424
_ MetricData = &intHistogram{}
25-
_ MetricData = &doubleGauge{}
25+
_ MetricData = &gauge{}
2626
_ MetricData = &sum{}
2727
_ MetricData = &histogram{}
2828
)
@@ -50,8 +50,8 @@ func (e *ymlMetricData) UnmarshalYAML(unmarshal func(interface{}) error) error {
5050
md = &intSum{}
5151
case "int histogram":
5252
md = &intHistogram{}
53-
case "double gauge":
54-
md = &doubleGauge{}
53+
case "gauge":
54+
md = &gauge{}
5555
case "sum":
5656
md = &sum{}
5757
case "histogram":
@@ -116,18 +116,18 @@ func (i intGauge) HasAggregated() bool {
116116
return false
117117
}
118118

119-
type doubleGauge struct {
119+
type gauge struct {
120120
}
121121

122-
func (d doubleGauge) Type() string {
123-
return "DoubleGauge"
122+
func (d gauge) Type() string {
123+
return "Gauge"
124124
}
125125

126-
func (d doubleGauge) HasMonotonic() bool {
126+
func (d gauge) HasMonotonic() bool {
127127
return false
128128
}
129129

130-
func (d doubleGauge) HasAggregated() bool {
130+
func (d gauge) HasAggregated() bool {
131131
return false
132132
}
133133

‎cmd/mdatagen/metricdata_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestMetricData(t *testing.T) {
3030
{&intGauge{}, "IntGauge", false, false},
3131
{&intSum{}, "IntSum", true, true},
3232
{&intHistogram{}, "IntHistogram", true, false},
33-
{&doubleGauge{}, "DoubleGauge", false, false},
33+
{&gauge{}, "Gauge", false, false},
3434
{&sum{}, "Sum", true, true},
3535
{&histogram{}, "Histogram", true, false},
3636
} {

‎cmd/pdatagen/internal/metrics_structs.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ var intGauge = &messageValueStruct{
141141
}
142142

143143
var doubleGauge = &messageValueStruct{
144-
structName: "DoubleGauge",
145-
description: "// DoubleGauge represents the type of a double scalar metric that always exports the \"current value\" for every data point.",
144+
structName: "Gauge",
145+
description: "// Gauge represents the type of a double scalar metric that always exports the \"current value\" for every data point.",
146146
originFullName: "otlpmetrics.Gauge",
147147
fields: []baseField{
148148
&sliceField{

‎docs/metric-metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ metrics:
2323
unit:
2424
# Required
2525
data:
26-
# Required: one of int gauge, int sum, int histogram, double gauge, sum, or histogram.
26+
# Required: one of int gauge, int sum, int histogram, gauge, sum, or histogram.
2727
type:
2828
# Required for int sum and sum.
2929
monotonic: # true | false

‎exporter/exporterhelper/resource_to_label.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ func addLabelsToMetric(metric *pdata.Metric, labelMap pdata.StringMap) {
7373
switch metric.DataType() {
7474
case pdata.MetricDataTypeIntGauge:
7575
addLabelsToIntDataPoints(metric.IntGauge().DataPoints(), labelMap)
76-
case pdata.MetricDataTypeDoubleGauge:
77-
addLabelsToDoubleDataPoints(metric.DoubleGauge().DataPoints(), labelMap)
76+
case pdata.MetricDataTypeGauge:
77+
addLabelsToDoubleDataPoints(metric.Gauge().DataPoints(), labelMap)
7878
case pdata.MetricDataTypeIntSum:
7979
addLabelsToIntDataPoints(metric.IntSum().DataPoints(), labelMap)
8080
case pdata.MetricDataTypeSum:

‎exporter/exporterhelper/resource_to_label_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestConvertResourceToLabelsAllDataTypesEmptyDataPoint(t *testing.T) {
4646

4747
// Before converting resource to labels
4848
assert.Equal(t, 1, md.ResourceMetrics().At(0).Resource().Attributes().Len())
49-
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleGauge().DataPoints().At(0).LabelsMap().Len())
49+
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Gauge().DataPoints().At(0).LabelsMap().Len())
5050
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(1).IntGauge().DataPoints().At(0).LabelsMap().Len())
5151
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2).Sum().DataPoints().At(0).LabelsMap().Len())
5252
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3).IntSum().DataPoints().At(0).LabelsMap().Len())
@@ -57,15 +57,15 @@ func TestConvertResourceToLabelsAllDataTypesEmptyDataPoint(t *testing.T) {
5757

5858
// After converting resource to labels
5959
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).Resource().Attributes().Len())
60-
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleGauge().DataPoints().At(0).LabelsMap().Len())
60+
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Gauge().DataPoints().At(0).LabelsMap().Len())
6161
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(1).IntGauge().DataPoints().At(0).LabelsMap().Len())
6262
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2).Sum().DataPoints().At(0).LabelsMap().Len())
6363
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3).IntSum().DataPoints().At(0).LabelsMap().Len())
6464
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(4).Histogram().DataPoints().At(0).LabelsMap().Len())
6565
assert.Equal(t, 1, cloneMd.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(5).IntHistogram().DataPoints().At(0).LabelsMap().Len())
6666

6767
assert.Equal(t, 1, md.ResourceMetrics().At(0).Resource().Attributes().Len())
68-
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleGauge().DataPoints().At(0).LabelsMap().Len())
68+
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Gauge().DataPoints().At(0).LabelsMap().Len())
6969
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(1).IntGauge().DataPoints().At(0).LabelsMap().Len())
7070
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2).Sum().DataPoints().At(0).LabelsMap().Len())
7171
assert.Equal(t, 0, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3).IntSum().DataPoints().At(0).LabelsMap().Len())

‎exporter/prometheusexporter/accumulator.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (a *lastValueAccumulator) addMetric(metric pdata.Metric, il pdata.Instrumen
8686
return a.accumulateIntGauge(metric, il, now)
8787
case pdata.MetricDataTypeIntSum:
8888
return a.accumulateIntSum(metric, il, now)
89-
case pdata.MetricDataTypeDoubleGauge:
89+
case pdata.MetricDataTypeGauge:
9090
return a.accumulateDoubleGauge(metric, il, now)
9191
case pdata.MetricDataTypeSum:
9292
return a.accumulateSum(metric, il, now)
@@ -162,7 +162,7 @@ func (a *lastValueAccumulator) accumulateIntGauge(metric pdata.Metric, il pdata.
162162
}
163163

164164
func (a *lastValueAccumulator) accumulateDoubleGauge(metric pdata.Metric, il pdata.InstrumentationLibrary, now time.Time) (n int) {
165-
dps := metric.DoubleGauge().DataPoints()
165+
dps := metric.Gauge().DataPoints()
166166
for i := 0; i < dps.Len(); i++ {
167167
ip := dps.At(i)
168168

@@ -171,20 +171,20 @@ func (a *lastValueAccumulator) accumulateDoubleGauge(metric pdata.Metric, il pda
171171
v, ok := a.registeredMetrics.Load(signature)
172172
if !ok {
173173
m := createMetric(metric)
174-
ip.CopyTo(m.DoubleGauge().DataPoints().AppendEmpty())
174+
ip.CopyTo(m.Gauge().DataPoints().AppendEmpty())
175175
a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now})
176176
n++
177177
continue
178178
}
179179
mv := v.(*accumulatedValue)
180180

181-
if ip.Timestamp().AsTime().Before(mv.value.DoubleGauge().DataPoints().At(0).Timestamp().AsTime()) {
181+
if ip.Timestamp().AsTime().Before(mv.value.Gauge().DataPoints().At(0).Timestamp().AsTime()) {
182182
// only keep datapoint with latest timestamp
183183
continue
184184
}
185185

186186
m := createMetric(metric)
187-
ip.CopyTo(m.DoubleGauge().DataPoints().AppendEmpty())
187+
ip.CopyTo(m.Gauge().DataPoints().AppendEmpty())
188188
a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now})
189189
n++
190190
}

‎exporter/prometheusexporter/accumulator_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ func TestAccumulateMetrics(t *testing.T) {
138138
},
139139
},
140140
{
141-
name: "DoubleGauge",
141+
name: "Gauge",
142142
metric: func(ts time.Time, v float64, metrics pdata.MetricSlice) {
143143
metric := metrics.AppendEmpty()
144144
metric.SetName("test_metric")
145-
metric.SetDataType(pdata.MetricDataTypeDoubleGauge)
145+
metric.SetDataType(pdata.MetricDataTypeGauge)
146146
metric.SetDescription("test description")
147-
dp := metric.DoubleGauge().DataPoints().AppendEmpty()
147+
dp := metric.Gauge().DataPoints().AppendEmpty()
148148
dp.SetValue(v)
149149
dp.LabelsMap().Insert("label_1", "1")
150150
dp.LabelsMap().Insert("label_2", "2")
@@ -339,10 +339,10 @@ func getMerticProperties(metric pdata.Metric) (
339339
value = float64(metric.IntSum().DataPoints().At(0).Value())
340340
temporality = metric.IntSum().AggregationTemporality()
341341
isMonotonic = metric.IntSum().IsMonotonic()
342-
case pdata.MetricDataTypeDoubleGauge:
343-
labels = metric.DoubleGauge().DataPoints().At(0).LabelsMap()
344-
ts = metric.DoubleGauge().DataPoints().At(0).Timestamp().AsTime()
345-
value = metric.DoubleGauge().DataPoints().At(0).Value()
342+
case pdata.MetricDataTypeGauge:
343+
labels = metric.Gauge().DataPoints().At(0).LabelsMap()
344+
ts = metric.Gauge().DataPoints().At(0).Timestamp().AsTime()
345+
value = metric.Gauge().DataPoints().At(0).Value()
346346
temporality = pdata.AggregationTemporalityUnspecified
347347
isMonotonic = false
348348
case pdata.MetricDataTypeSum:

‎exporter/prometheusexporter/collector.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (c *collector) convertMetric(metric pdata.Metric) (prometheus.Metric, error
6262
return c.convertIntGauge(metric)
6363
case pdata.MetricDataTypeIntSum:
6464
return c.convertIntSum(metric)
65-
case pdata.MetricDataTypeDoubleGauge:
65+
case pdata.MetricDataTypeGauge:
6666
return c.convertDoubleGauge(metric)
6767
case pdata.MetricDataTypeSum:
6868
return c.convertSum(metric)
@@ -118,7 +118,7 @@ func (c *collector) convertIntGauge(metric pdata.Metric) (prometheus.Metric, err
118118
}
119119

120120
func (c *collector) convertDoubleGauge(metric pdata.Metric) (prometheus.Metric, error) {
121-
ip := metric.DoubleGauge().DataPoints().At(0)
121+
ip := metric.Gauge().DataPoints().At(0)
122122

123123
desc, labels := c.getMetricMetadata(metric, ip.LabelsMap())
124124
m, err := prometheus.NewConstMetric(desc, prometheus.GaugeValue, ip.Value(), labels...)

0 commit comments

Comments
 (0)