diff --git a/CHANGELOG.md b/CHANGELOG.md index b9056d019b9..f9506cf8c77 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/obsreport/obsreport_scraper.go b/obsreport/obsreport_scraper.go index ee02acb78a8..dad920d2e37 100644 --- a/obsreport/obsreport_scraper.go +++ b/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 diff --git a/obsreport/obsreport_test.go b/obsreport/obsreport_test.go index 59733c72fc5..8495cf9c4d4 100644 --- a/obsreport/obsreport_test.go +++ b/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 { diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go index 3e6fec28f0b..97e0e76a890 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go +++ b/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) diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go index 38af8be4cb0..154256e9688 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go index 9cbb7c01dbd..7fe4054d3be 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go index 516e233e634..80f1fe203c1 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go +++ b/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) } }) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go index f35fe98cf1d..6c655b34780 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go +++ b/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,12 +102,12 @@ 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 @@ -115,7 +115,7 @@ func (s *scraper) scrape(ctx context.Context) (pdata.MetricSlice, error) { 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 { diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go index e6940fda432..6bc7dcbbb81 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go +++ b/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) } }) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go index efb37da1452..924f31c6d90 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go index 7e92ca82554..463ffb6199b 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go index 689c61133f2..4eeb2607d5c 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go +++ b/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) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go index 89d1548bff8..d43bc67b186 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go index b35711bb784..2b78e925d30 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go +++ b/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) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go index 8b2b1a6a0c7..b4893f320c8 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go index b402b991f5c..6073bcf986f 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go +++ b/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 { diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go index 501cf9a77b8..8941bc663d4 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go +++ b/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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go index 349a3e6d666..0e11a1d8679 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go @@ -24,9 +24,9 @@ import ( "github.com/shirou/gopsutil/mem" "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 ( @@ -63,7 +63,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.scrapeAndAppendPagingUsageMetric(metrics) if err != nil { diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go index 7688d336f3c..4535a00ad9c 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_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_Errors(t *testing.T) { @@ -76,10 +76,10 @@ func TestScrape_Errors(t *testing.T) { _, err = scraper.scrape(context.Background()) assert.EqualError(t, err, test.expectedError) - 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) } }) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go index de17dd46074..6288aa985e6 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go @@ -24,10 +24,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/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/perfcounters" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) const ( @@ -80,7 +80,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.scrapeAndAppendPagingUsageMetric(metrics) if err != nil { diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go index cd06bd0281b..31950eea66d 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_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_Errors(t *testing.T) { @@ -110,10 +110,10 @@ func TestScrape_Errors(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 diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go index ba7e609e83d..e8ae32faee3 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_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) { @@ -75,10 +75,10 @@ func TestScrape(t *testing.T) { if (expectProcessesCountMetric || expectProcessesCreatedMetric) && 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, expectedMetricCount, err.(consumererror.PartialScrapeError).Failed) + assert.Equal(t, expectedMetricCount, err.(scraperhelper.PartialScrapeError).Failed) } return diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go index 70cff619f6b..a0b47e14cdd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go @@ -21,9 +21,9 @@ import ( "github.com/shirou/gopsutil/load" - "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 ( @@ -35,7 +35,7 @@ func appendSystemSpecificProcessesMetrics(metrics pdata.MetricSlice, startIndex now := pdata.TimestampFromTime(time.Now()) misc, err := miscFunc() if err != nil { - return consumererror.NewPartialScrapeError(err, unixMetricsLen) + return scraperhelper.NewPartialScrapeError(err, unixMetricsLen) } metrics.Resize(startIndex + unixMetricsLen) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go index b6fc8914793..fa8a2a5e4d5 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go @@ -24,10 +24,10 @@ import ( "github.com/shirou/gopsutil/process" "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 ( @@ -86,11 +86,11 @@ func (s *scraper) start(context.Context, component.Host) error { func (s *scraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice, error) { rms := pdata.NewResourceMetricsSlice() - var errs consumererror.ScrapeErrors + var errs scraperhelper.ScrapeErrors metadata, err := s.getProcessMetadata() if err != nil { - partialErr, isPartial := err.(consumererror.PartialScrapeError) + partialErr, isPartial := err.(scraperhelper.PartialScrapeError) if !isPartial { return rms, err } @@ -135,7 +135,7 @@ func (s *scraper) getProcessMetadata() ([]*processMetadata, error) { return nil, err } - var errs consumererror.ScrapeErrors + var errs scraperhelper.ScrapeErrors metadata := make([]*processMetadata, 0, handles.Len()) for i := 0; i < handles.Len(); i++ { diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go index 26ec9f81abc..79895a5bb9a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go @@ -28,11 +28,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" "go.opentelemetry.io/collector/translator/conventions" ) @@ -62,9 +62,9 @@ func TestScrape(t *testing.T) { // // so validate that we have at some errors & some valid data if err != nil { - require.True(t, consumererror.IsPartialScrapeError(err)) + require.True(t, scraperhelper.IsPartialScrapeError(err)) noProcessesScraped := resourceMetrics.Len() - noProcessesErrored := err.(consumererror.PartialScrapeError).Failed + noProcessesErrored := err.(scraperhelper.PartialScrapeError).Failed require.Lessf(t, 0, noProcessesErrored, "Failed to scrape metrics - : error, but 0 failed process %v", err) require.Lessf(t, 0, noProcessesScraped, "Failed to scrape metrics - : 0 successful scrapes %v", err) } @@ -174,7 +174,7 @@ func TestScrapeMetrics_GetProcessesError(t *testing.T) { metrics, err := scraper.scrape(context.Background()) assert.EqualError(t, err, "err1") assert.Equal(t, 0, metrics.Len()) - assert.False(t, consumererror.IsPartialScrapeError(err)) + assert.False(t, scraperhelper.IsPartialScrapeError(err)) } type processHandlesMock struct { @@ -447,11 +447,11 @@ func TestScrapeMetrics_ProcessErrors(t *testing.T) { assert.Equal(t, expectedMetricsLen, md.MetricCount()) assert.EqualError(t, err, test.expectedError) - isPartial := consumererror.IsPartialScrapeError(err) + isPartial := scraperhelper.IsPartialScrapeError(err) assert.True(t, isPartial) if isPartial { expectedFailures := getExpectedScrapeFailures(test.nameError, test.exeError, test.timesError, test.memoryInfoError, test.ioCountersError) - assert.Equal(t, expectedFailures, err.(consumererror.PartialScrapeError).Failed) + assert.Equal(t, expectedFailures, err.(scraperhelper.PartialScrapeError).Failed) } }) } diff --git a/consumer/consumererror/partialscrapeerror.go b/receiver/scraperhelper/partialscrapeerror.go similarity index 98% rename from consumer/consumererror/partialscrapeerror.go rename to receiver/scraperhelper/partialscrapeerror.go index a3980d3c0bf..31491565614 100644 --- a/consumer/consumererror/partialscrapeerror.go +++ b/receiver/scraperhelper/partialscrapeerror.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package consumererror +package scraperhelper import "errors" diff --git a/consumer/consumererror/partialscrapeerror_test.go b/receiver/scraperhelper/partialscrapeerror_test.go similarity index 98% rename from consumer/consumererror/partialscrapeerror_test.go rename to receiver/scraperhelper/partialscrapeerror_test.go index 58d6cae5bea..91542925aa3 100644 --- a/consumer/consumererror/partialscrapeerror_test.go +++ b/receiver/scraperhelper/partialscrapeerror_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package consumererror +package scraperhelper import ( "errors" diff --git a/consumer/consumererror/scrapeerrors.go b/receiver/scraperhelper/scrapeerrors.go similarity index 86% rename from consumer/consumererror/scrapeerrors.go rename to receiver/scraperhelper/scrapeerrors.go index 1bd0b6de12a..91be8bc87fe 100644 --- a/consumer/consumererror/scrapeerrors.go +++ b/receiver/scraperhelper/scrapeerrors.go @@ -12,7 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package consumererror +package scraperhelper + +import ( + "go.opentelemetry.io/collector/consumer/consumererror" +) // ScrapeErrors contains multiple PartialScrapeErrors and can also contain generic errors. type ScrapeErrors struct { @@ -42,8 +46,8 @@ func (s *ScrapeErrors) Combine() error { } if !partialScrapeErr { - return CombineErrors(s.errs) + return consumererror.CombineErrors(s.errs) } - return NewPartialScrapeError(CombineErrors(s.errs), s.failedScrapeCount) + return NewPartialScrapeError(consumererror.CombineErrors(s.errs), s.failedScrapeCount) } diff --git a/consumer/consumererror/scrapeerrors_test.go b/receiver/scraperhelper/scrapeerrors_test.go similarity index 99% rename from consumer/consumererror/scrapeerrors_test.go rename to receiver/scraperhelper/scrapeerrors_test.go index dd3c3df945e..b4471cfd720 100644 --- a/consumer/consumererror/scrapeerrors_test.go +++ b/receiver/scraperhelper/scrapeerrors_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package consumererror +package scraperhelper import ( "errors" diff --git a/receiver/scraperhelper/scrapercontroller.go b/receiver/scraperhelper/scrapercontroller.go index c0ea0409dc6..9127e9560e9 100644 --- a/receiver/scraperhelper/scrapercontroller.go +++ b/receiver/scraperhelper/scrapercontroller.go @@ -204,7 +204,7 @@ func (sc *controller) scrapeMetricsAndReport(ctx context.Context) { if err != nil { sc.logger.Error("Error scraping metrics", zap.Error(err)) - if !consumererror.IsPartialScrapeError(err) { + if !IsPartialScrapeError(err) { continue } } @@ -260,11 +260,11 @@ func (mms *multiMetricScraper) Scrape(ctx context.Context, receiverName string) ilms.Resize(1) ilm := ilms.At(0) - var errs consumererror.ScrapeErrors + var errs ScrapeErrors for _, scraper := range mms.scrapers { metrics, err := scraper.Scrape(ctx, receiverName) if err != nil { - partialErr, isPartial := err.(consumererror.PartialScrapeError) + partialErr, isPartial := err.(PartialScrapeError) if isPartial { errs.AddPartial(partialErr.Failed, partialErr) } diff --git a/receiver/scraperhelper/scrapercontroller_test.go b/receiver/scraperhelper/scrapercontroller_test.go index d8ebc78325e..eb48b9c7da3 100644 --- a/receiver/scraperhelper/scrapercontroller_test.go +++ b/receiver/scraperhelper/scrapercontroller_test.go @@ -387,7 +387,7 @@ func assertScraperViews(t *testing.T, expectedErr error, sink *consumertest.Metr expectedScraped := int64(sink.MetricsCount()) expectedErrored := int64(0) if expectedErr != nil { - if partialError, isPartial := expectedErr.(consumererror.PartialScrapeError); isPartial { + if partialError, isPartial := expectedErr.(PartialScrapeError); isPartial { expectedErrored = int64(partialError.Failed) } else { expectedScraped = int64(0)