diff --git a/retrieval/target.go b/retrieval/target.go index a1f875ff80..7c470e0bcc 100644 --- a/retrieval/target.go +++ b/retrieval/target.go @@ -174,7 +174,7 @@ type Target struct { // Labels before any processing. metaLabels model.LabelSet - // Any base labels that are added to this target and its metrics. + // Any labels that are added to this target and its metrics. labels model.LabelSet // The HTTP client used to scrape the target's endpoint. @@ -199,11 +199,11 @@ func (t *Target) Status() *TargetStatus { // Update overwrites settings in the target that are derived from the job config // it belongs to. -func (t *Target) Update(cfg *config.ScrapeConfig, baseLabels, metaLabels model.LabelSet) error { +func (t *Target) Update(cfg *config.ScrapeConfig, labels, metaLabels model.LabelSet) error { t.Lock() t.scrapeConfig = cfg - t.labels = baseLabels + t.labels = labels t.metaLabels = metaLabels t.Unlock() @@ -438,13 +438,13 @@ const acceptHeader = `application/vnd.google.protobuf;proto=io.prometheus.client func (t *Target) scrape(appender storage.SampleAppender) error { var ( - err error - start = time.Now() - baseLabels = t.BaseLabels() + err error + start = time.Now() + labels = t.Labels() ) defer func(appender storage.SampleAppender) { t.status.setLastError(err) - recordScrapeHealth(appender, start, baseLabels, t.status.Health(), time.Since(start)) + recordScrapeHealth(appender, start, labels, t.status.Health(), time.Since(start)) }(appender) t.RLock() @@ -460,12 +460,12 @@ func (t *Target) scrape(appender storage.SampleAppender) error { if t.scrapeConfig.HonorLabels { appender = honorLabelsAppender{ SampleAppender: appender, - labels: baseLabels, + labels: labels, } } else { appender = ruleLabelsAppender{ SampleAppender: appender, - labels: baseLabels, + labels: labels, } } @@ -585,8 +585,8 @@ func (app relabelAppender) Append(s *model.Sample) error { return app.SampleAppender.Append(s) } -// BaseLabels returns a copy of the target's base labels. -func (t *Target) BaseLabels() model.LabelSet { +// Labels returns a copy of the set of all public labels of the target. +func (t *Target) Labels() model.LabelSet { t.RLock() defer t.RUnlock() @@ -615,17 +615,17 @@ func (t *Target) MetaLabels() model.LabelSet { func recordScrapeHealth( sampleAppender storage.SampleAppender, timestamp time.Time, - baseLabels model.LabelSet, + labels model.LabelSet, health TargetHealth, scrapeDuration time.Duration, ) { - healthMetric := make(model.Metric, len(baseLabels)+1) - durationMetric := make(model.Metric, len(baseLabels)+1) + healthMetric := make(model.Metric, len(labels)+1) + durationMetric := make(model.Metric, len(labels)+1) healthMetric[model.MetricNameLabel] = scrapeHealthMetricName durationMetric[model.MetricNameLabel] = scrapeDurationMetricName - for ln, lv := range baseLabels { + for ln, lv := range labels { healthMetric[ln] = lv durationMetric[ln] = lv } diff --git a/retrieval/target_test.go b/retrieval/target_test.go index 214f98c83f..3a0ee88578 100644 --- a/retrieval/target_test.go +++ b/retrieval/target_test.go @@ -32,14 +32,14 @@ import ( "github.com/prometheus/prometheus/config" ) -func TestBaseLabels(t *testing.T) { +func TestTargetLabels(t *testing.T) { target := newTestTarget("example.com:80", 0, model.LabelSet{"job": "some_job", "foo": "bar"}) want := model.LabelSet{ model.JobLabel: "some_job", model.InstanceLabel: "example.com:80", "foo": "bar", } - got := target.BaseLabels() + got := target.Labels() if !reflect.DeepEqual(want, got) { t.Errorf("want base labels %v, got %v", want, got) } @@ -252,7 +252,7 @@ func TestTargetRecordScrapeHealth(t *testing.T) { now := model.Now() appender := &collectResultAppender{} testTarget.status.setLastError(nil) - recordScrapeHealth(appender, now.Time(), testTarget.BaseLabels(), testTarget.status.Health(), 2*time.Second) + recordScrapeHealth(appender, now.Time(), testTarget.Labels(), testTarget.status.Health(), 2*time.Second) result := appender.result diff --git a/retrieval/targetmanager.go b/retrieval/targetmanager.go index 4b859fb2f7..7d32f83c84 100644 --- a/retrieval/targetmanager.go +++ b/retrieval/targetmanager.go @@ -323,7 +323,7 @@ func (tm *TargetManager) Pools() map[string][]*Target { for _, ts := range tm.targets { for _, t := range ts { - job := string(t.BaseLabels()[model.JobLabel]) + job := string(t.Labels()[model.JobLabel]) pools[job] = append(pools[job], t) } } diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go index 2eb5d9d756..0bc2a964d4 100644 --- a/retrieval/targetmanager_test.go +++ b/retrieval/targetmanager_test.go @@ -188,7 +188,7 @@ func TestTargetManagerChan(t *testing.T) { for _, expt := range expTargets { found := false for _, actt := range actTargets { - if reflect.DeepEqual(expt, actt.BaseLabels()) { + if reflect.DeepEqual(expt, actt.Labels()) { found = true break }