mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 21:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #13177 from bboreham/less-madness

Browse source 
scrape: consistent function names for metadata
This commit is contained in:
Bryan Boreham 2023-12-19 17:51:52 +00:00 committed by GitHub
parent 5d5303c746 34676a240e
commit 99c17b4319
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scrape/metrics.go
View file

@ -286,8 +286,8 @@ func (mc *MetadataMetricsCollector) Collect(ch chan<- prometheus.Metric) {
for tset, targets := range mc.TargetsGatherer.TargetsActive() { for tset, targets := range mc.TargetsGatherer.TargetsActive() {
var size, length int var size, length int
for _, t := range targets { for _, t := range targets {
size += t.MetadataSize() size += t.SizeMetadata()
length += t.MetadataLength() length += t.LengthMetadata()
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(

10
scrape/target.go
View file

@ -92,7 +92,7 @@ type MetricMetadata struct {
Unit string Unit string
} }
func (t *Target) MetadataList() []MetricMetadata { func (t *Target) ListMetadata() []MetricMetadata {
t.mtx.RLock() t.mtx.RLock()
defer t.mtx.RUnlock() defer t.mtx.RUnlock()
@ -102,7 +102,7 @@ func (t *Target) MetadataList() []MetricMetadata {
return t.metadata.ListMetadata() return t.metadata.ListMetadata()
} }
func (t *Target) MetadataSize() int { func (t *Target) SizeMetadata() int {
t.mtx.RLock() t.mtx.RLock()
defer t.mtx.RUnlock() defer t.mtx.RUnlock()
@ -113,7 +113,7 @@ func (t *Target) MetadataSize() int {
return t.metadata.SizeMetadata() return t.metadata.SizeMetadata()
} }
func (t *Target) MetadataLength() int { func (t *Target) LengthMetadata() int {
t.mtx.RLock() t.mtx.RLock()
defer t.mtx.RUnlock() defer t.mtx.RUnlock()
@ -124,8 +124,8 @@ func (t *Target) MetadataLength() int {
return t.metadata.LengthMetadata() return t.metadata.LengthMetadata()
} }
// Metadata returns type and help metadata for the given metric. // GetMetadata returns type and help metadata for the given metric.
func (t *Target) Metadata(metric string) (MetricMetadata, bool) { func (t *Target) GetMetadata(metric string) (MetricMetadata, bool) {
t.mtx.RLock() t.mtx.RLock()
defer t.mtx.RUnlock() defer t.mtx.RUnlock()

2
storage/remote/metadata_watcher.go
View file

@ -136,7 +136,7 @@ func (mw *MetadataWatcher) collect() {
metadata := []scrape.MetricMetadata{} metadata := []scrape.MetricMetadata{}
for _, tset := range mw.manager.TargetsActive() { for _, tset := range mw.manager.TargetsActive() {
for _, target := range tset { for _, target := range tset {
for _, entry := range target.MetadataList() { for _, entry := range target.ListMetadata() {
if _, ok := metadataSet[entry]; !ok { if _, ok := metadataSet[entry]; !ok {
metadata = append(metadata, entry) metadata = append(metadata, entry)
metadataSet[entry] = struct{}{} metadataSet[entry] = struct{}{}

8
web/api/v1/api.go
View file

@ -1114,7 +1114,7 @@ func (api *API) targetMetadata(r *http.Request) apiFuncResult {
} }
// If no metric is specified, get the full list for the target. // If no metric is specified, get the full list for the target.
if metric == "" { if metric == "" {
for _, md := range t.MetadataList() { for _, md := range t.ListMetadata() {
res = append(res, metricMetadata{ res = append(res, metricMetadata{
Target: t.Labels(), Target: t.Labels(),
Metric: md.Metric, Metric: md.Metric,
@ -1126,7 +1126,7 @@ func (api *API) targetMetadata(r *http.Request) apiFuncResult {
continue continue
} }
// Get metadata for the specified metric. // Get metadata for the specified metric.
if md, ok := t.Metadata(metric); ok { if md, ok := t.GetMetadata(metric); ok {
res = append(res, metricMetadata{ res = append(res, metricMetadata{
Target: t.Labels(), Target: t.Labels(),
Type: md.Type, Type: md.Type,
@ -1249,7 +1249,7 @@ func (api *API) metricMetadata(r *http.Request) apiFuncResult {
for _, tt := range api.targetRetriever(r.Context()).TargetsActive() { for _, tt := range api.targetRetriever(r.Context()).TargetsActive() {
for _, t := range tt { for _, t := range tt {
if metric == "" { if metric == "" {
for _, mm := range t.MetadataList() { for _, mm := range t.ListMetadata() {
m := metadata{Type: mm.Type, Help: mm.Help, Unit: mm.Unit} m := metadata{Type: mm.Type, Help: mm.Help, Unit: mm.Unit}
ms, ok := metrics[mm.Metric] ms, ok := metrics[mm.Metric]
@ -1266,7 +1266,7 @@ func (api *API) metricMetadata(r *http.Request) apiFuncResult {
continue continue
} }
if md, ok := t.Metadata(metric); ok { if md, ok := t.GetMetadata(metric); ok {
m := metadata{Type: md.Type, Help: md.Help, Unit: md.Unit} m := metadata{Type: md.Type, Help: md.Help, Unit: md.Unit}
ms, ok := metrics[md.Metric] ms, ok := metrics[md.Metric]