Skip to content

Commit

Permalink
[receiver/hostmetrics/process_scraper] Rename metadata conflicting wi…
Browse files Browse the repository at this point in the history
…th the metrics package name

Signed-off-by: Idowu Emehinola <hydeenoble39@gmail.com>
  • Loading branch information
hydeenoble committed Mar 30, 2022
1 parent 3914f36 commit 2780bb2
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (s *scraper) start(context.Context, component.Host) error {
func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) {
var errs scrapererror.ScrapeErrors

metadata, err := s.getProcessMetadata()
data, err := s.getProcessMetadata()
if err != nil {
partialErr, isPartial := err.(scrapererror.PartialScrapeError)
if !isPartial {
Expand All @@ -94,7 +94,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) {
errs.AddPartial(partialErr.Failed, partialErr)
}

for _, md := range metadata {
for _, md := range data {
now := pdata.NewTimestampFromTime(time.Now())

if err = s.scrapeAndAppendCPUTimeMetric(now, md.handle); err != nil {
Expand Down Expand Up @@ -127,7 +127,7 @@ func (s *scraper) getProcessMetadata() ([]*processMetadata, error) {

var errs scrapererror.ScrapeErrors

metadata := make([]*processMetadata, 0, handles.Len())
data := make([]*processMetadata, 0, handles.Len())
for i := 0; i < handles.Len(); i++ {
pid := handles.Pid(i)
handle := handles.At(i)
Expand Down Expand Up @@ -164,10 +164,10 @@ func (s *scraper) getProcessMetadata() ([]*processMetadata, error) {
handle: handle,
}

metadata = append(metadata, md)
data = append(data, md)
}

return metadata, errs.Combine()
return data, errs.Combine()
}

func (s *scraper) scrapeAndAppendCPUTimeMetric(now pdata.Timestamp, handle processHandle) error {
Expand Down

0 comments on commit 2780bb2

Please sign in to comment.