feat(reexecute/c): explicit metrics port #4418
+46
−27
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 |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ package tests | |
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net" | ||
| "net/http" | ||
| "time" | ||
|
|
@@ -14,7 +15,10 @@ import ( | |
| "github.com/prometheus/client_golang/prometheus/promhttp" | ||
| ) | ||
|
|
||
| const ( | ||
| localhostAddr = "127.0.0.1" | ||
| defaultMetricsPort = 0 | ||
| ) | ||
|
|
||
| // PrometheusServer is a HTTP server that serves Prometheus metrics from the provided | ||
| // gahterer. | ||
|
|
@@ -28,25 +32,32 @@ type PrometheusServer struct { | |
| // 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) { | ||
| return NewPrometheusServerWithPort(gatherer, defaultMetricsPort) | ||
| } | ||
|
|
||
| // NewPrometheusServerWithPort creates and starts a Prometheus server with the provided gatherer | ||
| // listening on 127.0.0.1:port and serving /ext/metrics. | ||
| func NewPrometheusServerWithPort(gatherer prometheus.Gatherer, port uint64) (*PrometheusServer, error) { | ||
|
Comment on lines
+38
to
+40
There was a problem hiding this comment. Consider using functional options pattern here, but think this is fine since it's just adding one extra constructor. There was a problem hiding this comment. I would prefer the additional constructor for the following reasons:
|
||
| server := &PrometheusServer{ | ||
| gatherer: gatherer, | ||
| } | ||
|
|
||
| serverAddress := fmt.Sprintf("%s:%d", localhostAddr, port) | ||
| if err := server.start(serverAddress); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return server, nil | ||
| } | ||
|
|
||
| // start the Prometheus server on address. | ||
| func (s *PrometheusServer) start(address string) error { | ||
| mux := http.NewServeMux() | ||
| mux.Handle("/ext/metrics", promhttp.HandlerFor(s.gatherer, promhttp.HandlerOpts{})) | ||
|
|
||
| listener, err := net.Listen("tcp", address) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to listen on %s: %w", address, err) | ||
| } | ||
|
|
||
| s.server = http.Server{ | ||
|
|
||
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
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 would like to see
METRICS_SERVER_PORTbe in addition toMETRICS_SERVER_ENABLEDrather than its replacement. The default port should remain zero - dynamic - and that detail shouldn't be required knowledge for those who don't want to set a specific port.