Skip to content

Commit

Permalink
Update exporters/prometheus/exporter.go
Browse files Browse the repository at this point in the history
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
  • Loading branch information
fatsheep9146 and MrAlias committed Dec 2, 2022
1 parent 3484326 commit e1aaaeb
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion exporters/prometheus/exporter.go
Expand Up @@ -391,7 +391,12 @@ func validateMetrics(name, description string, metricType *dto.MetricType, mfs m
if emf.GetType() != *metricType && (emf.GetType() == dto.MetricType_HISTOGRAM || *metricType == dto.MetricType_HISTOGRAM) {
return false, ""
}
global.Info(fmt.Sprintf("the description %q of instrument %q conflicts with existing description %q, overriding with existing one", description, name, emf.GetHelp()))
global.Info(
"Instrument description conflict, using existing",
"instrument", name,
"existing", emf.GetHelp(),
"dropped", description,
)
return false, emf.GetHelp()
}
if emf.GetType() != *metricType {
Expand Down

0 comments on commit e1aaaeb

Please sign in to comment.