Add observability report wrapper for scrapers and use it everywhere (#1276)

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

Author: bogdandrutu

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

@@ -20,7 +20,6 @@ import (
 
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/host"
-	"go.opencensus.io/trace"
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 )
@@ -53,10 +52,7 @@ func (s *scraper) Close(_ context.Context) error {
 }
 
 // ScrapeMetrics
-func (s *scraper) ScrapeMetrics(ctx context.Context) (pdata.MetricSlice, error) {
-	_, span := trace.StartSpan(ctx, "cpuscraper.ScrapeMetrics")
-	defer span.End()
-
+func (s *scraper) ScrapeMetrics(_ context.Context) (pdata.MetricSlice, error) {
 	metrics := pdata.NewMetricSlice()
 
 	cpuTimes, err := cpu.Times(s.config.ReportPerCPU)

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

@@ -20,6 +20,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
+	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/obsreportscraper"
 )
 
 // This file implements Factory for CPU scraper.
@@ -45,5 +46,5 @@ func (f *Factory) CreateMetricsScraper(
 	config internal.Config,
 ) (internal.Scraper, error) {
 	cfg := config.(*Config)
-	return newCPUScraper(ctx, cfg), nil
+	return obsreportscraper.WrapScraper(newCPUScraper(ctx, cfg), TypeStr), nil
 }

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

@@ -20,7 +20,6 @@ import (
 
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/host"
-	"go.opencensus.io/trace"
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 )
@@ -53,10 +52,7 @@ func (s *scraper) Close(_ context.Context) error {
 }
 
 // ScrapeMetrics
-func (s *scraper) ScrapeMetrics(ctx context.Context) (pdata.MetricSlice, error) {
-	_, span := trace.StartSpan(ctx, "diskscraper.ScrapeMetrics")
-	defer span.End()
-
+func (s *scraper) ScrapeMetrics(_ context.Context) (pdata.MetricSlice, error) {
 	metrics := pdata.NewMetricSlice()
 
 	ioCounters, err := disk.IOCounters()

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

@@ -20,6 +20,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
+	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/obsreportscraper"
 )
 
 // This file implements Factory for Disk scraper.
@@ -45,5 +46,5 @@ func (f *Factory) CreateMetricsScraper(
 	config internal.Config,
 ) (internal.Scraper, error) {
 	cfg := config.(*Config)
-	return newDiskScraper(ctx, cfg), nil
+	return obsreportscraper.WrapScraper(newDiskScraper(ctx, cfg), TypeStr), nil
 }

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

@@ -20,6 +20,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
+	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/obsreportscraper"
 )
 
 // This file implements Factory for FileSystem scraper.
@@ -50,5 +51,5 @@ func (f *Factory) CreateMetricsScraper(
 	config internal.Config,
 ) (internal.Scraper, error) {
 	cfg := config.(*Config)
-	return newFileSystemScraper(ctx, cfg), nil
+	return obsreportscraper.WrapScraper(newFileSystemScraper(ctx, cfg), TypeStr), nil
 }

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

@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/shirou/gopsutil/disk"
-	"go.opencensus.io/trace"
 
 	"go.opentelemetry.io/collector/component/componenterror"
 	"go.opentelemetry.io/collector/consumer/pdata"
@@ -51,16 +50,11 @@ func (s *scraper) Close(_ context.Context) error {
 }
 
 // ScrapeMetrics
-func (s *scraper) ScrapeMetrics(ctx context.Context) (pdata.MetricSlice, error) {
-	_, span := trace.StartSpan(ctx, "filesystemscraper.ScrapeMetrics")
-	defer span.End()
-
+func (s *scraper) ScrapeMetrics(_ context.Context) (pdata.MetricSlice, error) {
 	metrics := pdata.NewMetricSlice()
 
 	// omit logical (virtual) filesystems (not relevant for windows)
-	all := false
-
-	partitions, err := disk.Partitions(all)
+	partitions, err := disk.Partitions( /*all=*/ false)
 	if err != nil {
 		return metrics, err
 	}

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

@@ -20,6 +20,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
+	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/obsreportscraper"
 )
 
 // This file implements Factory for Load scraper.
@@ -45,5 +46,5 @@ func (f *Factory) CreateMetricsScraper(
 	config internal.Config,
 ) (internal.Scraper, error) {
 	cfg := config.(*Config)
-	return newLoadScraper(ctx, logger, cfg), nil
+	return obsreportscraper.WrapScraper(newLoadScraper(ctx, logger, cfg), TypeStr), nil
 }

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

@@ -18,7 +18,6 @@ import (
 	"context"
 	"time"
 
-	"go.opencensus.io/trace"
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/consumer/pdata"
@@ -46,10 +45,7 @@ func (s *scraper) Close(ctx context.Context) error {
 }
 
 // ScrapeMetrics
-func (s *scraper) ScrapeMetrics(ctx context.Context) (pdata.MetricSlice, error) {
-	_, span := trace.StartSpan(ctx, "loadscraper.ScrapeMetrics")
-	defer span.End()
-
+func (s *scraper) ScrapeMetrics(_ context.Context) (pdata.MetricSlice, error) {
 	metrics := pdata.NewMetricSlice()
 
 	avgLoadValues, err := getSampledLoadAverages()

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

@@ -20,6 +20,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal"
+	"go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/obsreportscraper"
 )
 
 // This file implements Factory for Memory scraper.
@@ -45,5 +46,5 @@ func (f *Factory) CreateMetricsScraper(
 	config internal.Config,
 ) (internal.Scraper, error) {
 	cfg := config.(*Config)
-	return newMemoryScraper(ctx, cfg), nil
+	return obsreportscraper.WrapScraper(newMemoryScraper(ctx, cfg), TypeStr), nil
 }

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

@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/shirou/gopsutil/mem"
-	"go.opencensus.io/trace"
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 )
@@ -45,10 +44,7 @@ func (s *scraper) Close(_ context.Context) error {
 }
 
 // ScrapeMetrics
-func (s *scraper) ScrapeMetrics(ctx context.Context) (pdata.MetricSlice, error) {
-	_, span := trace.StartSpan(ctx, "memoryscraper.ScrapeMetrics")
-	defer span.End()
-
+func (s *scraper) ScrapeMetrics(_ context.Context) (pdata.MetricSlice, error) {
 	metrics := pdata.NewMetricSlice()
 
 	memInfo, err := mem.VirtualMemory()