From 2008dc5b239872a76202b92a4bd34dccc84d06ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Tue, 3 Sep 2024 10:11:58 +0200 Subject: [PATCH] collector: Skip collecting performance data if the enabled collectors don't request any. (#1604) --- .github/workflows/pr-check.yaml | 2 +- pkg/collector/collector.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index e6fd2d06e..3c7e3f14f 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -37,7 +37,7 @@ jobs: - name: check run: | PR_TITLE_PREFIX=$(echo "$PR_TITLE" | cut -d':' -f1) - if [[ -d "pkg/collector/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then + if [[ -d "pkg/collector/$PR_TITLE_PREFIX" ]] ||[[ -d "pkg/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then exit 0 fi diff --git a/pkg/collector/collector.go b/pkg/collector/collector.go index ee9b4fc10..d4b86593f 100644 --- a/pkg/collector/collector.go +++ b/pkg/collector/collector.go @@ -207,6 +207,10 @@ func (c *Collectors) Build(logger log.Logger) error { // PrepareScrapeContext creates a ScrapeContext to be used during a single scrape. func (c *Collectors) PrepareScrapeContext() (*types.ScrapeContext, error) { + if c.perfCounterQuery == "" { // if perfCounterQuery is empty, no perf counters are needed. + return &types.ScrapeContext{}, nil + } + objs, err := perflib.GetPerflibSnapshot(c.perfCounterQuery) if err != nil { return nil, err