-
Notifications
You must be signed in to change notification settings - Fork 840
Add WritePrometheusServiceDiscoveryConfigFile helper #4072
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
Merged
aaronbuchwald
merged 8 commits into
master
from
aaronbuchwald/write-prometheus-sd-files
Jul 16, 2025
+164
−148
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d8a736f
Add WritePrometheusServiceDiscoveryConfigFile helper and clean up pro…
aaronbuchwald d35eb0f
Nits
aaronbuchwald d809937
Address review
aaronbuchwald 299f590
Update tests/fixture/tmpnet/monitor_processes.go
aaronbuchwald ac3cf30
Merge branch 'master' into aaronbuchwald/write-prometheus-sd-files
aaronbuchwald 4f9d4cb
Address comments
aaronbuchwald d36978d
improve comment
aaronbuchwald 27f20b0
simplify and document prometheus server
aaronbuchwald File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright (C) 2019-2024, Ava Labs, Inc. All rights reserved. | ||
maru-ava marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // See the file LICENSE for licensing terms. | ||
|
|
||
| package tests | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "net" | ||
| "net/http" | ||
| "time" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/client_golang/prometheus/promhttp" | ||
| ) | ||
|
|
||
| const defaultPrometheusListenAddr = "127.0.0.1:0" | ||
|
|
||
| // PrometheusServer is a HTTP server that serves Prometheus metrics from the provided | ||
| // gahterer. | ||
| // Listens on localhost with a dynamic port and serves metrics at /ext/metrics. | ||
| type PrometheusServer struct { | ||
| gatherer prometheus.Gatherer | ||
| server http.Server | ||
| errChan chan error | ||
| } | ||
|
|
||
| // NewPrometheusServer creates and starts a Prometheus server with the provided gatherer | ||
| // listening on 127.0.0.1:0 and serving /ext/metrics. | ||
| func NewPrometheusServer(gatherer prometheus.Gatherer) (*PrometheusServer, error) { | ||
| server := &PrometheusServer{ | ||
| gatherer: gatherer, | ||
| } | ||
|
|
||
| if err := server.start(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return server, nil | ||
| } | ||
|
|
||
| // start the Prometheus server on a dynamic port. | ||
| func (s *PrometheusServer) start() error { | ||
| mux := http.NewServeMux() | ||
| mux.Handle("/ext/metrics", promhttp.HandlerFor(s.gatherer, promhttp.HandlerOpts{})) | ||
|
|
||
| listener, err := net.Listen("tcp", defaultPrometheusListenAddr) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| s.server = http.Server{ | ||
| Addr: listener.Addr().String(), | ||
| Handler: mux, | ||
| ReadHeaderTimeout: time.Second, | ||
| ReadTimeout: time.Second, | ||
| } | ||
|
|
||
| s.errChan = make(chan error, 1) | ||
| go func() { | ||
| err := s.server.Serve(listener) | ||
| if !errors.Is(err, http.ErrServerClosed) { | ||
| s.errChan <- err | ||
| } | ||
| close(s.errChan) | ||
| }() | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // Stop gracefully shuts down the Prometheus server. | ||
| // Waits for the server to shut down and returns any error that occurred during shutdown. | ||
| func (s *PrometheusServer) Stop() error { | ||
| shutdownCtx, cancel := context.WithTimeout(context.Background(), time.Second) | ||
| defer cancel() | ||
|
|
||
| return errors.Join( | ||
| s.server.Shutdown(shutdownCtx), | ||
| <-s.errChan, | ||
| ) | ||
| } | ||
|
|
||
| // Address returns the address the server is listening on. | ||
RodrigoVillar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // If the server has not started, the address will be empty. | ||
| func (s *PrometheusServer) Address() string { | ||
maru-ava marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return s.server.Addr | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.