mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-07 06:34:01 -05:00
#### This PR sets the foundation for the new logging features. --- The goal of this big PR is the following: 1. Adding a log.go file to every package: [_commit_](54f6396d4c) - Writing a bash script that adds the log.go file to every package that imports logrus, except the excluded packages, configured at the top of the bash script. - the log.go file creates a log variable and sets a field called `package` to the full path of that package. - I have tried to fix every error/problem that came from mass generation of this file. (duplicate declarations, different prefix names, etc...) - some packages had the log.go file from before, and had some helper functions in there as well. I've moved all of them to a `log_helpers.go` file within each package. 2. Create a CI rule which verifies that: [_commit_](b799c3a0ef) - every package which imports logrus, also has a log.go file, except the excluded packages. - the `package` field of each log.go variable, has the correct path. (to detect when we move a package or change it's name) - I pushed a commit with a manually changed log.go file to trigger the ci check failure and it worked. 3. Alter the logging system to read the prefix from this `package` field for every log while outputing: [_commit_](b0c7f1146c) - some packages have/want/need a different log prefix than their package name (like `kv`). This can be solved by keeping a map of package paths to prefix names somewhere. --- **Some notes:** - Please review everything carefully. - I created the `prefixReplacement` map and populated the data that I deemed necessary. Please check it and complain if something doesn't make sense or is missing. I attached at the bottom, the list of all the packages that used to use a different name than their package name as their prefix. - I have chosen to mark some packages to be excluded from this whole process. They will either not log anything, or log without a prefix, or log using their previously defined prefix. See the list of exclusions in the bottom. - I fixed all the tests that failed because of this change. These were failing because they were expecting the old prefix to be in the generated logs. I have changed those to expect the new `package` field instead. This might not be a great solution. Ideally we might want to remove this from the tests so they only test for relevant fields in the logs. but this is a problem for another day. - Please run the node with this config, and mention if you see something weird in the logs. (use different verbosities) - The CI workflow uses a script that basically runs the `hack/gen-logs.sh` and checks that the git diff is zero. that script is `hack/check-logs.sh`. This means that if one runs this script locally, it will not actually _check_ anything, rather than just regenerate the log.go files and fix any mistake. This might be confusing. Please suggest solutions if you think it's a problem. --- **A list of packages that used a different prefix than their package names for their logs:** - beacon-chain/cache/depositsnapshot/ package depositsnapshot, prefix "cache" - beacon-chain/core/transition/log.go — package transition, prefix "state" - beacon-chain/db/kv/log.go — package kv, prefix "db" - beacon-chain/db/slasherkv/log.go — package slasherkv, prefix "slasherdb" - beacon-chain/db/pruner/pruner.go — package pruner, prefix "db-pruner" - beacon-chain/light-client/log.go — package light_client, prefix "light-client" - beacon-chain/operations/attestations/log.go — package attestations, prefix "pool/attestations" - beacon-chain/operations/slashings/log.go — package slashings, prefix "pool/slashings" - beacon-chain/rpc/core/log.go — package core, prefix "rpc/core" - beacon-chain/rpc/eth/beacon/log.go — package beacon, prefix "rpc/beaconv1" - beacon-chain/rpc/eth/validator/log.go — package validator, prefix "beacon-api" - beacon-chain/rpc/prysm/v1alpha1/beacon/log.go — package beacon, prefix "rpc" - beacon-chain/rpc/prysm/v1alpha1/validator/log.go — package validator, prefix "rpc/validator" - beacon-chain/state/stategen/log.go — package stategen, prefix "state-gen" - beacon-chain/sync/checkpoint/log.go — package checkpoint, prefix "checkpoint-sync" - beacon-chain/sync/initial-sync/log.go — package initialsync, prefix "initial-sync" - cmd/prysmctl/p2p/log.go — package p2p, prefix "prysmctl-p2p" - config/features/log.go -- package features, prefix "flags" - io/file/log.go — package file, prefix "fileutil" - proto/prysm/v1alpha1/log.go — package eth, prefix "protobuf" - validator/client/beacon-api/log.go — package beacon_api, prefix "beacon-api" - validator/db/kv/log.go — package kv, prefix "db" - validator/db/filesystem/db.go — package filesystem, prefix "db" - validator/keymanager/derived/log.go — package derived, prefix "derived-keymanager" - validator/keymanager/local/log.go — package local, prefix "local-keymanager" - validator/keymanager/remote-web3signer/log.go — package remote_web3signer, prefix "remote-keymanager" - validator/keymanager/remote-web3signer/internal/log.go — package internal, prefix "remote-web3signer- internal" - beacon-chain/forkchoice/doubly... prefix is "forkchoice-doublylinkedtree" **List of excluded directories (their subdirectories are also excluded):** ``` EXCLUDED_PATH_PREFIXES=( "testing" "validator/client/testutil" "beacon-chain/p2p/testing" "beacon-chain/rpc/eth/config" "beacon-chain/rpc/prysm/v1alpha1/debug" "tools" "runtime" "monitoring" "io" "cmd" ".well-known" "changelog" "hack" "specrefs" "third_party" "bazel-out" "bazel-bin" "bazel-prysm" "bazel-testlogs" "build" ".github" ".jj" ".idea" ".vscode" ) ```
151 lines
4.5 KiB
Go
151 lines
4.5 KiB
Go
package network
|
|
|
|
import (
|
|
"context"
|
|
"encoding/base64"
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/OffchainLabs/prysm/v7/network/authorization"
|
|
gethRPC "github.com/ethereum/go-ethereum/rpc"
|
|
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
|
|
)
|
|
|
|
// Endpoint is an endpoint with authorization data.
|
|
type Endpoint struct {
|
|
Url string
|
|
Auth AuthorizationData
|
|
}
|
|
|
|
// AuthorizationData holds all information necessary to authorize with HTTP.
|
|
type AuthorizationData struct {
|
|
Method authorization.Method
|
|
Value string
|
|
JwtId string
|
|
}
|
|
|
|
// Equals compares two endpoints for equality.
|
|
func (e Endpoint) Equals(other Endpoint) bool {
|
|
return e.Url == other.Url && e.Auth.Equals(other.Auth)
|
|
}
|
|
|
|
// HttpClient creates a http client object dependent
|
|
// on the properties of the network endpoint.
|
|
func (e Endpoint) HttpClient() *http.Client {
|
|
if e.Auth.Method != authorization.Bearer {
|
|
return &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)}
|
|
}
|
|
return NewHttpClientWithSecret(e.Auth.Value, e.Auth.JwtId)
|
|
}
|
|
|
|
// Equals compares two authorization data objects for equality.
|
|
func (d *AuthorizationData) Equals(other AuthorizationData) bool {
|
|
return d.Method == other.Method && d.Value == other.Value
|
|
}
|
|
|
|
// ToHeaderValue retrieves the value of the authorization header from AuthorizationData.
|
|
func (d *AuthorizationData) ToHeaderValue() (string, error) {
|
|
switch d.Method {
|
|
case authorization.Basic:
|
|
return "Basic " + d.Value, nil
|
|
case authorization.Bearer:
|
|
return "Bearer " + d.Value, nil
|
|
case authorization.None:
|
|
return "", nil
|
|
}
|
|
|
|
return "", errors.New("could not create HTTP header for unknown authorization method")
|
|
}
|
|
|
|
// HttpEndpoint extracts an httputils.Endpoint from the provider parameter.
|
|
func HttpEndpoint(eth1Provider string) Endpoint {
|
|
endpoint := Endpoint{
|
|
Url: "",
|
|
Auth: AuthorizationData{
|
|
Method: authorization.None,
|
|
Value: "",
|
|
}}
|
|
|
|
authValues := strings.Split(eth1Provider, ",")
|
|
endpoint.Url = strings.TrimSpace(authValues[0])
|
|
if len(authValues) > 2 {
|
|
log.Errorf(
|
|
"ETH1 endpoint string can contain one comma for specifying the authorization header to access the provider."+
|
|
" String contains too many commas: %d. Skipping authorization.", len(authValues)-1)
|
|
} else if len(authValues) == 2 {
|
|
switch Method(strings.TrimSpace(authValues[1])) {
|
|
case authorization.Basic:
|
|
basicAuthValues := strings.Split(strings.TrimSpace(authValues[1]), " ")
|
|
if len(basicAuthValues) != 2 {
|
|
log.Errorf("Basic Authentication has incorrect format. Skipping authorization.")
|
|
} else {
|
|
endpoint.Auth.Method = authorization.Basic
|
|
endpoint.Auth.Value = base64.StdEncoding.EncodeToString([]byte(basicAuthValues[1]))
|
|
}
|
|
case authorization.Bearer:
|
|
bearerAuthValues := strings.Split(strings.TrimSpace(authValues[1]), " ")
|
|
if len(bearerAuthValues) != 2 {
|
|
log.Errorf("Bearer Authentication has incorrect format. Skipping authorization.")
|
|
} else {
|
|
endpoint.Auth.Method = authorization.Bearer
|
|
endpoint.Auth.Value = bearerAuthValues[1]
|
|
}
|
|
case authorization.None:
|
|
log.Errorf("Authorization has incorrect format or authorization type is not supported.")
|
|
}
|
|
}
|
|
return endpoint
|
|
}
|
|
|
|
// Method returns the authorizationmethod.AuthorizationMethod corresponding with the parameter value.
|
|
func Method(auth string) authorization.Method {
|
|
if strings.HasPrefix(strings.ToLower(auth), "basic") {
|
|
return authorization.Basic
|
|
}
|
|
if strings.HasPrefix(strings.ToLower(auth), "bearer") {
|
|
return authorization.Bearer
|
|
}
|
|
return authorization.None
|
|
}
|
|
|
|
// NewHttpClientWithSecret returns a http client that utilizes
|
|
// jwt authentication.
|
|
func NewHttpClientWithSecret(secret, id string) *http.Client {
|
|
authTransport := &jwtTransport{
|
|
underlyingTransport: http.DefaultTransport,
|
|
jwtSecret: []byte(secret),
|
|
jwtId: id,
|
|
}
|
|
return &http.Client{
|
|
Timeout: DefaultRPCHTTPTimeout,
|
|
Transport: otelhttp.NewTransport(authTransport),
|
|
}
|
|
}
|
|
|
|
func NewExecutionRPCClient(ctx context.Context, endpoint Endpoint, headers http.Header) (*gethRPC.Client, error) {
|
|
// Need to handle ipc and http
|
|
var client *gethRPC.Client
|
|
u, err := url.Parse(endpoint.Url)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
switch u.Scheme {
|
|
case "http", "https":
|
|
client, err = gethRPC.DialOptions(ctx, endpoint.Url, gethRPC.WithHTTPClient(endpoint.HttpClient()), gethRPC.WithHeaders(headers))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case "", "ipc":
|
|
client, err = gethRPC.DialIPC(ctx, endpoint.Url)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
default:
|
|
return nil, fmt.Errorf("no known transport for URL scheme %q", u.Scheme)
|
|
}
|
|
return client, nil
|
|
}
|