From 969eb06698bcbd65a64cac42d1f5224c5a6d086b Mon Sep 17 00:00:00 2001 From: Sam Calder-Mason Date: Thu, 27 Oct 2022 10:03:29 +1000 Subject: [PATCH] feat(ethpandaops): Prepare repo move --- .github/workflows/publish.yml | 1 + README.md | 2 +- cmd/root.go | 2 +- go.mod | 4 ++-- main.go | 2 +- pkg/exporter/consensus/api/api.go | 2 +- pkg/exporter/consensus/beacon/beacon.go | 6 +++--- pkg/exporter/consensus/beacon/event.go | 4 ++-- pkg/exporter/consensus/beacon/publisher.go | 4 ++-- pkg/exporter/consensus/jobs/beacon.go | 4 ++-- pkg/exporter/consensus/jobs/event.go | 2 +- pkg/exporter/consensus/jobs/forks.go | 2 +- pkg/exporter/consensus/jobs/general.go | 4 ++-- pkg/exporter/consensus/jobs/spec.go | 4 ++-- pkg/exporter/consensus/jobs/syncstatus.go | 2 +- pkg/exporter/consensus/metrics.go | 6 +++--- pkg/exporter/execution/api/api.go | 2 +- pkg/exporter/execution/execution.go | 2 +- pkg/exporter/execution/jobs/admin.go | 4 ++-- pkg/exporter/execution/jobs/block.go | 2 +- pkg/exporter/execution/jobs/general.go | 2 +- pkg/exporter/execution/jobs/net.go | 2 +- pkg/exporter/execution/jobs/syncstatus.go | 2 +- pkg/exporter/execution/jobs/txpool.go | 2 +- pkg/exporter/execution/jobs/web3.go | 2 +- pkg/exporter/execution/metrics.go | 4 ++-- pkg/exporter/exporter.go | 12 ++++++------ pkg/exporter/pair/pair.go | 2 +- 28 files changed, 45 insertions(+), 44 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0b7c4f4..dad23ad 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,6 +23,7 @@ jobs: # list of Docker images to use as base name for tags images: | samcm/ethereum-metrics-exporter + ethpandaops/ethereum-metrics-exporter # generate Docker tags based on the following events/attributes tags: | type=schedule diff --git a/README.md b/README.md index 8f18931..fe587f4 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Coming soon. 1. Clone the repo ```sh - go get github.com/samcm/ethereum-metrics-exporter + go get github.com/ethpandaops/ethereum-metrics-exporter ``` 2. Change directories ```sh diff --git a/cmd/root.go b/cmd/root.go index 8ea6345..ed96939 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "gopkg.in/yaml.v2" diff --git a/go.mod b/go.mod index 335d3ec..9caa043 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module github.com/samcm/ethereum-metrics-exporter +module github.com/ethpandaops/ethereum-metrics-exporter go 1.17 -// replace github.com/samcm/ethereum-metrics-exporter/pkg/exporter => ./pkg/ethereum-metrics-exporter +// replace github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter => ./pkg/ethereum-metrics-exporter require ( github.com/spf13/cobra v1.4.0 diff --git a/main.go b/main.go index 54a8d5c..3e9f54f 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( "os/signal" "syscall" - "github.com/samcm/ethereum-metrics-exporter/cmd" + "github.com/ethpandaops/ethereum-metrics-exporter/cmd" ) func main() { diff --git a/pkg/exporter/consensus/api/api.go b/pkg/exporter/consensus/api/api.go index 184cb91..f2dd5d5 100644 --- a/pkg/exporter/consensus/api/api.go +++ b/pkg/exporter/consensus/api/api.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/beacon/beacon.go b/pkg/exporter/consensus/beacon/beacon.go index 1647320..e54b7fd 100644 --- a/pkg/exporter/consensus/beacon/beacon.go +++ b/pkg/exporter/consensus/beacon/beacon.go @@ -10,11 +10,11 @@ import ( v1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec" "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" "github.com/go-co-op/gocron" "github.com/nats-io/nats.go" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/beacon/event.go b/pkg/exporter/consensus/beacon/event.go index 5f50586..f6a405a 100644 --- a/pkg/exporter/consensus/beacon/event.go +++ b/pkg/exporter/consensus/beacon/event.go @@ -3,8 +3,8 @@ package beacon import ( v1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" ) const ( diff --git a/pkg/exporter/consensus/beacon/publisher.go b/pkg/exporter/consensus/beacon/publisher.go index 27fb298..7ca677a 100644 --- a/pkg/exporter/consensus/beacon/publisher.go +++ b/pkg/exporter/consensus/beacon/publisher.go @@ -5,8 +5,8 @@ import ( v1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" ) // Official beacon events that are proxied diff --git a/pkg/exporter/consensus/jobs/beacon.go b/pkg/exporter/consensus/jobs/beacon.go index 6ff94d2..1f5e103 100644 --- a/pkg/exporter/consensus/jobs/beacon.go +++ b/pkg/exporter/consensus/jobs/beacon.go @@ -9,9 +9,9 @@ import ( eth2client "github.com/attestantio/go-eth2-client" v1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/jobs/event.go b/pkg/exporter/consensus/jobs/event.go index d6dff7f..61707ee 100644 --- a/pkg/exporter/consensus/jobs/event.go +++ b/pkg/exporter/consensus/jobs/event.go @@ -6,8 +6,8 @@ import ( eth2client "github.com/attestantio/go-eth2-client" v1 "github.com/attestantio/go-eth2-client/api/v1" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/jobs/forks.go b/pkg/exporter/consensus/jobs/forks.go index 8117171..f03edbe 100644 --- a/pkg/exporter/consensus/jobs/forks.go +++ b/pkg/exporter/consensus/jobs/forks.go @@ -3,8 +3,8 @@ package jobs import ( "context" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/sirupsen/logrus" "github.com/attestantio/go-eth2-client/spec/phase0" diff --git a/pkg/exporter/consensus/jobs/general.go b/pkg/exporter/consensus/jobs/general.go index 52d87cd..91059dd 100644 --- a/pkg/exporter/consensus/jobs/general.go +++ b/pkg/exporter/consensus/jobs/general.go @@ -3,9 +3,9 @@ package jobs import ( "context" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/jobs/spec.go b/pkg/exporter/consensus/jobs/spec.go index 7bca403..44786cd 100644 --- a/pkg/exporter/consensus/jobs/spec.go +++ b/pkg/exporter/consensus/jobs/spec.go @@ -5,9 +5,9 @@ import ( "math/big" "time" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/jobs/syncstatus.go b/pkg/exporter/consensus/jobs/syncstatus.go index c01f4b4..6d58b45 100644 --- a/pkg/exporter/consensus/jobs/syncstatus.go +++ b/pkg/exporter/consensus/jobs/syncstatus.go @@ -3,8 +3,8 @@ package jobs import ( "context" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/consensus/metrics.go b/pkg/exporter/consensus/metrics.go index dd97356..3270774 100644 --- a/pkg/exporter/consensus/metrics.go +++ b/pkg/exporter/consensus/metrics.go @@ -4,10 +4,10 @@ import ( "context" eth2client "github.com/attestantio/go-eth2-client" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/jobs" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/jobs" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/api/api.go b/pkg/exporter/execution/api/api.go index 9fa0a4c..08a6276 100644 --- a/pkg/exporter/execution/api/api.go +++ b/pkg/exporter/execution/api/api.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/p2p" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api/types" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/execution.go b/pkg/exporter/execution/execution.go index c501301..683d69e 100644 --- a/pkg/exporter/execution/execution.go +++ b/pkg/exporter/execution/execution.go @@ -5,8 +5,8 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/admin.go b/pkg/exporter/execution/jobs/admin.go index a313b3b..57780aa 100644 --- a/pkg/exporter/execution/jobs/admin.go +++ b/pkg/exporter/execution/jobs/admin.go @@ -7,10 +7,10 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api/types" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/block.go b/pkg/exporter/execution/jobs/block.go index 7b500b6..d612799 100644 --- a/pkg/exporter/execution/jobs/block.go +++ b/pkg/exporter/execution/jobs/block.go @@ -8,9 +8,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/general.go b/pkg/exporter/execution/jobs/general.go index 555c07d..3cd7fe9 100644 --- a/pkg/exporter/execution/jobs/general.go +++ b/pkg/exporter/execution/jobs/general.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/net.go b/pkg/exporter/execution/jobs/net.go index 761c491..51cb6fd 100644 --- a/pkg/exporter/execution/jobs/net.go +++ b/pkg/exporter/execution/jobs/net.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/syncstatus.go b/pkg/exporter/execution/jobs/syncstatus.go index 867374e..11cfb16 100644 --- a/pkg/exporter/execution/jobs/syncstatus.go +++ b/pkg/exporter/execution/jobs/syncstatus.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/txpool.go b/pkg/exporter/execution/jobs/txpool.go index 7decddb..cf9e892 100644 --- a/pkg/exporter/execution/jobs/txpool.go +++ b/pkg/exporter/execution/jobs/txpool.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/jobs/web3.go b/pkg/exporter/execution/jobs/web3.go index abfb0cc..4b53e38 100644 --- a/pkg/exporter/execution/jobs/web3.go +++ b/pkg/exporter/execution/jobs/web3.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/execution/metrics.go b/pkg/exporter/execution/metrics.go index fc98686..af6255c 100644 --- a/pkg/exporter/execution/metrics.go +++ b/pkg/exporter/execution/metrics.go @@ -4,10 +4,10 @@ import ( "context" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/jobs" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/jobs" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/exporter.go b/pkg/exporter/exporter.go index c8058c9..b9e0476 100644 --- a/pkg/exporter/exporter.go +++ b/pkg/exporter/exporter.go @@ -10,16 +10,16 @@ import ( eth2client "github.com/attestantio/go-eth2-client" ehttp "github.com/attestantio/go-eth2-client/http" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/disk" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/pair" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/disk" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/pair" "github.com/sirupsen/logrus" ) diff --git a/pkg/exporter/pair/pair.go b/pkg/exporter/pair/pair.go index ec2441e..6549c55 100644 --- a/pkg/exporter/pair/pair.go +++ b/pkg/exporter/pair/pair.go @@ -7,9 +7,9 @@ import ( "time" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/onrik/ethrpc" "github.com/prometheus/client_golang/prometheus" - "github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon" "github.com/sirupsen/logrus" )