Remove workaround for pre go1.15 (#1010)

Signed-off-by: Mitsuo Heijo <mitsuo.heijo@gmail.com>
prometheus · Mar 27, 2022 · 8dfa334 · 8dfa334
1 parent 3bc8f2c
commit 8dfa334
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 60 deletions.
diff --git a/prometheus/collectors/dbstats_collector.go b/prometheus/collectors/dbstats_collector.go
@@ -101,7 +101,7 @@ func (c *dbStatsCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- c.waitDuration
 	ch <- c.maxIdleClosed
 	ch <- c.maxLifetimeClosed
-	c.describeNewInGo115(ch)
+	ch <- c.maxIdleTimeClosed
 }
 
 // Collect implements Collector.
@@ -115,5 +115,5 @@ func (c *dbStatsCollector) Collect(ch chan<- prometheus.Metric) {
 	ch <- prometheus.MustNewConstMetric(c.waitDuration, prometheus.CounterValue, stats.WaitDuration.Seconds())
 	ch <- prometheus.MustNewConstMetric(c.maxIdleClosed, prometheus.CounterValue, float64(stats.MaxIdleClosed))
 	ch <- prometheus.MustNewConstMetric(c.maxLifetimeClosed, prometheus.CounterValue, float64(stats.MaxLifetimeClosed))
-	c.collectNewInGo115(ch, stats)
+	ch <- prometheus.MustNewConstMetric(c.maxIdleTimeClosed, prometheus.CounterValue, float64(stats.MaxIdleTimeClosed))
 }
diff --git a/prometheus/collectors/dbstats_collector_go115.go b/prometheus/collectors/dbstats_collector_go115.go
diff --git a/prometheus/collectors/dbstats_collector_pre_go115.go b/prometheus/collectors/dbstats_collector_pre_go115.go