Skip to content

rename AggregationTemporality -> MetricAggregationTemporality #4136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tigrannajaryan merged 1 commit into from
Sep 27, 2021
Merged

rename AggregationTemporality -> MetricAggregationTemporality #4136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/pdatagen/internal/metrics_structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,10 @@ var isMonotonicField = &primitiveField{
var aggregationTemporalityField = &primitiveTypedField{
fieldName: "AggregationTemporality",
originFieldName: "AggregationTemporality",
returnType: "AggregationTemporality",
returnType: "MetricAggregationTemporality",
rawType: "otlpmetrics.AggregationTemporality",
defaultVal: "AggregationTemporalityUnspecified",
testVal: "AggregationTemporalityCumulative",
defaultVal: "MetricAggregationTemporalityUnspecified",
testVal: "MetricAggregationTemporalityCumulative",
}

var oneofDataField = &oneofField{
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,10 @@ func initMetric(m pdata.Metric, name string, ty pdata.MetricDataType) {
case pdata.MetricDataTypeSum:
sum := m.Sum()
sum.SetIsMonotonic(true)
sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
case pdata.MetricDataTypeHistogram:
histo := m.Histogram()
histo.SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
histo.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
}
}

Expand Down
12 changes: 6 additions & 6 deletions model/pdata/generated_metrics.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions model/pdata/generated_metrics_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions model/pdata/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,21 +229,21 @@ func copyData(src, dest *otlpmetrics.Metric) {
}
}

// AggregationTemporality defines how a metric aggregator reports aggregated values.
// MetricAggregationTemporality defines how a metric aggregator reports aggregated values.
// It describes how those values relate to the time interval over which they are aggregated.
type AggregationTemporality int32
type MetricAggregationTemporality int32

const (
// AggregationTemporalityUnspecified is the default AggregationTemporality, it MUST NOT be used.
AggregationTemporalityUnspecified = AggregationTemporality(otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_UNSPECIFIED)
// AggregationTemporalityDelta is an AggregationTemporality for a metric aggregator which reports changes since last report time.
AggregationTemporalityDelta = AggregationTemporality(otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_DELTA)
// AggregationTemporalityCumulative is an AggregationTemporality for a metric aggregator which reports changes since a fixed start time.
AggregationTemporalityCumulative = AggregationTemporality(otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_CUMULATIVE)
// MetricAggregationTemporalityUnspecified is the default MetricAggregationTemporality, it MUST NOT be used.
MetricAggregationTemporalityUnspecified = MetricAggregationTemporality(otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_UNSPECIFIED)
// MetricAggregationTemporalityDelta is a MetricAggregationTemporality for a metric aggregator which reports changes since last report time.
MetricAggregationTemporalityDelta = MetricAggregationTemporality(otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_DELTA)
// MetricAggregationTemporalityCumulative is a MetricAggregationTemporality for a metric aggregator which reports changes since a fixed start time.
MetricAggregationTemporalityCumulative = MetricAggregationTemporality(otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_CUMULATIVE)
)

// String returns the string representation of the AggregationTemporality.
func (at AggregationTemporality) String() string {
// String returns the string representation of the MetricAggregationTemporality.
func (at MetricAggregationTemporality) String() string {
return otlpmetrics.AggregationTemporality(at).String()
}

Expand Down
8 changes: 4 additions & 4 deletions model/pdata/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func TestOtlpToInternalReadOnly(t *testing.T) {
assert.EqualValues(t, "ms", metricDouble.Unit())
assert.EqualValues(t, MetricDataTypeSum, metricDouble.DataType())
dsd := metricDouble.Sum()
assert.EqualValues(t, AggregationTemporalityCumulative, dsd.AggregationTemporality())
assert.EqualValues(t, MetricAggregationTemporalityCumulative, dsd.AggregationTemporality())
sumDataPoints := dsd.DataPoints()
assert.EqualValues(t, 2, sumDataPoints.Len())
// First point
Expand All @@ -286,7 +286,7 @@ func TestOtlpToInternalReadOnly(t *testing.T) {
assert.EqualValues(t, "ms", metricHistogram.Unit())
assert.EqualValues(t, MetricDataTypeHistogram, metricHistogram.DataType())
dhd := metricHistogram.Histogram()
assert.EqualValues(t, AggregationTemporalityDelta, dhd.AggregationTemporality())
assert.EqualValues(t, MetricAggregationTemporalityDelta, dhd.AggregationTemporality())
histogramDataPoints := dhd.DataPoints()
assert.EqualValues(t, 2, histogramDataPoints.Len())
// First point
Expand Down Expand Up @@ -446,7 +446,7 @@ func TestOtlpToFromInternalSumMutating(t *testing.T) {
assert.EqualValues(t, 2, dsd.DataPoints().Len())
metric.SetDataType(MetricDataTypeSum)
doubleDataPoints := metric.Sum().DataPoints()
metric.Sum().SetAggregationTemporality(AggregationTemporalityCumulative)
metric.Sum().SetAggregationTemporality(MetricAggregationTemporalityCumulative)
doubleDataPoints.AppendEmpty()
assert.EqualValues(t, 1, doubleDataPoints.Len())
doubleDataPoints.At(0).SetStartTimestamp(Timestamp(startTime + 1))
Expand Down Expand Up @@ -530,7 +530,7 @@ func TestOtlpToFromInternalHistogramMutating(t *testing.T) {
dhd := metric.Histogram()
assert.EqualValues(t, 2, dhd.DataPoints().Len())
metric.SetDataType(MetricDataTypeHistogram)
metric.Histogram().SetAggregationTemporality(AggregationTemporalityDelta)
metric.Histogram().SetAggregationTemporality(MetricAggregationTemporalityDelta)
histogramDataPoints := metric.Histogram().DataPoints()
histogramDataPoints.AppendEmpty()
assert.EqualValues(t, 1, histogramDataPoints.Len())
Expand Down