Restore tempo_request_duration_seconds metrics for querier_api_* requests #3403
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,8 @@ import ( | |
| ) | ||
|
|
||
| type TempoServer interface { | ||
| HTTPRouter() *mux.Router | ||
| HTTPHandler() http.Handler | ||
| GRPC() *grpc.Server | ||
| Log() log.Logger | ||
| EnableHTTP2() | ||
|
|
@@ -32,7 +33,8 @@ type TempoServer interface { | |
|
|
||
| // todo: evaluate whether the internal server should be included as part of this | ||
| type tempoServer struct { | ||
| mux *mux.Router // all tempo http routes are added here | ||
| handler http.Handler // the final handler which includes the router and any middleware | ||
|
|
||
| externalServer *server.Server // the standard server that all HTTP/GRPC requests are served on | ||
| enableHTTP2Once sync.Once | ||
|
|
@@ -45,10 +47,14 @@ func newTempoServer() *tempoServer { | |
| } | ||
| } | ||
|
|
||
| func (s *tempoServer) HTTPRouter() *mux.Router { | ||
| return s.mux | ||
| } | ||
|
|
||
| func (s *tempoServer) HTTPHandler() http.Handler { | ||
| return s.handler | ||
| } | ||
|
|
||
| func (s *tempoServer) GRPC() *grpc.Server { | ||
| return s.externalServer.GRPC | ||
| } | ||
|
|
@@ -71,22 +77,28 @@ func (s *tempoServer) StartAndReturnService(cfg server.Config, supportGRPCOnHTTP | |
| var err error | ||
|
|
||
| metrics := server.NewServerMetrics(cfg) | ||
| DisableSignalHandling(&cfg) | ||
|
|
||
| if !supportGRPCOnHTTP { | ||
| // We don't do any GRPC handling, let the library handle all routing for us | ||
| cfg.Router = s.mux | ||
|
|
||
| s.externalServer, err = server.NewWithMetrics(cfg, metrics) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create server: %w", err) | ||
| } | ||
| s.handler = s.externalServer.HTTPServer.Handler | ||
|
Contributor
Author
There was a problem hiding this comment. @joe-elliott we were really close while pairing. We used |
||
| } else { | ||
| // We want to route both GRPC and HTTP requests on the same endpoint | ||
| cfg.Router = nil | ||
| cfg.DoNotAddDefaultHTTPMiddleware = true // we don't want instrumentation on the "root" router, we want it on our mux. it will be added below. | ||
|
|
||
| s.externalServer, err = server.NewWithMetrics(cfg, metrics) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create server: %w", err) | ||
| } | ||
|
|
||
| // now that we have created the server and service let's setup our grpc/http router if necessary | ||
| // for grpc to work we must enable h2c on the external server | ||
| s.EnableHTTP2() | ||
|
|
||
|
|
@@ -96,7 +108,8 @@ func (s *tempoServer) StartAndReturnService(cfg server.Config, supportGRPCOnHTTP | |
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create http middleware: %w", err) | ||
| } | ||
|
|
||
| s.handler = middleware.Merge(httpMiddleware...).Wrap(s.mux) | ||
| s.externalServer.HTTP.PathPrefix("/").HandlerFunc(func(w http.ResponseWriter, req *http.Request) { | ||
| // route to GRPC server if it's a GRPC request | ||
| if req.ProtoMajor == 2 && strings.Contains(req.Header.Get("Content-Type"), "application/grpc") { | ||
|
|
@@ -105,7 +118,7 @@ func (s *tempoServer) StartAndReturnService(cfg server.Config, supportGRPCOnHTTP | |
| } | ||
|
|
||
| // default to standard http server | ||
| s.handler.ServeHTTP(w, req) | ||
| }) | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i like this rename for clarity