Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: proper error when parsing telemetry configuration #12981

Merged
merged 7 commits into from
Aug 23, 2022
Merged

fix: proper error when parsing telemetry configuration #12981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56e8ec9
Proper error when parsing telemetry configuration
liorbond Aug 21, 2022
b6d5383
Merge branch 'main' into liorb/proper_error_when_parsing_conf
atheeshp Aug 22, 2022
f9a1573
Merge branch 'main' into liorb/proper_error_when_parsing_conf
alexanderbez Aug 22, 2022
6828c00
Merge branch 'main' into liorb/proper_error_when_parsing_conf
alexanderbez Aug 22, 2022
cb6cda6
Get config returns empty config instead of default config
liorbond Aug 22, 2022
4e3c4be
Merge branch 'main' into liorb/proper_error_when_parsing_conf
julienrbrt Aug 22, 2022
d185107
Merge branch 'main' into liorb/proper_error_when_parsing_conf
julienrbrt Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions server/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,18 @@ func DefaultConfig() *Config {
}

// GetConfig returns a fully parsed Config object.
func GetConfig(v *viper.Viper) Config {
globalLabelsRaw := v.Get("telemetry.global-labels").([]interface{})
func GetConfig(v *viper.Viper) (Config, error) {
globalLabelsRaw, ok := v.Get("telemetry.global-labels").([]interface{})
if !ok {
return *DefaultConfig(), fmt.Errorf("failed to parse global-labels config")
alexanderbez marked this conversation as resolved.
Show resolved Hide resolved
}

globalLabels := make([][]string, 0, len(globalLabelsRaw))
for _, glr := range globalLabelsRaw {
labelsRaw := glr.([]interface{})
for idx, glr := range globalLabelsRaw {
labelsRaw, ok := glr.([]interface{})
if !ok {
return *DefaultConfig(), fmt.Errorf("failed to parse global label number %d from config", idx)
alexanderbez marked this conversation as resolved.
Show resolved Hide resolved
}
if len(labelsRaw) == 2 {
globalLabels = append(globalLabels, []string{labelsRaw[0].(string), labelsRaw[1].(string)})
}
Expand Down Expand Up @@ -356,7 +363,7 @@ func GetConfig(v *viper.Viper) Config {
SnapshotInterval: v.GetUint64("state-sync.snapshot-interval"),
SnapshotKeepRecent: v.GetUint32("state-sync.snapshot-keep-recent"),
},
}
}, nil
}

// ValidateBasic returns an error if min-gas-prices field is empty in BaseConfig. Otherwise, it returns nil.
Expand Down
14 changes: 12 additions & 2 deletions server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,13 @@ func startStandAlone(ctx *Context, appCreator types.AppCreator) error {
}

app := appCreator(ctx.Logger, db, traceWriter, ctx.Viper)
_, err = startTelemetry(serverconfig.GetConfig(ctx.Viper))

config, err := serverconfig.GetConfig(ctx.Viper)
if err != nil {
return err
}

_, err = startTelemetry(config)
if err != nil {
return err
}
Expand Down Expand Up @@ -271,7 +277,11 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App
return err
}

config := serverconfig.GetConfig(ctx.Viper)
config, err := serverconfig.GetConfig(ctx.Viper)
if err != nil {
return err
}

if err := config.ValidateBasic(); err != nil {
return err
}
Expand Down