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.

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

[query] Change HTTP and TLS server configurations to use OTEL configurations #6023

Merged
merged 11 commits into from
Sep 28, 2024
Prev Previous commit
Next Next commit
Address Feedback From PR Review
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
mahadzaryab1 committed Sep 28, 2024
commit ac8b60880842c5dfa57a74e312d33b59e06cb880
1 change: 0 additions & 1 deletion cmd/jaeger/internal/extension/jaegerquery/server.go
Original file line number Diff line number Diff line change
@@ -159,7 +159,6 @@ func (s *server) createMetricReader(host component.Host) (metricsstore.Reader, e
}

func (s *server) makeQueryOptions() *queryApp.QueryOptions {
// TODO handle TLS
return &s.config.QueryOptions
}

6 changes: 2 additions & 4 deletions cmd/query/app/flags.go
Original file line number Diff line number Diff line change
@@ -104,14 +104,12 @@ func (qOpts *QueryOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) (*Q
if err != nil {
return qOpts, fmt.Errorf("failed to process gRPC TLS options: %w", err)
}
otelTLSCfg := tlsGrpc.ToOtelServerConfig()
qOpts.GRPC.TLSSetting = otelTLSCfg
qOpts.GRPC.TLSSetting = tlsGrpc.ToOtelServerConfig()
tlsHTTP, err := tlsHTTPFlagsConfig.InitFromViper(v)
if err != nil {
return qOpts, fmt.Errorf("failed to process HTTP TLS options: %w", err)
}
otelHTTPCfg := tlsHTTP.ToOtelServerConfig()
qOpts.HTTP.TLSSetting = otelHTTPCfg
qOpts.HTTP.TLSSetting = tlsHTTP.ToOtelServerConfig()
qOpts.BasePath = v.GetString(queryBasePath)
qOpts.UIConfig.AssetsPath = v.GetString(queryStaticFiles)
qOpts.UIConfig.LogAccess = v.GetBool(queryLogStaticAssetsAccess)
Loading
Oops, something went wrong.