Fix/prometheusexporter Shutdown HTTP server #35465
Open
+36
−6
Conversation
This file contains 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
Argannor
force-pushed
the
fix/prometheusexporter-shutdown-server
branch
from
00e689f
to
52eee00
Compare
dashpole
reviewed
Sep 27, 2024
| mux := http.NewServeMux() | ||
| mux.Handle("/metrics", pe.handler) | ||
| srv, err := pe.config.ToServer(ctx, host, pe.settings, mux) | ||
| pe.shutdownFunc = func(ctx context.Context) error { | ||
| err := ln.Close() | ||
| err2 := srv.Shutdown(ctx) |
There was a problem hiding this comment.
will srv be nil if ToServer returned an error above?
There was a problem hiding this comment.
You're right, I'll adjust it accordingly!
atoulme
reviewed
Sep 27, 2024
| func (pe *prometheusExporter) Shutdown(context.Context) error { | ||
| return pe.shutdownFunc() | ||
| func (pe *prometheusExporter) Shutdown(ctx context.Context) error { | ||
| return pe.shutdownFunc(ctx) |
There was a problem hiding this comment.
Thanks for the hint. What would you prefer to happen when ctx is nil? Pass ctx.TODO on or return an error?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description: Shutdown the http.Server instance on exporter shutdown
Link to tracking Issue: #35464
Testing: Manual testing. I included this version of the exporter in our internal distribution and deployed it to verify the metrics no longer go stale after receiving a
NOHUPsignal.Documentation: n/a