From 6a4cb4cc4515b03bcda410c809efcf9a74cf149d Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Mon, 27 Sep 2021 11:34:25 -0700 Subject: [PATCH] rename AggregationTemporality -> MetricAggregationTemporality --- cmd/pdatagen/internal/metrics_structs.go | 6 +++--- internal/testdata/metric.go | 4 ++-- model/pdata/generated_metrics.go | 12 ++++++------ model/pdata/generated_metrics_test.go | 12 ++++++------ model/pdata/metrics.go | 20 ++++++++++---------- model/pdata/metrics_test.go | 8 ++++---- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/cmd/pdatagen/internal/metrics_structs.go b/cmd/pdatagen/internal/metrics_structs.go index 3c969b97402e..56ec119b06f6 100644 --- a/cmd/pdatagen/internal/metrics_structs.go +++ b/cmd/pdatagen/internal/metrics_structs.go @@ -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{ diff --git a/internal/testdata/metric.go b/internal/testdata/metric.go index 718899f60b60..e30e005e8784 100644 --- a/internal/testdata/metric.go +++ b/internal/testdata/metric.go @@ -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) } } diff --git a/model/pdata/generated_metrics.go b/model/pdata/generated_metrics.go index feadadc8788c..0d15e16f9930 100644 --- a/model/pdata/generated_metrics.go +++ b/model/pdata/generated_metrics.go @@ -653,12 +653,12 @@ func NewSum() Sum { } // AggregationTemporality returns the aggregationtemporality associated with this Sum. -func (ms Sum) AggregationTemporality() AggregationTemporality { - return AggregationTemporality((*ms.orig).AggregationTemporality) +func (ms Sum) AggregationTemporality() MetricAggregationTemporality { + return MetricAggregationTemporality((*ms.orig).AggregationTemporality) } // SetAggregationTemporality replaces the aggregationtemporality associated with this Sum. -func (ms Sum) SetAggregationTemporality(v AggregationTemporality) { +func (ms Sum) SetAggregationTemporality(v MetricAggregationTemporality) { (*ms.orig).AggregationTemporality = otlpmetrics.AggregationTemporality(v) } @@ -708,12 +708,12 @@ func NewHistogram() Histogram { } // AggregationTemporality returns the aggregationtemporality associated with this Histogram. -func (ms Histogram) AggregationTemporality() AggregationTemporality { - return AggregationTemporality((*ms.orig).AggregationTemporality) +func (ms Histogram) AggregationTemporality() MetricAggregationTemporality { + return MetricAggregationTemporality((*ms.orig).AggregationTemporality) } // SetAggregationTemporality replaces the aggregationtemporality associated with this Histogram. -func (ms Histogram) SetAggregationTemporality(v AggregationTemporality) { +func (ms Histogram) SetAggregationTemporality(v MetricAggregationTemporality) { (*ms.orig).AggregationTemporality = otlpmetrics.AggregationTemporality(v) } diff --git a/model/pdata/generated_metrics_test.go b/model/pdata/generated_metrics_test.go index 5d5cef019acc..015637d85923 100644 --- a/model/pdata/generated_metrics_test.go +++ b/model/pdata/generated_metrics_test.go @@ -463,8 +463,8 @@ func TestSum_CopyTo(t *testing.T) { func TestSum_AggregationTemporality(t *testing.T) { ms := NewSum() - assert.EqualValues(t, AggregationTemporalityUnspecified, ms.AggregationTemporality()) - testValAggregationTemporality := AggregationTemporalityCumulative + assert.EqualValues(t, MetricAggregationTemporalityUnspecified, ms.AggregationTemporality()) + testValAggregationTemporality := MetricAggregationTemporalityCumulative ms.SetAggregationTemporality(testValAggregationTemporality) assert.EqualValues(t, testValAggregationTemporality, ms.AggregationTemporality()) } @@ -493,8 +493,8 @@ func TestHistogram_CopyTo(t *testing.T) { func TestHistogram_AggregationTemporality(t *testing.T) { ms := NewHistogram() - assert.EqualValues(t, AggregationTemporalityUnspecified, ms.AggregationTemporality()) - testValAggregationTemporality := AggregationTemporalityCumulative + assert.EqualValues(t, MetricAggregationTemporalityUnspecified, ms.AggregationTemporality()) + testValAggregationTemporality := MetricAggregationTemporalityCumulative ms.SetAggregationTemporality(testValAggregationTemporality) assert.EqualValues(t, testValAggregationTemporality, ms.AggregationTemporality()) } @@ -1411,7 +1411,7 @@ func generateTestSum() Sum { } func fillTestSum(tv Sum) { - tv.SetAggregationTemporality(AggregationTemporalityCumulative) + tv.SetAggregationTemporality(MetricAggregationTemporalityCumulative) tv.SetIsMonotonic(true) fillTestNumberDataPointSlice(tv.DataPoints()) } @@ -1423,7 +1423,7 @@ func generateTestHistogram() Histogram { } func fillTestHistogram(tv Histogram) { - tv.SetAggregationTemporality(AggregationTemporalityCumulative) + tv.SetAggregationTemporality(MetricAggregationTemporalityCumulative) fillTestHistogramDataPointSlice(tv.DataPoints()) } diff --git a/model/pdata/metrics.go b/model/pdata/metrics.go index 1d18fb6ec5df..850ac444dcca 100644 --- a/model/pdata/metrics.go +++ b/model/pdata/metrics.go @@ -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() } diff --git a/model/pdata/metrics_test.go b/model/pdata/metrics_test.go index 321426ef14ea..23a5a88109c2 100644 --- a/model/pdata/metrics_test.go +++ b/model/pdata/metrics_test.go @@ -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 @@ -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 @@ -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)) @@ -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())