Skip to content

Commit

Permalink
Change AggregationTemporality.String to simpler, easier to read (#6117)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan <bogdandrutu@gmail.com>

Signed-off-by: Bogdan <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu committed Oct 4, 2022
1 parent 3bf2bff commit 100722e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Delete deprecated `pcommon.Value` getter/setter methods with `Val` suffix. (#6178)
- Delete deprecated `StringVal` and `SetStringVal` methods. (#6178)
- Delete deprecated `ValueTypeString` method. (#6178)
- Change AggregationTemporality.String to simpler, easier to read. (#6117)

### 🚩 Deprecations 🚩

Expand Down
10 changes: 9 additions & 1 deletion pdata/pmetric/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,15 @@ const (

// String returns the string representation of the MetricAggregationTemporality.
func (at MetricAggregationTemporality) String() string {
return otlpmetrics.AggregationTemporality(at).String()
switch at {
case MetricAggregationTemporalityUnspecified:
return "Unspecified"
case MetricAggregationTemporalityDelta:
return "Delta"
case MetricAggregationTemporalityCumulative:
return "Cumulative"
}
return ""
}

// NumberDataPointValueType specifies the type of NumberDataPoint value.
Expand Down
11 changes: 9 additions & 2 deletions pdata/pmetric/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,21 @@ func TestMetricTypeString(t *testing.T) {
assert.Equal(t, "", (MetricTypeSummary + 1).String())
}

func TestNumberDataPointValueTypeStr(t *testing.T) {
func TestMetricAggregationTemporalityString(t *testing.T) {
assert.Equal(t, "Unspecified", MetricAggregationTemporalityUnspecified.String())
assert.Equal(t, "Delta", MetricAggregationTemporalityDelta.String())
assert.Equal(t, "Cumulative", MetricAggregationTemporalityCumulative.String())
assert.Equal(t, "", (MetricAggregationTemporalityCumulative + 1).String())
}

func TestNumberDataPointValueTypeString(t *testing.T) {
assert.Equal(t, "None", NumberDataPointValueTypeNone.String())
assert.Equal(t, "Int", NumberDataPointValueTypeInt.String())
assert.Equal(t, "Double", NumberDataPointValueTypeDouble.String())
assert.Equal(t, "", (NumberDataPointValueTypeDouble + 1).String())
}

func TestExemplarValueTypeStr(t *testing.T) {
func TestExemplarValueTypeString(t *testing.T) {
assert.Equal(t, "None", ExemplarValueTypeNone.String())
assert.Equal(t, "Int", ExemplarValueTypeInt.String())
assert.Equal(t, "Double", ExemplarValueTypeDouble.String())
Expand Down

0 comments on commit 100722e

Please sign in to comment.