Move scraper error outside of phase1 stable packages

Signed-off-by: Bogdan Drutu <[email protected]>

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Remove `consumerdata.TraceData` (#2551)
 - Move `consumerdata.MetricsData` to `internaldata.MetricsData` (#2512)
 - Remove custom OpenCensus sematic conventions that have equivalent in otel (#2552)
+- Move ScrapeErrors and PartialScrapeError to `scraperhelper` (#2580)
 
 ## v0.21.0 Beta
 

obsreport/obsreport_scraper.go

@@ -23,7 +23,7 @@ import (
 
 	"go.opentelemetry.io/collector/config/configmodels"
 	"go.opentelemetry.io/collector/config/configtelemetry"
-	"go.opentelemetry.io/collector/consumer/consumererror"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const (
@@ -100,7 +100,7 @@ func EndMetricsScrapeOp(
 ) {
 	numErroredMetrics := 0
 	if err != nil {
-		if partialErr, isPartial := err.(consumererror.PartialScrapeError); isPartial {
+		if partialErr, isPartial := err.(scraperhelper.PartialScrapeError); isPartial {
 			numErroredMetrics = partialErr.Failed
 		} else {
 			numErroredMetrics = numScrapedMetrics

obsreport/obsreport_test.go

@@ -29,9 +29,9 @@ import (
 	"go.opencensus.io/trace"
 
 	"go.opentelemetry.io/collector/config/configtelemetry"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/obsreport"
 	"go.opentelemetry.io/collector/obsreport/obsreporttest"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const (
@@ -45,7 +45,7 @@ const (
 
 var (
 	errFake        = errors.New("errFake")
-	partialErrFake = consumererror.NewPartialScrapeError(errFake, 1)
+	partialErrFake = scraperhelper.NewPartialScrapeError(errFake, 1)
 )
 
 type receiveTestParams struct {

receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go

@@ -22,9 +22,9 @@ import (
 	"github.com/shirou/gopsutil/host"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const metricsLen = 1
@@ -60,7 +60,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) {
 	now := pdata.TimestampFromTime(time.Now())
 	cpuTimes, err := s.times( /*percpu=*/ true)
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	metrics.Resize(metricsLen)

receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go

@@ -25,10 +25,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape(t *testing.T) {
@@ -83,10 +83,10 @@ func TestScrape(t *testing.T) {
 			if test.expectedErr != "" {
 				assert.EqualError(t, err, test.expectedErr)
 
-				isPartial := consumererror.IsPartialScrapeError(err)
+				isPartial := scraperhelper.IsPartialScrapeError(err)
 				assert.True(t, isPartial)
 				if isPartial {
-					assert.Equal(t, 1, err.(consumererror.PartialScrapeError).Failed)
+					assert.Equal(t, 1, err.(scraperhelper.PartialScrapeError).Failed)
 				}
 
 				return

receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go

@@ -25,10 +25,10 @@ import (
 	"github.com/shirou/gopsutil/host"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/internal/processor/filterset"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const (
@@ -87,7 +87,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) {
 	now := pdata.TimestampFromTime(time.Now())
 	ioCounters, err := s.ioCounters()
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	// filter devices by name

receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/consumer/consumererror"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape_Others(t *testing.T) {
@@ -59,10 +59,10 @@ func TestScrape_Others(t *testing.T) {
 			_, err = scraper.scrape(context.Background())
 			assert.EqualError(t, err, test.expectedErr)
 
-			isPartial := consumererror.IsPartialScrapeError(err)
+			isPartial := scraperhelper.IsPartialScrapeError(err)
 			assert.True(t, isPartial)
 			if isPartial {
-				assert.Equal(t, metricsLen, err.(consumererror.PartialScrapeError).Failed)
+				assert.Equal(t, metricsLen, err.(scraperhelper.PartialScrapeError).Failed)
 			}
 		})
 	}

receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go

@@ -22,11 +22,11 @@ import (
 	"github.com/shirou/gopsutil/host"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/internal/processor/filterset"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/perfcounters"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const (
@@ -102,20 +102,20 @@ func (s *scraper) scrape(ctx context.Context) (pdata.MetricSlice, error) {
 
 	counters, err := s.perfCounterScraper.Scrape()
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	logicalDiskObject, err := counters.GetObject(logicalDisk)
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	// filter devices by name
 	logicalDiskObject.Filter(s.includeFS, s.excludeFS, false)
 
 	logicalDiskCounterValues, err := logicalDiskObject.GetValues(readsPerSec, writesPerSec, readBytesPerSec, writeBytesPerSec, idleTime, avgDiskSecsPerRead, avgDiskSecsPerWrite, queueLength)
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	if len(logicalDiskCounterValues) > 0 {

receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go

@@ -25,8 +25,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/perfcounters"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape_Error(t *testing.T) {
@@ -69,10 +69,10 @@ func TestScrape_Error(t *testing.T) {
 			_, err = scraper.scrape(context.Background())
 			assert.EqualError(t, err, test.expectedErr)
 
-			isPartial := consumererror.IsPartialScrapeError(err)
+			isPartial := scraperhelper.IsPartialScrapeError(err)
 			assert.True(t, isPartial)
 			if isPartial {
-				assert.Equal(t, metricsLen, err.(consumererror.PartialScrapeError).Failed)
+				assert.Equal(t, metricsLen, err.(scraperhelper.PartialScrapeError).Failed)
 			}
 		})
 	}

receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go

@@ -21,9 +21,9 @@ import (
 
 	"github.com/shirou/gopsutil/disk"
 
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const (
@@ -66,10 +66,10 @@ func (s *scraper) Scrape(_ context.Context) (pdata.MetricSlice, error) {
 	// omit logical (virtual) filesystems (not relevant for windows)
 	partitions, err := s.partitions( /*all=*/ false)
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
-	var errors consumererror.ScrapeErrors
+	var errors scraperhelper.ScrapeErrors
 	usages := make([]*deviceUsage, 0, len(partitions))
 	for _, partition := range partitions {
 		if !s.fsFilter.includePartition(partition) {
@@ -92,7 +92,7 @@ func (s *scraper) Scrape(_ context.Context) (pdata.MetricSlice, error) {
 
 	err = errors.Combine()
 	if err != nil && len(usages) == 0 {
-		err = consumererror.NewPartialScrapeError(err, metricsLen)
+		err = scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	return metrics, err

receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go

@@ -24,11 +24,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/internal/processor/filterset"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape(t *testing.T) {
@@ -197,10 +197,10 @@ func TestScrape(t *testing.T) {
 			if test.expectedErr != "" {
 				assert.Contains(t, err.Error(), test.expectedErr)
 
-				isPartial := consumererror.IsPartialScrapeError(err)
+				isPartial := scraperhelper.IsPartialScrapeError(err)
 				assert.True(t, isPartial)
 				if isPartial {
-					assert.Equal(t, metricsLen, err.(consumererror.PartialScrapeError).Failed)
+					assert.Equal(t, metricsLen, err.(scraperhelper.PartialScrapeError).Failed)
 				}
 
 				return

receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go

@@ -22,9 +22,9 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const metricsLen = 3
@@ -60,7 +60,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) {
 	now := pdata.TimestampFromTime(time.Now())
 	avgLoadValues, err := s.load()
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	metrics.Resize(metricsLen)

receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go

@@ -25,10 +25,10 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape(t *testing.T) {
@@ -64,10 +64,10 @@ func TestScrape(t *testing.T) {
 			if test.expectedErr != "" {
 				assert.EqualError(t, err, test.expectedErr)
 
-				isPartial := consumererror.IsPartialScrapeError(err)
+				isPartial := scraperhelper.IsPartialScrapeError(err)
 				assert.True(t, isPartial)
 				if isPartial {
-					assert.Equal(t, metricsLen, err.(consumererror.PartialScrapeError).Failed)
+					assert.Equal(t, metricsLen, err.(scraperhelper.PartialScrapeError).Failed)
 				}
 
 				return

receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go

@@ -20,9 +20,9 @@ import (
 
 	"github.com/shirou/gopsutil/mem"
 
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const metricsLen = 1
@@ -47,7 +47,7 @@ func (s *scraper) Scrape(_ context.Context) (pdata.MetricSlice, error) {
 	now := pdata.TimestampFromTime(time.Now())
 	memInfo, err := s.virtualMemory()
 	if err != nil {
-		return metrics, consumererror.NewPartialScrapeError(err, metricsLen)
+		return metrics, scraperhelper.NewPartialScrapeError(err, metricsLen)
 	}
 
 	metrics.Resize(metricsLen)

receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go

@@ -24,10 +24,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape(t *testing.T) {
@@ -59,10 +59,10 @@ func TestScrape(t *testing.T) {
 			if test.expectedErr != "" {
 				assert.EqualError(t, err, test.expectedErr)
 
-				isPartial := consumererror.IsPartialScrapeError(err)
+				isPartial := scraperhelper.IsPartialScrapeError(err)
 				assert.True(t, isPartial)
 				if isPartial {
-					assert.Equal(t, metricsLen, err.(consumererror.PartialScrapeError).Failed)
+					assert.Equal(t, metricsLen, err.(scraperhelper.PartialScrapeError).Failed)
 				}
 
 				return

receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go

@@ -23,10 +23,10 @@ import (
 	"github.com/shirou/gopsutil/net"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/internal/processor/filterset"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 const (
@@ -83,7 +83,7 @@ func (s *scraper) start(context.Context, component.Host) error {
 func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) {
 	metrics := pdata.NewMetricSlice()
 
-	var errors consumererror.ScrapeErrors
+	var errors scraperhelper.ScrapeErrors
 
 	err := s.scrapeAndAppendNetworkCounterMetrics(metrics, s.startTime)
 	if err != nil {

receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go

@@ -24,11 +24,11 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/internal/processor/filterset"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata"
+	"go.opentelemetry.io/collector/receiver/scraperhelper"
 )
 
 func TestScrape(t *testing.T) {
@@ -122,10 +122,10 @@ func TestScrape(t *testing.T) {
 			if test.expectedErr != "" {
 				assert.EqualError(t, err, test.expectedErr)
 
-				isPartial := consumererror.IsPartialScrapeError(err)
+				isPartial := scraperhelper.IsPartialScrapeError(err)
 				assert.True(t, isPartial)
 				if isPartial {
-					assert.Equal(t, test.expectedErrCount, err.(consumererror.PartialScrapeError).Failed)
+					assert.Equal(t, test.expectedErrCount, err.(scraperhelper.PartialScrapeError).Failed)
 				}
 
 				return