forked from open-telemetry/opentelemetry-collector
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add observability report wrapper for scrapers and use it everywhere (o…
…pen-telemetry#1276) Signed-off-by: Bogdan Drutu <[email protected]>
- Loading branch information
1 parent
af91be6
commit 741900a
Showing
25 changed files
with
357 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
receiver/hostmetricsreceiver/internal/scraper/obsreportscraper/common.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package obsreportscraper | ||
|
|
||
| func scrapeMetricsSpanName(typeStr string) string { | ||
| return typeStr + "scraper.ScrapeMetrics" | ||
| } |
39 changes: 39 additions & 0 deletions
39
receiver/hostmetricsreceiver/internal/scraper/obsreportscraper/common_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package obsreportscraper | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestSpanName(t *testing.T) { | ||
| scraperTypes := map[string]string{ | ||
| "cpu": "cpuscraper.ScrapeMetrics", | ||
| "disk": "diskscraper.ScrapeMetrics", | ||
| "load": "loadscraper.ScrapeMetrics", | ||
| "filesystem": "filesystemscraper.ScrapeMetrics", | ||
| "memory": "memoryscraper.ScrapeMetrics", | ||
| "network": "networkscraper.ScrapeMetrics", | ||
| "processes": "processesscraper.ScrapeMetrics", | ||
| "virtualmemory": "virtualmemoryscraper.ScrapeMetrics", | ||
| "process": "processscraper.ScrapeMetrics", | ||
| } | ||
|
|
||
| for typeStr, spanName := range scraperTypes { | ||
| assert.Equal(t, spanName, scrapeMetricsSpanName(typeStr)) | ||
| } | ||
| } |
56 changes: 56 additions & 0 deletions
56
receiver/hostmetricsreceiver/internal/scraper/obsreportscraper/obsreportresourcescraper.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package obsreportscraper | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "go.opencensus.io/trace" | ||
|
|
||
| "go.opentelemetry.io/collector/consumer/pdata" | ||
| "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" | ||
| ) | ||
|
|
||
| type resourceScraper struct { | ||
| delegate internal.ResourceScraper | ||
| scrapeMetricsSpanName string | ||
| } | ||
|
|
||
| // WrapResourceScraper wraps an internal.ResourceScraper and provides observability support. | ||
| func WrapResourceScraper(delegate internal.ResourceScraper, typeStr string) internal.ResourceScraper { | ||
| return &resourceScraper{delegate: delegate, scrapeMetricsSpanName: scrapeMetricsSpanName(typeStr)} | ||
| } | ||
|
|
||
| func (s *resourceScraper) Initialize(ctx context.Context) error { | ||
| return s.delegate.Initialize(ctx) | ||
| } | ||
|
|
||
| func (s *resourceScraper) Close(ctx context.Context) error { | ||
| return s.delegate.Close(ctx) | ||
| } | ||
|
|
||
| // ScrapeMetrics | ||
| func (s *resourceScraper) ScrapeMetrics(ctx context.Context) (pdata.ResourceMetricsSlice, error) { | ||
| // TODO: Add metrics. | ||
| ctx, span := trace.StartSpan(ctx, s.scrapeMetricsSpanName) | ||
| defer span.End() | ||
|
|
||
| rms, err := s.delegate.ScrapeMetrics(ctx) | ||
|
|
||
| if err != nil { | ||
| span.SetStatus(trace.Status{Code: trace.StatusCodeUnknown, Message: err.Error()}) | ||
| } | ||
| return rms, err | ||
| } |
Oops, something went wrong.