From efb839321bc92b5eae671d9e7ef6f6e6a833a05c Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Mon, 28 Feb 2022 15:52:23 -0800 Subject: [PATCH 1/3] Removing deprecated Type functions These have been replaced with ValueType. --- model/pdata/metrics.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/model/pdata/metrics.go b/model/pdata/metrics.go index 9d5c6188260..341293562c8 100644 --- a/model/pdata/metrics.go +++ b/model/pdata/metrics.go @@ -245,13 +245,3 @@ func (mdt MetricValueType) String() string { } return "" } - -// Deprecated: [v0.45.0] Use ValueType instead. -func (ms NumberDataPoint) Type() MetricValueType { - return ms.ValueType() -} - -// Deprecated: [v0.45.0] Use ValueType instead. -func (ms Exemplar) Type() MetricValueType { - return ms.ValueType() -} From 3897abcbf430b5279c8ffc54fb02baeeb3349f9e Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Mon, 28 Feb 2022 15:55:20 -0800 Subject: [PATCH 2/3] add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 992d34abd47..87754dec6b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Deprecated `receiverhelper.NewFactory` in favour of `component.NewReceiverFactory` - Remove support for legacy otlp/http port. (#4916) - Remove deprecated funcs in pdata (#4809) +- Remove `Type` funcs in pdata (#4933) ### 💡 Enhancements 💡 From 10149d0e5cbb82b1e2c22f3a9ae11bd6a17ca50a Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Mon, 28 Feb 2022 16:25:01 -0800 Subject: [PATCH 3/3] fix tests --- model/pdata/metrics_test.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/model/pdata/metrics_test.go b/model/pdata/metrics_test.go index b49bd85a7a0..bfde1459250 100644 --- a/model/pdata/metrics_test.go +++ b/model/pdata/metrics_test.go @@ -661,18 +661,6 @@ func TestMetricsDataPointFlags(t *testing.T) { assert.Equal(t, "FLAG_NO_RECORDED_VALUE", gauge.DataPoints().At(0).Flags().String()) } -// TestNumberDataPointType tests deprecated NumberDataPoint.Type -func TestNumberDataPointType(t *testing.T) { - tv := NewNumberDataPoint() - assert.Equal(t, tv.ValueType(), tv.Type()) -} - -// TestExemplarType tests deprecated Exemplar.Type -func TestExemplarType(t *testing.T) { - tv := NewExemplar() - assert.Equal(t, tv.ValueType(), tv.Type()) -} - func BenchmarkMetricsClone(b *testing.B) { metrics := NewMetrics() fillTestResourceMetricsSlice(metrics.ResourceMetrics())