metrics: do explicit metrics injection
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Sep 12, 2016 at 19:27 UTC
9cbeffa376f19f09b3ad9f78d387da6be762d01d
2 files changed
+8
-3
cmd/ipfs/daemon.go
+6
-1
@@ -23,12 +23,13 @@ import (
23
24
"gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net"
25
"gx/ipfs/QmR3KwhXCRLTNZB59vELb2HhEWrGy9nuychepxFtj3wWYa/client_golang/prometheus"
26
+
27
conn "gx/ipfs/QmUuwQUJmtvC6ReYcu7xaYKEUM3pD46H18dFn3LBhVt2Di/go-libp2p/p2p/net/conn"
28
+ mprome "gx/ipfs/QmXWro6iddJRbGWUoZDpTu6tjo5EXX4xJHHR9VczeoGZbw/go-metrics-prometheus"
29
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
30
util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
31
pstore "gx/ipfs/QmdMfSLMDBDYhtc4oF3NYGCZr5dy4wQb6Ji26N4D4mdxa2/go-libp2p-peerstore"
32
31
- _ "gx/ipfs/QmSd7rE8qjihopcQpg7VXzcPX8X4FJ5XkXVkUQggmmWyvG/go-metrics-prometheus"
33
_ "gx/ipfs/QmV3NSS3A1kX5s28r7yLczhDsXzkgo65cqRgKFXYunWZmD/metrics/runtime"
34
)
35
@@ -360,6 +361,10 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
361
}
362
363
// initialize metrics collector
364
+ err = mprome.Inject()
365
+ if err != nil {
366
+ log.Warningf("Injecting prometheus handler for metrics failed with message: %s\n", err.Error())
367
+ }
368
prometheus.MustRegister(&corehttp.IpfsNodeCollector{Node: node})
369
370
fmt.Printf("Daemon is ready\n")
package.json
+2
-2
@@ -242,9 +242,9 @@
242
},
243
{
244
"author": "ipfs",
245
- "hash": "QmSd7rE8qjihopcQpg7VXzcPX8X4FJ5XkXVkUQggmmWyvG",
245
+ "hash": "QmXWro6iddJRbGWUoZDpTu6tjo5EXX4xJHHR9VczeoGZbw",
246
"name": "go-metrics-prometheus",
247
- "version": "0.1.2"
247
+ "version": "0.3.0"
248
},
249
{
250
"author": "ipfs",