From e5df069e41971f5d8b87f4646f0822ed2e38e555 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 19 Jan 2018 15:42:48 +0200 Subject: [PATCH] vendor: change nonsense/go-metrics to ethersphere/go-metrics --- dashboard/dashboard.go | 2 +- eth/downloader/downloader.go | 2 +- eth/downloader/queue.go | 2 +- ethdb/database.go | 2 +- metrics/metrics.go | 4 +-- node/api.go | 2 +- trie/trie.go | 2 +- .../go-metrics-influxdb/LICENSE | 0 .../go-metrics-influxdb/README.md | 0 .../go-metrics-influxdb/influxdb.go | 1 + .../go-metrics/LICENSE | 0 .../go-metrics/README.md | 0 .../go-metrics/counter.go | 0 .../go-metrics/debug.go | 0 .../go-metrics/ewma.go | 0 .../go-metrics/exp/exp.go | 0 .../go-metrics/gauge.go | 0 .../go-metrics/gauge_float64.go | 0 .../go-metrics/graphite.go | 0 .../go-metrics/healthcheck.go | 0 .../go-metrics/histogram.go | 0 .../go-metrics/json.go | 0 .../go-metrics/log.go | 0 .../go-metrics/memory.md | 0 .../go-metrics/meter.go | 0 .../go-metrics/metrics.go | 0 .../go-metrics/opentsdb.go | 0 .../go-metrics/registry.go | 0 .../go-metrics/resetting_timer.go | 0 .../go-metrics/runtime.go | 0 .../go-metrics/runtime_cgo.go | 0 .../go-metrics/runtime_gccpufraction.go | 0 .../go-metrics/runtime_no_cgo.go | 0 .../go-metrics/runtime_no_gccpufraction.go | 0 .../go-metrics/sample.go | 0 .../go-metrics/syslog.go | 0 .../go-metrics/timer.go | 0 .../go-metrics/validate.sh | 0 .../go-metrics/writer.go | 0 vendor/vendor.json | 36 +++++++++---------- 40 files changed, 27 insertions(+), 26 deletions(-) rename vendor/github.com/{nonsense => ethersphere}/go-metrics-influxdb/LICENSE (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics-influxdb/README.md (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics-influxdb/influxdb.go (99%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/LICENSE (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/README.md (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/counter.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/debug.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/ewma.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/exp/exp.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/gauge.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/gauge_float64.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/graphite.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/healthcheck.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/histogram.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/json.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/log.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/memory.md (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/meter.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/metrics.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/opentsdb.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/registry.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/resetting_timer.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/runtime.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/runtime_cgo.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/runtime_gccpufraction.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/runtime_no_cgo.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/runtime_no_gccpufraction.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/sample.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/syslog.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/timer.go (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/validate.sh (100%) rename vendor/github.com/{nonsense => ethersphere}/go-metrics/writer.go (100%) diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index f0f96332b0..84b74d8a07 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -39,7 +39,7 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" - "github.com/nonsense/go-metrics" + "github.com/ethersphere/go-metrics" "golang.org/x/net/websocket" ) diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 0741730d6d..3896453524 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" - "github.com/nonsense/go-metrics" + "github.com/ethersphere/go-metrics" ) var ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index c401426e83..414ab715ad 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" - "github.com/nonsense/go-metrics" + "github.com/ethersphere/go-metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/ethdb/database.go b/ethdb/database.go index 7ce230de6c..2dadfec9af 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -30,7 +30,7 @@ import ( "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" - gometrics "github.com/nonsense/go-metrics" + gometrics "github.com/ethersphere/go-metrics" ) var OpenFileLimit = 64 diff --git a/metrics/metrics.go b/metrics/metrics.go index b7fe1d405f..86582dea09 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -24,8 +24,8 @@ import ( "time" "github.com/ethereum/go-ethereum/log" - "github.com/nonsense/go-metrics" - "github.com/nonsense/go-metrics/exp" + "github.com/ethersphere/go-metrics" + "github.com/ethersphere/go-metrics/exp" ) // MetricsEnabledFlag is the CLI flag name to use to enable metrics collections. diff --git a/node/api.go b/node/api.go index 390b1d97b0..3a37f92528 100644 --- a/node/api.go +++ b/node/api.go @@ -27,7 +27,7 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/rpc" - "github.com/nonsense/go-metrics" + "github.com/ethersphere/go-metrics" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/trie/trie.go b/trie/trie.go index 630ee1cef1..3d643415ed 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" - "github.com/nonsense/go-metrics" + "github.com/ethersphere/go-metrics" ) var ( diff --git a/vendor/github.com/nonsense/go-metrics-influxdb/LICENSE b/vendor/github.com/ethersphere/go-metrics-influxdb/LICENSE similarity index 100% rename from vendor/github.com/nonsense/go-metrics-influxdb/LICENSE rename to vendor/github.com/ethersphere/go-metrics-influxdb/LICENSE diff --git a/vendor/github.com/nonsense/go-metrics-influxdb/README.md b/vendor/github.com/ethersphere/go-metrics-influxdb/README.md similarity index 100% rename from vendor/github.com/nonsense/go-metrics-influxdb/README.md rename to vendor/github.com/ethersphere/go-metrics-influxdb/README.md diff --git a/vendor/github.com/nonsense/go-metrics-influxdb/influxdb.go b/vendor/github.com/ethersphere/go-metrics-influxdb/influxdb.go similarity index 99% rename from vendor/github.com/nonsense/go-metrics-influxdb/influxdb.go rename to vendor/github.com/ethersphere/go-metrics-influxdb/influxdb.go index f8402e61bd..ce9784a2ff 100644 --- a/vendor/github.com/nonsense/go-metrics-influxdb/influxdb.go +++ b/vendor/github.com/ethersphere/go-metrics-influxdb/influxdb.go @@ -8,6 +8,7 @@ import ( "sort" "time" + metrics "github.com/ethersphere/go-metrics" "github.com/influxdata/influxdb/client" ) diff --git a/vendor/github.com/nonsense/go-metrics/LICENSE b/vendor/github.com/ethersphere/go-metrics/LICENSE similarity index 100% rename from vendor/github.com/nonsense/go-metrics/LICENSE rename to vendor/github.com/ethersphere/go-metrics/LICENSE diff --git a/vendor/github.com/nonsense/go-metrics/README.md b/vendor/github.com/ethersphere/go-metrics/README.md similarity index 100% rename from vendor/github.com/nonsense/go-metrics/README.md rename to vendor/github.com/ethersphere/go-metrics/README.md diff --git a/vendor/github.com/nonsense/go-metrics/counter.go b/vendor/github.com/ethersphere/go-metrics/counter.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/counter.go rename to vendor/github.com/ethersphere/go-metrics/counter.go diff --git a/vendor/github.com/nonsense/go-metrics/debug.go b/vendor/github.com/ethersphere/go-metrics/debug.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/debug.go rename to vendor/github.com/ethersphere/go-metrics/debug.go diff --git a/vendor/github.com/nonsense/go-metrics/ewma.go b/vendor/github.com/ethersphere/go-metrics/ewma.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/ewma.go rename to vendor/github.com/ethersphere/go-metrics/ewma.go diff --git a/vendor/github.com/nonsense/go-metrics/exp/exp.go b/vendor/github.com/ethersphere/go-metrics/exp/exp.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/exp/exp.go rename to vendor/github.com/ethersphere/go-metrics/exp/exp.go diff --git a/vendor/github.com/nonsense/go-metrics/gauge.go b/vendor/github.com/ethersphere/go-metrics/gauge.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/gauge.go rename to vendor/github.com/ethersphere/go-metrics/gauge.go diff --git a/vendor/github.com/nonsense/go-metrics/gauge_float64.go b/vendor/github.com/ethersphere/go-metrics/gauge_float64.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/gauge_float64.go rename to vendor/github.com/ethersphere/go-metrics/gauge_float64.go diff --git a/vendor/github.com/nonsense/go-metrics/graphite.go b/vendor/github.com/ethersphere/go-metrics/graphite.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/graphite.go rename to vendor/github.com/ethersphere/go-metrics/graphite.go diff --git a/vendor/github.com/nonsense/go-metrics/healthcheck.go b/vendor/github.com/ethersphere/go-metrics/healthcheck.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/healthcheck.go rename to vendor/github.com/ethersphere/go-metrics/healthcheck.go diff --git a/vendor/github.com/nonsense/go-metrics/histogram.go b/vendor/github.com/ethersphere/go-metrics/histogram.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/histogram.go rename to vendor/github.com/ethersphere/go-metrics/histogram.go diff --git a/vendor/github.com/nonsense/go-metrics/json.go b/vendor/github.com/ethersphere/go-metrics/json.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/json.go rename to vendor/github.com/ethersphere/go-metrics/json.go diff --git a/vendor/github.com/nonsense/go-metrics/log.go b/vendor/github.com/ethersphere/go-metrics/log.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/log.go rename to vendor/github.com/ethersphere/go-metrics/log.go diff --git a/vendor/github.com/nonsense/go-metrics/memory.md b/vendor/github.com/ethersphere/go-metrics/memory.md similarity index 100% rename from vendor/github.com/nonsense/go-metrics/memory.md rename to vendor/github.com/ethersphere/go-metrics/memory.md diff --git a/vendor/github.com/nonsense/go-metrics/meter.go b/vendor/github.com/ethersphere/go-metrics/meter.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/meter.go rename to vendor/github.com/ethersphere/go-metrics/meter.go diff --git a/vendor/github.com/nonsense/go-metrics/metrics.go b/vendor/github.com/ethersphere/go-metrics/metrics.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/metrics.go rename to vendor/github.com/ethersphere/go-metrics/metrics.go diff --git a/vendor/github.com/nonsense/go-metrics/opentsdb.go b/vendor/github.com/ethersphere/go-metrics/opentsdb.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/opentsdb.go rename to vendor/github.com/ethersphere/go-metrics/opentsdb.go diff --git a/vendor/github.com/nonsense/go-metrics/registry.go b/vendor/github.com/ethersphere/go-metrics/registry.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/registry.go rename to vendor/github.com/ethersphere/go-metrics/registry.go diff --git a/vendor/github.com/nonsense/go-metrics/resetting_timer.go b/vendor/github.com/ethersphere/go-metrics/resetting_timer.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/resetting_timer.go rename to vendor/github.com/ethersphere/go-metrics/resetting_timer.go diff --git a/vendor/github.com/nonsense/go-metrics/runtime.go b/vendor/github.com/ethersphere/go-metrics/runtime.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/runtime.go rename to vendor/github.com/ethersphere/go-metrics/runtime.go diff --git a/vendor/github.com/nonsense/go-metrics/runtime_cgo.go b/vendor/github.com/ethersphere/go-metrics/runtime_cgo.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/runtime_cgo.go rename to vendor/github.com/ethersphere/go-metrics/runtime_cgo.go diff --git a/vendor/github.com/nonsense/go-metrics/runtime_gccpufraction.go b/vendor/github.com/ethersphere/go-metrics/runtime_gccpufraction.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/runtime_gccpufraction.go rename to vendor/github.com/ethersphere/go-metrics/runtime_gccpufraction.go diff --git a/vendor/github.com/nonsense/go-metrics/runtime_no_cgo.go b/vendor/github.com/ethersphere/go-metrics/runtime_no_cgo.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/runtime_no_cgo.go rename to vendor/github.com/ethersphere/go-metrics/runtime_no_cgo.go diff --git a/vendor/github.com/nonsense/go-metrics/runtime_no_gccpufraction.go b/vendor/github.com/ethersphere/go-metrics/runtime_no_gccpufraction.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/runtime_no_gccpufraction.go rename to vendor/github.com/ethersphere/go-metrics/runtime_no_gccpufraction.go diff --git a/vendor/github.com/nonsense/go-metrics/sample.go b/vendor/github.com/ethersphere/go-metrics/sample.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/sample.go rename to vendor/github.com/ethersphere/go-metrics/sample.go diff --git a/vendor/github.com/nonsense/go-metrics/syslog.go b/vendor/github.com/ethersphere/go-metrics/syslog.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/syslog.go rename to vendor/github.com/ethersphere/go-metrics/syslog.go diff --git a/vendor/github.com/nonsense/go-metrics/timer.go b/vendor/github.com/ethersphere/go-metrics/timer.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/timer.go rename to vendor/github.com/ethersphere/go-metrics/timer.go diff --git a/vendor/github.com/nonsense/go-metrics/validate.sh b/vendor/github.com/ethersphere/go-metrics/validate.sh similarity index 100% rename from vendor/github.com/nonsense/go-metrics/validate.sh rename to vendor/github.com/ethersphere/go-metrics/validate.sh diff --git a/vendor/github.com/nonsense/go-metrics/writer.go b/vendor/github.com/ethersphere/go-metrics/writer.go similarity index 100% rename from vendor/github.com/nonsense/go-metrics/writer.go rename to vendor/github.com/ethersphere/go-metrics/writer.go diff --git a/vendor/vendor.json b/vendor/vendor.json index b98436fc14..ac9e79f02e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -103,6 +103,24 @@ "path": "github.com/elastic/gosigar/sys/windows", "revision": "a3814ce5008e612a0c6d027608b54e1d0d9a5613", "revisionTime": "2018-01-22T22:25:45Z" + }, + { + "checksumSHA1": "Cm/xumUDA/BVr4sq7qglyVpt/3M=", + "path": "github.com/ethersphere/go-metrics", + "revision": "9551ad5c1c4abf784761d7752fb0e8cc8fbb2181", + "revisionTime": "2018-01-17T12:19:44Z" + }, + { + "checksumSHA1": "xn/yylagVIjYcCn/evHHRuHX0HU=", + "path": "github.com/ethersphere/go-metrics-influxdb", + "revision": "4cbc106280fb1288d93666f641520df9c24b1b88", + "revisionTime": "2018-01-17T12:28:20Z" + }, + { + "checksumSHA1": "1gQE3VEX4HYb/xN2gyLm56FBGPc=", + "path": "github.com/ethersphere/go-metrics/exp", + "revision": "9551ad5c1c4abf784761d7752fb0e8cc8fbb2181", + "revisionTime": "2018-01-17T12:19:44Z" }, { "checksumSHA1": "7oFpbmDfGobwKsFLIf6wMUvVoKw=", @@ -273,24 +291,6 @@ "revision": "eb52202f758b98ac5b1a8eb26f36455205d688f0", "revisionTime": "2017-04-03T15:03:10Z" }, - { - "checksumSHA1": "riVL/YgVMMSXiGx4T84qkeYBt8M=", - "path": "github.com/nonsense/go-metrics", - "revision": "9551ad5c1c4abf784761d7752fb0e8cc8fbb2181", - "revisionTime": "2018-01-17T12:19:44Z" - }, - { - "checksumSHA1": "imlKDfVfXiGUjNbWUrV+7bMkVPs=", - "path": "github.com/nonsense/go-metrics-influxdb", - "revision": "da50c4cc2e1531c45fc41f1392250ee3c86de7d2", - "revisionTime": "2018-01-17T12:28:20Z" - }, - { - "checksumSHA1": "UoDEj2F+9i41oox2kyjP6/nWwYQ=", - "path": "github.com/nonsense/go-metrics/exp", - "revision": "9551ad5c1c4abf784761d7752fb0e8cc8fbb2181", - "revisionTime": "2018-01-17T12:19:44Z" - }, { "checksumSHA1": "R1h9XHH3dTmLq7yKL9/uW0xFwfs=", "path": "github.com/nsf/termbox-go",