From 4de6b9d19096ae66aa920b235c335a48e421dc06 Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Thu, 19 Oct 2023 21:35:50 -0600 Subject: [PATCH 1/2] Fix load default settings for internal server Signed-off-by: Ruben Vargas --- cmd/tempo/app/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/tempo/app/config.go b/cmd/tempo/app/config.go index 7948e2352be..c61749b6497 100644 --- a/cmd/tempo/app/config.go +++ b/cmd/tempo/app/config.go @@ -80,7 +80,7 @@ func (c *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) { c.Server.LogLevel.RegisterFlags(f) // Internal server settings - flagext.DefaultValues(&c.InternalServer) + flagext.DefaultValues(&c.InternalServer.Config) // Increase max message size to 16MB c.Server.GPRCServerMaxRecvMsgSize = 16 * 1024 * 1024 From 0913fc27960df5f3d904f65b3fb86e3c06e7f2d7 Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Thu, 19 Oct 2023 21:45:45 -0600 Subject: [PATCH 2/2] update CHANGELOG Signed-off-by: Ruben Vargas --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68241decdc0..6d93085605f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## main / unreleased +* [BUGFIX] Load defaults for the internal server [#3041](https://github.com/grafana/tempo/pull/3041) (@rubenvp8510) * [ENHANCEMENT] Support quoted attribute name in TraceQL [#3004](https://github.com/grafana/tempo/pull/3004) (@kousikmitra) * [BUGFIX] Fix pass-through to runtime overrides for FilterPolicies and TargetInfoExcludedDimensions [#3012](https://github.com/grafana/tempo/pull/3012) (@electron0zero) * [ENHANCEMENT] Unescape tag names [#2894](https://github.com/grafana/tempo/pull/2894) (@fabrizio-grafana)