Remove Repeated Fields Out of Base Configuration

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>

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

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

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)