Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 42 additions & 6 deletions api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,15 @@ type Options struct {
// limit of GOMAXPROCS or 8, whichever is larger. Status code 503 is served
// for GET requests that would exceed the concurrency limit; Connect calls
// receive ResourceExhausted.
Concurrency int
Concurrency int
ConnectUnaryConcurrency int
ConnectStreamConcurrency int
ConnectUnaryTimeout time.Duration
ConnectStreamIdleTimeout time.Duration
ConnectStreamLifetime time.Duration
ConnectReadMaxBytes int
ConnectSendMaxBytes int
ConnectMaxRequestBodyBytes int64
// Logger is used for logging, if nil, no logging will happen.
Logger *slog.Logger
// Registry is used to register Prometheus metrics. If nil, no metrics
Expand Down Expand Up @@ -133,12 +141,33 @@ func New(opts Options) (*API, error) {
if err != nil {
return nil, err
}
connect := apiconnect.NewAPI(apiconnect.Options{
Peer: opts.Peer,
UnaryConcurrency: concurrency,
StreamConcurrency: concurrency,
UnaryTimeout: opts.Timeout,
unaryConcurrency := opts.ConnectUnaryConcurrency
if unaryConcurrency < 1 {
unaryConcurrency = concurrency
}
streamConcurrency := opts.ConnectStreamConcurrency
if streamConcurrency < 1 {
streamConcurrency = concurrency
}
unaryTimeout := opts.ConnectUnaryTimeout
if unaryTimeout == 0 {
unaryTimeout = opts.Timeout
}
connect, err := apiconnect.NewAPI(apiconnect.Options{
Peer: opts.Peer,
Registerer: opts.Registry,
UnaryConcurrency: unaryConcurrency,
StreamConcurrency: streamConcurrency,
UnaryTimeout: unaryTimeout,
StreamIdleTimeout: opts.ConnectStreamIdleTimeout,
StreamLifetime: opts.ConnectStreamLifetime,
ReadMaxBytes: opts.ConnectReadMaxBytes,
SendMaxBytes: opts.ConnectSendMaxBytes,
MaxRequestBodyBytes: opts.ConnectMaxRequestBodyBytes,
})
if err != nil {
return nil, err
}

requestsInFlight := prometheus.NewGauge(prometheus.GaugeOpts{
Name: "alertmanager_http_requests_in_flight",
Expand Down Expand Up @@ -264,6 +293,13 @@ func (api *API) Update(cfg *config.Config, setAlertStatus func(ctx context.Conte
}
}

// Shutdown rejects new Connect RPCs and cancels active RPCs.
func (api *API) Shutdown() {
if api.connect != nil {
api.connect.Shutdown()
}
}

func (api *API) limitHandler(h http.Handler) http.Handler {
limited := api.concurrencyLimitHandler(h)
if api.timeout <= 0 {
Expand Down
3 changes: 2 additions & 1 deletion api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ func TestConcurrencyLimitHandler(t *testing.T) {
func TestConnectProceduresRegistered(t *testing.T) {
for _, routePrefix := range []string{"/", "/alertmanager"} {
t.Run(routePrefix, func(t *testing.T) {
connectAPI := apiconnect.NewAPI(apiconnect.Options{})
connectAPI, err := apiconnect.NewAPI(apiconnect.Options{})
require.NoError(t, err)
requestDuration := prometheus.NewHistogramVec(
prometheus.HistogramOpts{Name: "test_registered_http_request_duration_seconds"},
[]string{"handler", "method", "code"},
Expand Down
Loading
Loading