metrics: update prometheus
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Sep 5, 2016 at 16:38 UTC
a2bb6e8edf22e7339f4835ca022ebd9bc812c231
4 files changed
+27
-13
cmd/ipfs/daemon.go
+8
-8
@@ -11,11 +11,6 @@ import (
11
"sort"
12
"sync"
13
14
- "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net"
15
- _ "gx/ipfs/QmV3NSS3A1kX5s28r7yLczhDsXzkgo65cqRgKFXYunWZmD/metrics/runtime"
16
-
17
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
18
-
14
cmds "github.com/ipfs/go-ipfs/commands"
15
"github.com/ipfs/go-ipfs/core"
16
commands "github.com/ipfs/go-ipfs/core/commands"
@@ -25,10 +20,16 @@ import (
20
nodeMount "github.com/ipfs/go-ipfs/fuse/node"
21
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
22
migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
23
+
24
+ "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net"
25
+ "gx/ipfs/QmR3KwhXCRLTNZB59vELb2HhEWrGy9nuychepxFtj3wWYa/client_golang/prometheus"
26
conn "gx/ipfs/QmUuwQUJmtvC6ReYcu7xaYKEUM3pD46H18dFn3LBhVt2Di/go-libp2p/p2p/net/conn"
27
+ ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
28
util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
29
pstore "gx/ipfs/QmdMfSLMDBDYhtc4oF3NYGCZr5dy4wQb6Ji26N4D4mdxa2/go-libp2p-peerstore"
31
- prometheus "gx/ipfs/QmdhsRK1EK2fvAz2i2SH5DEfkL6seDuyMYEsxKa9Braim3/client_golang/prometheus"
30
+
31
+ _ "gx/ipfs/QmV3NSS3A1kX5s28r7yLczhDsXzkgo65cqRgKFXYunWZmD/metrics/runtime"
32
+ _ "gx/ipfs/QmWTHakXvEmW44Muyy1wGGzoWA4tntuuvd8BhBbmLYBzSx/go-metrics-prometheus"
33
)
34
35
const (
@@ -359,8 +360,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
360
}
361
362
// initialize metrics collector
362
- prometheus.MustRegisterOrGet(&corehttp.IpfsNodeCollector{Node: node})
363
- prometheus.EnableCollectChecks(true)
363
+ prometheus.MustRegister(&corehttp.IpfsNodeCollector{Node: node})
364
365
fmt.Printf("Daemon is ready\n")
366
// collect long-running errors and block for shutdown
core/builder.go
+3
-1
@@ -16,14 +16,15 @@ import (
16
pin "github.com/ipfs/go-ipfs/pin"
17
repo "github.com/ipfs/go-ipfs/repo"
18
cfg "github.com/ipfs/go-ipfs/repo/config"
19
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
19
20
retry "gx/ipfs/QmPF5kxTYFkzhaY5LmkExood7aTTZBHWQC6cjdDQBuGrjp/retry-datastore"
21
goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
22
+ metrics "gx/ipfs/QmVWBQQAz4Cd2XgW9KgQoqXXrU8KJoCb9WCrhWRFVBKvFe/go-metrics-interface"
23
ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
24
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
25
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
26
dsync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
27
+ key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
28
pstore "gx/ipfs/QmdMfSLMDBDYhtc4oF3NYGCZr5dy4wQb6Ji26N4D4mdxa2/go-libp2p-peerstore"
29
)
30
@@ -109,6 +110,7 @@ func NewNode(ctx context.Context, cfg *BuildCfg) (*IpfsNode, error) {
110
if err != nil {
111
return nil, err
112
}
113
+ ctx = metrics.CtxScope(ctx, "ipfs")
114
115
n := &IpfsNode{
116
mode: offlineMode,
core/corehttp/metrics.go
+2
-2
@@ -4,9 +4,9 @@ import (
4
"net"
5
"net/http"
6
7
- prometheus "gx/ipfs/QmdhsRK1EK2fvAz2i2SH5DEfkL6seDuyMYEsxKa9Braim3/client_golang/prometheus"
8
-
7
core "github.com/ipfs/go-ipfs/core"
8
+
9
+ prometheus "gx/ipfs/QmR3KwhXCRLTNZB59vELb2HhEWrGy9nuychepxFtj3wWYa/client_golang/prometheus"
10
)
11
12
// This adds the scraping endpoint which Prometheus uses to fetch metrics.
package.json
+14
-2
@@ -46,9 +46,9 @@
46
"version": "0.0.0"
47
},
48
{
49
- "hash": "QmdhsRK1EK2fvAz2i2SH5DEfkL6seDuyMYEsxKa9Braim3",
49
+ "hash": "QmR3KwhXCRLTNZB59vELb2HhEWrGy9nuychepxFtj3wWYa",
50
"name": "client_golang",
51
- "version": "0.0.0"
51
+ "version": "0.1.0"
52
},
53
{
54
"hash": "Qma1FrGRasghpuETfCtsKdFtXKQffpNnakv3wG3QaMwCVi",
@@ -239,6 +239,18 @@
239
"hash": "QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7",
240
"name": "go-libp2p-loggables",
241
"version": "1.0.11"
242
+ },
243
+ {
244
+ "author": "ipfs",
245
+ "hash": "QmWTHakXvEmW44Muyy1wGGzoWA4tntuuvd8BhBbmLYBzSx",
246
+ "name": "go-metrics-prometheus",
247
+ "version": "0.1.1"
248
+ },
249
+ {
250
+ "author": "ipfs",
251
+ "hash": "QmVWBQQAz4Cd2XgW9KgQoqXXrU8KJoCb9WCrhWRFVBKvFe",
252
+ "name": "go-metrics-interface",
253
+ "version": "0.1.1"
254
}
255
],
256
"gxVersion": "0.4.0",