From a3345f02d1ef68b6a1e64ad118dfae863fdc22ac Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Wed, 18 Sep 2024 08:13:28 -0600 Subject: [PATCH] Remove Repeated Fields Out of Base Configuration Signed-off-by: Mahad Zaryab --- cmd/jaeger/internal/extension/jaegerquery/server.go | 2 +- cmd/query/app/flags.go | 8 ++++---- cmd/query/app/server_test.go | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go index 19ac2fab9ed..23274e8fd1b 100644 --- a/cmd/jaeger/internal/extension/jaegerquery/server.go +++ b/cmd/jaeger/internal/extension/jaegerquery/server.go @@ -81,7 +81,7 @@ func (s *server) Start(_ context.Context, host component.Host) error { return err } - tm := tenancy.NewManager(&s.config.Tenancy) + tm := tenancy.NewManager(&s.config.Connection.Tenancy) // TODO OTel-collector does not initialize the tracer currently // https://github.com/open-telemetry/opentelemetry-collector/issues/7532 diff --git a/cmd/query/app/flags.go b/cmd/query/app/flags.go index 34d6fde6d98..f8991855925 100644 --- a/cmd/query/app/flags.go +++ b/cmd/query/app/flags.go @@ -67,12 +67,8 @@ type QueryOptionsBase struct { UIConfig string `valid:"optional" mapstructure:"ui_config"` // BearerTokenPropagation activate/deactivate bearer token propagation to storage BearerTokenPropagation bool - // AdditionalHeaders - AdditionalHeaders http.Header // MaxClockSkewAdjust is the maximum duration by which jaeger-query will adjust a span MaxClockSkewAdjust time.Duration - // Tenancy configures tenancy for query - Tenancy tenancy.Options // EnableTracing determines whether traces will be emitted by jaeger-query. EnableTracing bool } @@ -81,6 +77,10 @@ type QueryOptionsBase struct { type QueryOptions struct { QueryOptionsBase + // Tenancy configures tenancy for query + Tenancy tenancy.Options + // AdditionalHeaders + AdditionalHeaders http.Header // HTTPHostPort is the host:port address that the query service listens in on for http requests HTTPHostPort string // GRPCHostPort is the host:port address that the query service listens in on for gRPC requests diff --git a/cmd/query/app/server_test.go b/cmd/query/app/server_test.go index b028dfbaed7..d5a22a2f34b 100644 --- a/cmd/query/app/server_test.go +++ b/cmd/query/app/server_test.go @@ -721,10 +721,8 @@ func TestServerHTTPTenancy(t *testing.T) { serverOptions := &QueryOptions{ HTTPHostPort: ":8080", GRPCHostPort: ":8080", - QueryOptionsBase: QueryOptionsBase{ - Tenancy: tenancy.Options{ - Enabled: true, - }, + Tenancy: tenancy.Options{ + Enabled: true, }, } tenancyMgr := tenancy.NewManager(&serverOptions.Tenancy)