From d16e3b963eeb8eeacc44ebc12b8d9b97cc153aa4 Mon Sep 17 00:00:00 2001 From: Arun Mahendra Date: Thu, 12 May 2022 14:56:08 -0400 Subject: [PATCH] removed the use of deprecated go.opentelemetry.io/collector/model --- exporter/prometheusexporter/collector.go | 3 +-- exporter/prometheusexporter/collector_test.go | 3 +-- exporter/prometheusexporter/go.mod | 1 - exporter/prometheusexporter/go.sum | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/exporter/prometheusexporter/collector.go b/exporter/prometheusexporter/collector.go index a5848e192a207..7aff5e84b04e9 100644 --- a/exporter/prometheusexporter/collector.go +++ b/exporter/prometheusexporter/collector.go @@ -20,7 +20,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -223,7 +222,7 @@ func (c *collector) convertDoubleHistogram(metric pmetric.Metric, resourceAttrs e := ip.Exemplars().At(i) labels := make(prometheus.Labels, e.FilteredAttributes().Len()) - e.FilteredAttributes().Range(func(k string, v pdata.Value) bool { + e.FilteredAttributes().Range(func(k string, v pcommon.Value) bool { labels[k] = v.AsString() return true }) diff --git a/exporter/prometheusexporter/collector_test.go b/exporter/prometheusexporter/collector_test.go index b817789178ec8..14c8b24613f73 100644 --- a/exporter/prometheusexporter/collector_test.go +++ b/exporter/prometheusexporter/collector_test.go @@ -21,7 +21,6 @@ import ( "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -139,7 +138,7 @@ func TestConvertDoubleHistogramExemplar(t *testing.T) { for k, v := range e.Labels { pde.FilteredAttributes().InsertString(k, v) } - pde.SetTimestamp(pdata.NewTimestampFromTime(e.Timestamp)) + pde.SetTimestamp(pcommon.NewTimestampFromTime(e.Timestamp)) } pMap := pcommon.NewMap() diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index f617ad721ba80..f3ca5215e3448 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -12,7 +12,6 @@ require ( github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731 github.com/stretchr/testify v1.7.1 go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 - go.opentelemetry.io/collector/model v0.50.0 go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 go.opentelemetry.io/collector/semconv v0.50.1-0.20220429151328-041f39835df7 go.uber.org/zap v1.21.0 diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index aa10bf4e3770c..a9b7356da6d98 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -1263,8 +1263,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.0/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc=