fix: `codec` not initialized in downstream roundtripper (#12873)

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
pull/12880/head
Kaviraj Kanagaraj 1 year ago committed by GitHub
parent e684ec8123
commit b6049f6792
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      pkg/lokifrontend/frontend/config.go
  2. 4
      pkg/lokifrontend/frontend/downstream_roundtripper.go

@ -43,7 +43,7 @@ func InitFrontend(cfg CombinedFrontendConfig, ring ring.ReadRing, limits v1.Limi
switch {
case cfg.DownstreamURL != "":
// If the user has specified a downstream Prometheus, then we should use that.
rt, err := NewDownstreamRoundTripper(cfg.DownstreamURL, http.DefaultTransport)
rt, err := NewDownstreamRoundTripper(cfg.DownstreamURL, http.DefaultTransport, codec)
return rt, nil, nil, err
case cfg.FrontendV2.SchedulerAddress != "" || ring != nil:
// If query-scheduler address is configured, use Frontend.

@ -20,13 +20,13 @@ type downstreamRoundTripper struct {
codec queryrangebase.Codec
}
func NewDownstreamRoundTripper(downstreamURL string, transport http.RoundTripper) (queryrangebase.Handler, error) {
func NewDownstreamRoundTripper(downstreamURL string, transport http.RoundTripper, codec queryrangebase.Codec) (queryrangebase.Handler, error) {
u, err := url.Parse(downstreamURL)
if err != nil {
return nil, err
}
return &downstreamRoundTripper{downstreamURL: u, transport: transport}, nil
return &downstreamRoundTripper{downstreamURL: u, transport: transport, codec: codec}, nil
}
func (d downstreamRoundTripper) Do(ctx context.Context, req queryrangebase.Request) (queryrangebase.Response, error) {

Loading…
Cancel
Save