Skip to content

fix: rename AggregationTemporality -> MetricAggregationTemporality #11

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
jacobmarble merged 1 commit into from
Sep 27, 2021
Merged

fix: rename AggregationTemporality -> MetricAggregationTemporality #11

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
2 changes: 1 addition & 1 deletion influx2otel/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.16
require (
github.com/influxdata/influxdb-observability/common v0.2.7
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector/model v0.35.0
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
)

replace github.com/influxdata/influxdb-observability/common => ../common
9 changes: 7 additions & 2 deletions influx2otel/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions influx2otel/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ func (b *MetricsBatch) lookupMetric(metricName string, tags map[string]string, v
case common.InfluxMetricValueTypeSum:
metric.SetDataType(pdata.MetricDataTypeSum)
metric.Sum().SetIsMonotonic(true)
metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
case common.InfluxMetricValueTypeHistogram:
metric.SetDataType(pdata.MetricDataTypeHistogram)
metric.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
metric.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
case common.InfluxMetricValueTypeSummary:
metric.SetDataType(pdata.MetricDataTypeSummary)
default:
Expand Down
10 changes: 5 additions & 5 deletions influx2otel/metrics_telegraf_prometheus_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func TestAddPoint_v1_sum(t *testing.T) {
m.SetName("http_requests_total")
m.SetDataType(pdata.MetricDataTypeSum)
m.Sum().SetIsMonotonic(true)
m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -223,7 +223,7 @@ func TestAddPoint_v1_untypedSum(t *testing.T) {
m.SetName("http_requests_total")
m.SetDataType(pdata.MetricDataTypeSum)
m.Sum().SetIsMonotonic(true)
m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -273,7 +273,7 @@ func TestAddPoint_v1_histogram(t *testing.T) {
m := ilMetrics.Metrics().AppendEmpty()
m.SetName("http_request_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -321,7 +321,7 @@ func TestAddPoint_v1_untypedHistogram(t *testing.T) {
m := ilMetrics.Metrics().AppendEmpty()
m.SetName("http_request_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -429,7 +429,7 @@ func TestAddPoint_v1_untypedSummary(t *testing.T) {
m := ilMetrics.Metrics().AppendEmpty()
m.SetName("rpc_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down
8 changes: 4 additions & 4 deletions influx2otel/metrics_telegraf_prometheus_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func TestAddPoint_v2_sum(t *testing.T) {
m.SetName("http_requests_total")
m.SetDataType(pdata.MetricDataTypeSum)
m.Sum().SetIsMonotonic(true)
m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -347,7 +347,7 @@ func TestAddPoint_v2_histogram(t *testing.T) {
m := ilMetrics.Metrics().AppendEmpty()
m.SetName("http_request_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -471,7 +471,7 @@ func TestAddPoint_v2_untypedHistogram(t *testing.T) {
m := ilMetrics.Metrics().AppendEmpty()
m.SetName("http_request_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -731,7 +731,7 @@ func TestAddPoint_v2_untypedSummary(t *testing.T) {
m := ilMetrics.Metrics().AppendEmpty()
m.SetName("rpc_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertString("code", "200")
dp.Attributes().InsertString("method", "post")
Expand Down
2 changes: 1 addition & 1 deletion otel2influx/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.16
require (
github.com/influxdata/influxdb-observability/common v0.2.7
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector/model v0.35.0
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
)

replace github.com/influxdata/influxdb-observability/common => ../common
9 changes: 7 additions & 2 deletions otel2influx/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions otel2influx/metrics_telegraf_prometheus_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (c *metricWriterTelegrafPrometheusV1) writeGauge(ctx context.Context, resou
}

func (c *metricWriterTelegrafPrometheusV1) writeSum(ctx context.Context, resource pdata.Resource, instrumentationLibrary pdata.InstrumentationLibrary, measurement string, sum pdata.Sum, w InfluxWriter) error {
if sum.AggregationTemporality() != pdata.AggregationTemporalityCumulative {
if sum.AggregationTemporality() != pdata.MetricAggregationTemporalityCumulative {
return fmt.Errorf("unsupported sum aggregation temporality %q", sum.AggregationTemporality())
}
if !sum.IsMonotonic() {
Expand Down Expand Up @@ -128,7 +128,7 @@ func (c *metricWriterTelegrafPrometheusV1) writeSum(ctx context.Context, resourc
}

func (c *metricWriterTelegrafPrometheusV1) writeHistogram(ctx context.Context, resource pdata.Resource, instrumentationLibrary pdata.InstrumentationLibrary, measurement string, histogram pdata.Histogram, w InfluxWriter) error {
if histogram.AggregationTemporality() != pdata.AggregationTemporalityCumulative {
if histogram.AggregationTemporality() != pdata.MetricAggregationTemporalityCumulative {
return fmt.Errorf("unsupported histogram aggregation temporality %q", histogram.AggregationTemporality())
}

Expand Down
4 changes: 2 additions & 2 deletions otel2influx/metrics_telegraf_prometheus_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestWriteMetric_v1_sum(t *testing.T) {
m.SetDescription("The total number of HTTP requests")
m.SetDataType(pdata.MetricDataTypeSum)
m.Sum().SetIsMonotonic(true)
m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertInt("code", 200)
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -155,7 +155,7 @@ func TestWriteMetric_v1_histogram(t *testing.T) {
m.SetName("http_request_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.SetDescription("A histogram of the request duration")
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertInt("code", 200)
dp.Attributes().InsertString("method", "post")
Expand Down
4 changes: 2 additions & 2 deletions otel2influx/metrics_telegraf_prometheus_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (c *metricWriterTelegrafPrometheusV2) writeGauge(ctx context.Context, resou
}

func (c *metricWriterTelegrafPrometheusV2) writeSum(ctx context.Context, resource pdata.Resource, instrumentationLibrary pdata.InstrumentationLibrary, measurement string, sum pdata.Sum, w InfluxWriter) error {
if sum.AggregationTemporality() != pdata.AggregationTemporalityCumulative {
if sum.AggregationTemporality() != pdata.MetricAggregationTemporalityCumulative {
return fmt.Errorf("unsupported sum aggregation temporality %q", sum.AggregationTemporality())
}
if !sum.IsMonotonic() {
Expand Down Expand Up @@ -127,7 +127,7 @@ func (c *metricWriterTelegrafPrometheusV2) writeSum(ctx context.Context, resourc
}

func (c *metricWriterTelegrafPrometheusV2) writeHistogram(ctx context.Context, resource pdata.Resource, instrumentationLibrary pdata.InstrumentationLibrary, measurement string, histogram pdata.Histogram, w InfluxWriter) error {
if histogram.AggregationTemporality() != pdata.AggregationTemporalityCumulative {
if histogram.AggregationTemporality() != pdata.MetricAggregationTemporalityCumulative {
return fmt.Errorf("unsupported histogram aggregation temporality %q", histogram.AggregationTemporality())
}

Expand Down
4 changes: 2 additions & 2 deletions otel2influx/metrics_telegraf_prometheus_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func TestWriteMetric_v2_sum(t *testing.T) {
m.SetDescription("The total number of HTTP requests")
m.SetDataType(pdata.MetricDataTypeSum)
m.Sum().SetIsMonotonic(true)
m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertInt("code", 200)
dp.Attributes().InsertString("method", "post")
Expand Down Expand Up @@ -156,7 +156,7 @@ func TestWriteMetric_v2_histogram(t *testing.T) {
m.SetName("http_request_duration_seconds")
m.SetDataType(pdata.MetricDataTypeHistogram)
m.SetDescription("A histogram of the request duration")
m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := m.Histogram().DataPoints().AppendEmpty()
dp.Attributes().InsertInt("code", 200)
dp.Attributes().InsertString("method", "post")
Expand Down
4 changes: 2 additions & 2 deletions tests-integration/influx2otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ swap,host=8eaaf6b73054 in=32768i,out=12021760i 1626302080000000000
metric.SetName("swap_in")
metric.SetDataType(pdata.MetricDataTypeSum)
metric.Sum().SetIsMonotonic(true)
metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp := metric.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertString("host", "8eaaf6b73054")
dp.SetTimestamp(pdata.Timestamp(1626302080000000000))
Expand All @@ -140,7 +140,7 @@ swap,host=8eaaf6b73054 in=32768i,out=12021760i 1626302080000000000
metric.SetName("swap_out")
metric.SetDataType(pdata.MetricDataTypeSum)
metric.Sum().SetIsMonotonic(true)
metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative)
dp = metric.Sum().DataPoints().AppendEmpty()
dp.Attributes().InsertString("host", "8eaaf6b73054")
dp.SetTimestamp(pdata.Timestamp(1626302080000000000))
Expand Down
Loading