Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions metrics/prometheus/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ func (g *Gatherer) Gather() (mfs []*dto.MetricFamily, err error) {
}

var (
errMetricSkip = errors.New("metric skipped")
errMetricSkip = errors.New("metric skipped")
errMetricTypeNotSupported = errors.New("metric type is not supported")
)

func ptrTo[T any](x T) *T { return &x }
Expand Down Expand Up @@ -197,7 +198,10 @@ func metricFamily(registry Registry, name string) (mf *dto.MetricFamily, err err
},
}},
}, nil
case metrics.GaugeInfo:
// TODO(qdm12) handle this somehow maybe with dto.MetricType_UNTYPED
return nil, fmt.Errorf("%w: %q is a %T", errMetricSkip, name, metric)
default:
return nil, fmt.Errorf("metric %q: type is not supported: %T", name, metric)
return nil, fmt.Errorf("%w: metric %q type %T", errMetricTypeNotSupported, name, metric)
}
}
4 changes: 2 additions & 2 deletions metrics/prometheus/prometheus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ func TestGatherer_Gather(t *testing.T) {
}
assert.Equal(t, want, familyStrings)

register(t, "unsupported", metrics.NewGaugeInfo())
register(t, "unsupported", metrics.NewHealthcheck(nil))
families, err = gatherer.Gather()
assert.EqualError(t, err, "metric \"unsupported\": type is not supported: *metrics.StandardGaugeInfo")
assert.ErrorIs(t, err, errMetricTypeNotSupported)
assert.Empty(t, families)
}
Loading