Skip to content

Commit b3cc89e

Browse files
authored
Merge pull request percona#26 from percona/PMM-5837-upgrade-lib/pq
PMM-5837 upgrade lib/pq
2 parents 5243a3d + 8d4e1a1 commit b3cc89e

File tree

190 files changed

+9715
-21354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+9715
-21354
lines changed

Gopkg.lock

Lines changed: 64 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/postgres_exporter/postgres_exporter.go

Lines changed: 4 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"io/ioutil"
99
"math"
10-
"net/http"
1110
"net/url"
1211
"os"
1312
"path/filepath"
@@ -716,7 +715,7 @@ func parseFingerprint(url string) (string, error) {
716715
pairs := strings.Split(dsn, " ")
717716
kv := make(map[string]string, len(pairs))
718717
for _, pair := range pairs {
719-
splitted := strings.Split(pair, "=")
718+
splitted := strings.SplitN(pair, "=", 2)
720719
if len(splitted) != 2 {
721720
return "", fmt.Errorf("malformed dsn %q", dsn)
722721
}
@@ -1491,87 +1490,8 @@ func main() {
14911490
exporter.servers.Close()
14921491
}()
14931492

1494-
psCollector := prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{})
1495-
goCollector := prometheus.NewGoCollector()
1493+
// process and go collector is registered in prometheus/registry init
1494+
prometheus.MustRegister(exporter)
14961495

1497-
exporter_shared.RunServer("PostgreSQL", *listenAddress, *metricPath, newHandler(map[string]prometheus.Collector{
1498-
"exporter": exporter,
1499-
"standard.process": psCollector,
1500-
"standard.go": goCollector,
1501-
}))
1502-
}
1503-
1504-
// handler wraps an unfiltered http.Handler but uses a filtered handler,
1505-
// created on the fly, if filtering is requested. Create instances with
1506-
// newHandler. It used for collectors filtering.
1507-
type handler struct {
1508-
unfilteredHandler http.Handler
1509-
collectors map[string]prometheus.Collector
1510-
}
1511-
1512-
func newHandler(collectors map[string]prometheus.Collector) *handler {
1513-
h := &handler{collectors: collectors}
1514-
1515-
innerHandler, err := h.innerHandler()
1516-
if err != nil {
1517-
log.Fatalf("Couldn't create metrics handler: %s", err)
1518-
}
1519-
1520-
h.unfilteredHandler = innerHandler
1521-
return h
1522-
}
1523-
1524-
// ServeHTTP implements http.Handler.
1525-
func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
1526-
filters := r.URL.Query()["collect[]"]
1527-
log.Debugln("collect query:", filters)
1528-
1529-
if len(filters) == 0 {
1530-
// No filters, use the prepared unfiltered handler.
1531-
h.unfilteredHandler.ServeHTTP(w, r)
1532-
return
1533-
}
1534-
1535-
filteredHandler, err := h.innerHandler(filters...)
1536-
if err != nil {
1537-
log.Warnln("Couldn't create filtered metrics handler:", err)
1538-
w.WriteHeader(http.StatusBadRequest)
1539-
w.Write([]byte(fmt.Sprintf("Couldn't create filtered metrics handler: %s", err)))
1540-
return
1541-
}
1542-
filteredHandler.ServeHTTP(w, r)
1543-
}
1544-
1545-
func (h *handler) innerHandler(filters ...string) (http.Handler, error) {
1546-
registry := prometheus.NewRegistry()
1547-
1548-
// register all collectors by default.
1549-
if len(filters) == 0 {
1550-
for name, c := range h.collectors {
1551-
if err := registry.Register(c); err != nil {
1552-
return nil, err
1553-
}
1554-
log.Debugf("Collector %q was registered", name)
1555-
}
1556-
}
1557-
1558-
// register only filtered collectors.
1559-
for _, name := range filters {
1560-
if c, ok := h.collectors[name]; ok {
1561-
if err := registry.Register(c); err != nil {
1562-
return nil, err
1563-
}
1564-
log.Debugf("Collector %q was registered", name)
1565-
}
1566-
}
1567-
1568-
handler := promhttp.HandlerFor(
1569-
registry,
1570-
promhttp.HandlerOpts{
1571-
ErrorLog: log.NewErrorLogger(),
1572-
ErrorHandling: promhttp.ContinueOnError,
1573-
},
1574-
)
1575-
1576-
return handler, nil
1496+
exporter_shared.RunServer("PostgreSQL", *listenAddress, *metricPath, promhttp.ContinueOnError)
15771497
}

vendor/github.com/google/go-cmp/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)