diff --git a/WORKSPACE b/WORKSPACE index f80e382beb..5584245f32 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1022,6 +1022,12 @@ go_repository( importpath = "github.com/ghodss/yaml", ) +go_repository( + name = "org_uber_go_automaxprocs", + commit = "823363ffcd16c8f3ebaa3a067550d97c70f52194", + importpath = "go.uber.org/automaxprocs", +) + go_repository( name = "com_github_libp2p_go_libp2p_core", build_file_proto_mode = "disable_global", diff --git a/beacon-chain/BUILD.bazel b/beacon-chain/BUILD.bazel index 8ee07f1754..16403ea644 100644 --- a/beacon-chain/BUILD.bazel +++ b/beacon-chain/BUILD.bazel @@ -25,6 +25,7 @@ go_library( "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli//:go_default_library", "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -53,6 +54,7 @@ go_image( "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli//:go_default_library", "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) diff --git a/beacon-chain/gateway/server/BUILD.bazel b/beacon-chain/gateway/server/BUILD.bazel index cc1631192c..1892069e47 100644 --- a/beacon-chain/gateway/server/BUILD.bazel +++ b/beacon-chain/gateway/server/BUILD.bazel @@ -11,6 +11,7 @@ go_library( "//beacon-chain/gateway:go_default_library", "@com_github_joonix_log//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -36,6 +37,7 @@ go_image( "@com_github_joonix_log//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@grpc_ecosystem_grpc_gateway//runtime:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) diff --git a/beacon-chain/gateway/server/main.go b/beacon-chain/gateway/server/main.go index 583731a23c..7a6888bf9f 100644 --- a/beacon-chain/gateway/server/main.go +++ b/beacon-chain/gateway/server/main.go @@ -9,6 +9,7 @@ import ( joonix "github.com/joonix/log" "github.com/prysmaticlabs/prysm/beacon-chain/gateway" "github.com/sirupsen/logrus" + _ "go.uber.org/automaxprocs" ) var ( diff --git a/beacon-chain/main.go b/beacon-chain/main.go index 82c316ef29..b74ebe3888 100644 --- a/beacon-chain/main.go +++ b/beacon-chain/main.go @@ -7,10 +7,6 @@ import ( "runtime" joonix "github.com/joonix/log" - "github.com/sirupsen/logrus" - "github.com/urfave/cli" - prefixed "github.com/x-cray/logrus-prefixed-formatter" - "github.com/prysmaticlabs/prysm/beacon-chain/node" "github.com/prysmaticlabs/prysm/beacon-chain/utils" "github.com/prysmaticlabs/prysm/shared/cmd" @@ -18,6 +14,10 @@ import ( "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/logutil" "github.com/prysmaticlabs/prysm/shared/version" + "github.com/sirupsen/logrus" + "github.com/urfave/cli" + "github.com/x-cray/logrus-prefixed-formatter" + _ "go.uber.org/automaxprocs" ) var appFlags = []cli.Flag{ diff --git a/tools/bootnode/BUILD.bazel b/tools/bootnode/BUILD.bazel index 802af8b8da..6e7bc4ce91 100644 --- a/tools/bootnode/BUILD.bazel +++ b/tools/bootnode/BUILD.bazel @@ -18,6 +18,7 @@ go_library( "@com_github_libp2p_go_libp2p_kad_dht//opts:go_default_library", "@com_github_libp2p_go_libp2p_protocol//:go_default_library", "@com_github_multiformats_go_multiaddr//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -43,6 +44,7 @@ go_image( "@com_github_libp2p_go_libp2p_kad_dht//opts:go_default_library", "@com_github_libp2p_go_libp2p_protocol//:go_default_library", "@com_github_multiformats_go_multiaddr//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index 8f7368dcfb..240ecf0f0d 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -24,6 +24,7 @@ import ( protocol "github.com/libp2p/go-libp2p-protocol" ma "github.com/multiformats/go-multiaddr" "github.com/prysmaticlabs/prysm/shared/version" + _ "go.uber.org/automaxprocs" ) var ( diff --git a/tools/cluster-pk-manager/client/BUILD.bazel b/tools/cluster-pk-manager/client/BUILD.bazel index 60e9aca3e4..135a44916f 100644 --- a/tools/cluster-pk-manager/client/BUILD.bazel +++ b/tools/cluster-pk-manager/client/BUILD.bazel @@ -13,6 +13,7 @@ go_library( "//shared/keystore:go_default_library", "//shared/params:go_default_library", "@org_golang_google_grpc//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -25,7 +26,13 @@ go_binary( go_image( name = "image", srcs = ["main.go"], + goarch = "amd64", + goos = "linux", importpath = "github.com/prysmaticlabs/prysm/tools/cluster-pk-manager/client", + pure = "on", + race = "off", + static = "on", + tags = ["manual"], visibility = ["//visibility:private"], deps = [ "//proto/cluster:go_default_library", @@ -33,13 +40,8 @@ go_image( "//shared/keystore:go_default_library", "//shared/params:go_default_library", "@org_golang_google_grpc//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], - pure = "on", - static = "on", - tags = ["manual"], - goarch = "amd64", - goos = "linux", - race = "off", ) container_push( diff --git a/tools/cluster-pk-manager/client/main.go b/tools/cluster-pk-manager/client/main.go index f93d670b43..0b6aa71e39 100644 --- a/tools/cluster-pk-manager/client/main.go +++ b/tools/cluster-pk-manager/client/main.go @@ -9,6 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/keystore" "github.com/prysmaticlabs/prysm/shared/params" + _ "go.uber.org/automaxprocs" "google.golang.org/grpc" ) diff --git a/tools/cluster-pk-manager/server/BUILD.bazel b/tools/cluster-pk-manager/server/BUILD.bazel index bd91cb2c87..629767eff0 100644 --- a/tools/cluster-pk-manager/server/BUILD.bazel +++ b/tools/cluster-pk-manager/server/BUILD.bazel @@ -40,6 +40,7 @@ go_library( "@io_k8s_client_go//rest:go_default_library", "@io_opencensus_go//plugin/ocgrpc:go_default_library", "@org_golang_google_grpc//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -83,7 +84,6 @@ go_image( "//shared/bytesutil:go_default_library", "//shared/keystore:go_default_library", "//shared/prometheus:go_default_library", - "@com_github_prysmaticlabs_go_ssz//:go_default_library", "@com_github_boltdb_bolt//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", @@ -93,6 +93,7 @@ go_image( "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_go_ssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", @@ -100,6 +101,7 @@ go_image( "@io_k8s_client_go//rest:go_default_library", "@io_opencensus_go//plugin/ocgrpc:go_default_library", "@org_golang_google_grpc//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) diff --git a/tools/cluster-pk-manager/server/main.go b/tools/cluster-pk-manager/server/main.go index 8b6ff8e9e1..8a4fd8cef1 100644 --- a/tools/cluster-pk-manager/server/main.go +++ b/tools/cluster-pk-manager/server/main.go @@ -8,6 +8,7 @@ import ( pb "github.com/prysmaticlabs/prysm/proto/cluster" "github.com/prysmaticlabs/prysm/shared/prometheus" "github.com/sirupsen/logrus" + _ "go.uber.org/automaxprocs" "google.golang.org/grpc" ) diff --git a/tools/contract-addr/BUILD.bazel b/tools/contract-addr/BUILD.bazel index 5ac5cf8ffe..7083f26be5 100644 --- a/tools/contract-addr/BUILD.bazel +++ b/tools/contract-addr/BUILD.bazel @@ -7,6 +7,7 @@ go_library( srcs = ["main.go"], importpath = "github.com/prysmaticlabs/prysm/tools/contract-addr", visibility = ["//visibility:private"], + deps = ["@org_uber_go_automaxprocs//:go_default_library"], ) go_binary( @@ -18,16 +19,15 @@ go_binary( go_image( name = "image", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/tools/contract-addr", - visibility = ["//visibility:private"], - static = "on", - tags = ["manual"], goarch = "amd64", goos = "linux", - deps = [ - ], - race = "off", + importpath = "github.com/prysmaticlabs/prysm/tools/contract-addr", pure = "on", + race = "off", + static = "on", + tags = ["manual"], + visibility = ["//visibility:private"], + deps = ["@org_uber_go_automaxprocs//:go_default_library"], ) container_push( diff --git a/tools/contract-addr/main.go b/tools/contract-addr/main.go index 6a5b04d0bd..5679779678 100644 --- a/tools/contract-addr/main.go +++ b/tools/contract-addr/main.go @@ -11,6 +11,8 @@ import ( "io/ioutil" "log" "net/http" + + _ "go.uber.org/automaxprocs" ) var address = flag.String("address-path", "", "The file path to the plain text file with the contract address") diff --git a/tools/eth1exporter/BUILD.bazel b/tools/eth1exporter/BUILD.bazel index 8b11975613..0ae49f9000 100644 --- a/tools/eth1exporter/BUILD.bazel +++ b/tools/eth1exporter/BUILD.bazel @@ -11,6 +11,7 @@ go_library( "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//ethclient:go_default_library", "@com_github_ethereum_go_ethereum//params:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -34,6 +35,7 @@ go_image( "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//ethclient:go_default_library", "@com_github_ethereum_go_ethereum//params:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) diff --git a/tools/eth1exporter/main.go b/tools/eth1exporter/main.go index 8c68923c3b..7491589e40 100644 --- a/tools/eth1exporter/main.go +++ b/tools/eth1exporter/main.go @@ -17,6 +17,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/params" + _ "go.uber.org/automaxprocs" ) var ( diff --git a/tools/faucet/BUILD.bazel b/tools/faucet/BUILD.bazel index d4a55df365..1f6855bccd 100644 --- a/tools/faucet/BUILD.bazel +++ b/tools/faucet/BUILD.bazel @@ -5,10 +5,12 @@ load("@io_bazel_rules_docker//go:image.bzl", "go_image") load("@io_bazel_rules_docker//container:container.bzl", "container_push") IMPORT_PATH = "github.com/prysmaticlabs/prysm/tools/faucet" + SRCS = [ "main.go", "server.go", ] + DEPS = [ "//proto/faucet:faucet_go_proto", "@org_golang_google_grpc//:go_default_library", @@ -21,11 +23,12 @@ DEPS = [ "@com_github_ethereum_go_ethereum//params:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ] go_library( name = "go_default_library", - srcs = SRCS, + srcs = SRCS, importpath = IMPORT_PATH, visibility = ["//visibility:private"], deps = DEPS, @@ -40,14 +43,14 @@ go_binary( go_image( name = "image", srcs = SRCS, - importpath = IMPORT_PATH, - deps = DEPS, - pure = "off", # depends on cgo for go-ethereum crypto - static = "off", # go-ethereum is bad about static - tags = ["manual"], goarch = "amd64", goos = "linux", + importpath = IMPORT_PATH, + pure = "off", # depends on cgo for go-ethereum crypto race = "off", + static = "off", # go-ethereum is bad about static + tags = ["manual"], + deps = DEPS, ) container_push( diff --git a/tools/faucet/main.go b/tools/faucet/main.go index c209ef5e3c..09507844ee 100644 --- a/tools/faucet/main.go +++ b/tools/faucet/main.go @@ -7,6 +7,7 @@ import ( recaptcha "github.com/prestonvanloon/go-recaptcha" faucetpb "github.com/prysmaticlabs/prysm/proto/faucet" + _ "go.uber.org/automaxprocs" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/tools/relaynode/BUILD.bazel b/tools/relaynode/BUILD.bazel index de88c0b455..fbc0b84f1d 100644 --- a/tools/relaynode/BUILD.bazel +++ b/tools/relaynode/BUILD.bazel @@ -14,18 +14,21 @@ go_library( "@com_github_libp2p_go_libp2p_circuit//:go_default_library", "@com_github_libp2p_go_libp2p_crypto//:go_default_library", "@com_github_multiformats_go_multiaddr//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) go_image( name = "image", srcs = ["relaynode.go"], - importpath = "github.com/prysmaticlabs/prysm/tools/relaynode", - visibility = ["//visibility:private"], - static = "on", - tags = ["manual"], goarch = "amd64", goos = "linux", + importpath = "github.com/prysmaticlabs/prysm/tools/relaynode", + pure = "on", + race = "off", + static = "on", + tags = ["manual"], + visibility = ["//visibility:private"], deps = [ "//shared/version:go_default_library", "@com_github_ipfs_go_log//:go_default_library", @@ -33,9 +36,8 @@ go_image( "@com_github_libp2p_go_libp2p_circuit//:go_default_library", "@com_github_libp2p_go_libp2p_crypto//:go_default_library", "@com_github_multiformats_go_multiaddr//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], - race = "off", - pure = "on", ) container_push( diff --git a/tools/relaynode/relaynode.go b/tools/relaynode/relaynode.go index 6a02a7076c..1a881cce58 100644 --- a/tools/relaynode/relaynode.go +++ b/tools/relaynode/relaynode.go @@ -19,6 +19,7 @@ import ( crypto "github.com/libp2p/go-libp2p-crypto" multiaddr "github.com/multiformats/go-multiaddr" "github.com/prysmaticlabs/prysm/shared/version" + _ "go.uber.org/automaxprocs" ) var ( diff --git a/tools/ssz-server/BUILD.bazel b/tools/ssz-server/BUILD.bazel index 35bc1bdc66..85bc12e983 100644 --- a/tools/ssz-server/BUILD.bazel +++ b/tools/ssz-server/BUILD.bazel @@ -10,6 +10,7 @@ go_library( deps = [ "//proto/beacon/p2p/v1:go_default_library", "@com_github_prysmaticlabs_go_ssz//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -22,18 +23,19 @@ go_binary( go_image( name = "image", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/tools/ssz-server", - visibility = ["//visibility:private"], - static = "on", - tags = ["manual"], goarch = "amd64", goos = "linux", + importpath = "github.com/prysmaticlabs/prysm/tools/ssz-server", + pure = "on", + race = "off", + static = "on", + tags = ["manual"], + visibility = ["//visibility:private"], deps = [ "//proto/beacon/p2p/v1:go_default_library", "@com_github_prysmaticlabs_go_ssz//:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], - race = "off", - pure = "on", ) container_push( diff --git a/tools/ssz-server/main.go b/tools/ssz-server/main.go index 2a807a6a15..e8eb85c4bd 100644 --- a/tools/ssz-server/main.go +++ b/tools/ssz-server/main.go @@ -15,6 +15,7 @@ import ( ssz "github.com/prysmaticlabs/go-ssz" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" + _ "go.uber.org/automaxprocs" ) func main() { diff --git a/validator/BUILD.bazel b/validator/BUILD.bazel index 38ad77114f..0fc90cf8d7 100644 --- a/validator/BUILD.bazel +++ b/validator/BUILD.bazel @@ -24,6 +24,7 @@ go_library( "@com_github_urfave_cli//:go_default_library", "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", "@org_golang_x_crypto//ssh/terminal:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) @@ -45,8 +46,8 @@ go_image( "//shared/cmd:go_default_library", "//shared/debug:go_default_library", "//shared/featureconfig:go_default_library", - "//shared/version:go_default_library", "//shared/logutil:go_default_library", + "//shared/version:go_default_library", "//validator/accounts:go_default_library", "//validator/node:go_default_library", "//validator/types:go_default_library", @@ -55,6 +56,7 @@ go_image( "@com_github_urfave_cli//:go_default_library", "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", "@org_golang_x_crypto//ssh/terminal:go_default_library", + "@org_uber_go_automaxprocs//:go_default_library", ], ) diff --git a/validator/main.go b/validator/main.go index e80c8c3443..02a3c206c8 100644 --- a/validator/main.go +++ b/validator/main.go @@ -20,6 +20,7 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli" prefixed "github.com/x-cray/logrus-prefixed-formatter" + _ "go.uber.org/automaxprocs" "golang.org/x/crypto/ssh/terminal" )