Convert remaining collectors to use ConstMetrics #389
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| c.metric.Set(now) | ||
| c.metric.Collect(ch) | ||
| return err | ||
| ch <- prometheus.MustNewConstMetric(c.desc, prometheus.CounterValue, now) |
There was a problem hiding this comment.
It was a counter before.. But yeah I remember we discussed that timestamps should be gauges. Will change.
| }, nil | ||
| } | ||
|
|
||
| func (c *timeCollector) Update(ch chan<- prometheus.Metric) (err error) { | ||
| func (c *timeCollector) Update(ch chan<- prometheus.Metric) error { | ||
| now := float64(time.Now().Unix()) | ||
| log.Debugf("Set time: %f", now) |
| @@ -61,8 +49,7 @@ func (c *loadavgCollector) Update(ch chan<- prometheus.Metric) (err error) { | |||
| } | |||
| for i, load := range loads { | |||
| log.Debugf("Set load %d: %f", i, load) | |||
There was a problem hiding this comment.
What needs updating? You want me to remove that debug line?
| } | ||
| } | ||
| /* |
| prometheus.NewDesc("node_ipvs_backend_weight", "The current backend weight by local and remote address.", []string{"local_address", "local_port", "remote_address", "remote_port", "proto"}, nil).String(): (<-sink).Desc().String(), | ||
| } { | ||
| if expected != got { | ||
| log.Fatalf("Expected '%s' but got '%s'", expected, got) |
There was a problem hiding this comment.
This should be using t rather than log
| @@ -40,7 +40,7 @@ var ( | |||
|
|
|||
| type diskstatsCollector struct { | |||
| ignoredDevicesPattern *regexp.Regexp | |||
| metrics []prometheus.Collector | |||
| metrics []typedDesc | |||
There was a problem hiding this comment.
descs would be clearer
discordianfish
force-pushed
the
fish-use-const-metrics
branch
from
cf6dcc3
to
5bbfa65
Compare
|
Amazing work! 👏 |
|
@brian-brazil Fixed your comments |
discordianfish
force-pushed
the
fish-use-const-metrics
branch
from
5bbfa65
to
8e50b80
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I didn't touch the gmond and megacli collectors since we'll remove them soon anyway.
I also kept devError a regular metric because that seemed appropriate to me since it's about counting all errors that happened in the exporter, not gathering some external state where ConstMetrics should be used.
Closes #240