From 70244cc6581427f276a9f45a890a8a2d9e336ef4 Mon Sep 17 00:00:00 2001 From: Kazunori Otani Date: Fri, 8 Dec 2023 18:32:02 +0900 Subject: [PATCH 1/2] fix scraper code --- .../8-develop/5-business-logic.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md b/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md index ee2eee3edb..0be480bc4a 100644 --- a/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md +++ b/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md @@ -45,7 +45,7 @@ import ( ) type scraper struct { - mb *metadata.Metricsbuilder + mb *metadata.MetricsBuilder client *jenkins.Jenkins } @@ -57,8 +57,8 @@ func newScraper(cfg *Config, set receiver.CreateSettings) (scraperhelper.Scraper return scraperhelper.NewScraper( metadata.Type, s.scrape, - scarperhelper.WithStart(func(ctx context.Context, h component.Host) error { - client, err := cfg.ToClient(h, set) + scraperhelper.WithStart(func(ctx context.Context, h component.Host) error { + client, err := cfg.ToClient(h, set.TelemetrySettings) if err != nil { return err } @@ -68,11 +68,11 @@ func newScraper(cfg *Config, set receiver.CreateSettings) (scraperhelper.Scraper s.client = jenkins.NewJenkins(nil, cfg.Endpoint) s.client.SetHTTPClient(client) return nil - }) + }), ) } -func (scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { +func (s scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { // To be filled in return pmetric.NewMetrics(), nil } @@ -118,7 +118,7 @@ there was. Within this step, we are going to examine each job and use the report to capture metrics. ```go -func (s scrape) scrape(ctx context.Context) (pmetric.Metrics, error) { +func (s scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { jobs, err := s.client.GetJobs() if err != nil { return pmetric.Metrics{}, err @@ -171,7 +171,7 @@ The final step is to calculate how long it took from commit to job completion to help infer our DORA metrics. ```go -func (s scrape) scrape(ctx context.Context) (pmetric.Metrics, error) { +func (s scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { jobs, err := s.client.GetJobs() if err != nil { return pmetric.Metrics{}, err From cc216c90468d96787f70ac114db0e6aef100a687 Mon Sep 17 00:00:00 2001 From: Kazunori Otani Date: Fri, 8 Dec 2023 18:36:38 +0900 Subject: [PATCH 2/2] fix --- .../other/opentelemetry-collector/8-develop/5-business-logic.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md b/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md index 0be480bc4a..a078b98409 100644 --- a/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md +++ b/content/en/other/opentelemetry-collector/8-develop/5-business-logic.md @@ -91,7 +91,7 @@ and measure of many projects have onboarded. To do this we will call the jenkins and if it reports an error, return that with no metrics, otherwise, emit the data from the metric builder. ```go -func (s scrape) scrape(ctx context.Context) (pmetric.Metrics, error) { +func (s scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { jobs, err := s.client.GetJobs() if err != nil { return pmetric.Metrics{}, err