2019-02-04 13:26:42 +00:00
|
|
|
// Copyright 2019 Prometheus Team
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package api
|
|
|
|
|
|
|
|
import (
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
"errors"
|
2019-01-25 17:13:52 +00:00
|
|
|
"fmt"
|
2019-02-04 13:26:42 +00:00
|
|
|
"net/http"
|
2019-01-25 17:13:52 +00:00
|
|
|
"runtime"
|
2019-02-04 13:26:42 +00:00
|
|
|
"time"
|
|
|
|
|
|
|
|
apiv1 "github.com/prometheus/alertmanager/api/v1"
|
|
|
|
apiv2 "github.com/prometheus/alertmanager/api/v2"
|
|
|
|
"github.com/prometheus/alertmanager/cluster"
|
|
|
|
"github.com/prometheus/alertmanager/config"
|
|
|
|
"github.com/prometheus/alertmanager/provider"
|
|
|
|
"github.com/prometheus/alertmanager/silence"
|
|
|
|
"github.com/prometheus/alertmanager/types"
|
2019-02-07 14:53:56 +00:00
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
2019-02-04 13:26:42 +00:00
|
|
|
"github.com/prometheus/common/model"
|
|
|
|
"github.com/prometheus/common/route"
|
|
|
|
|
|
|
|
"github.com/go-kit/kit/log"
|
|
|
|
)
|
|
|
|
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
// API represents all APIs of Alertmanager.
|
|
|
|
type API struct {
|
|
|
|
v1 *apiv1.API
|
|
|
|
v2 *apiv2.API
|
|
|
|
requestsInFlight prometheus.Gauge
|
|
|
|
concurrencyLimitExceeded prometheus.Counter
|
|
|
|
timeout time.Duration
|
|
|
|
inFlightSem chan struct{}
|
|
|
|
}
|
2019-02-07 14:53:56 +00:00
|
|
|
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
// Options for the creation of an API object. Alerts, Silences, and StatusFunc
|
|
|
|
// are mandatory to set. The zero value for everything else is a safe default.
|
|
|
|
type Options struct {
|
|
|
|
// Alerts to be used by the API. Mandatory.
|
|
|
|
Alerts provider.Alerts
|
|
|
|
// Silences to be used by the API. Mandatory.
|
|
|
|
Silences *silence.Silences
|
|
|
|
// StatusFunc is used be the API to retrieve the AlertStatus of an
|
|
|
|
// alert. Mandatory.
|
|
|
|
StatusFunc func(model.Fingerprint) types.AlertStatus
|
|
|
|
// Peer from the gossip cluster. If nil, no clustering will be used.
|
|
|
|
Peer *cluster.Peer
|
|
|
|
// Timeout for all HTTP connections. The zero value (and negative
|
|
|
|
// values) result in no timeout.
|
|
|
|
Timeout time.Duration
|
|
|
|
// Concurrency limit for GET requests. The zero value (and negative
|
|
|
|
// values) result in a limit of GOMAXPROCS or 8, whichever is
|
|
|
|
// larger. Status code 503 is served for GET requests that would exceed
|
|
|
|
// the concurrency limit.
|
|
|
|
Concurrency int
|
|
|
|
// Logger is used for logging, if nil, no logging will happen.
|
|
|
|
Logger log.Logger
|
|
|
|
// Registry is used to register Prometheus metrics. If nil, no metrics
|
|
|
|
// registration will happen.
|
|
|
|
Registry prometheus.Registerer
|
2019-02-07 14:53:56 +00:00
|
|
|
}
|
|
|
|
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
func (o Options) validate() error {
|
|
|
|
if o.Alerts == nil {
|
|
|
|
return errors.New("mandatory field Alerts not set")
|
|
|
|
}
|
|
|
|
if o.Silences == nil {
|
|
|
|
return errors.New("mandatory field Silences not set")
|
|
|
|
}
|
|
|
|
if o.StatusFunc == nil {
|
|
|
|
return errors.New("mandatory field StatusFunc not set")
|
|
|
|
}
|
|
|
|
return nil
|
2019-02-04 13:26:42 +00:00
|
|
|
}
|
|
|
|
|
2019-02-18 16:06:51 +00:00
|
|
|
// New creates a new API object combining all API versions. Note that an Update
|
|
|
|
// call is also needed to get the APIs into an operational state.
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
func New(opts Options) (*API, error) {
|
|
|
|
if err := opts.validate(); err != nil {
|
|
|
|
return nil, fmt.Errorf("invalid API options: %s", err)
|
|
|
|
}
|
|
|
|
l := opts.Logger
|
|
|
|
if l == nil {
|
|
|
|
l = log.NewNopLogger()
|
|
|
|
}
|
|
|
|
concurrency := opts.Concurrency
|
|
|
|
if concurrency < 1 {
|
|
|
|
concurrency = runtime.GOMAXPROCS(0)
|
|
|
|
if concurrency < 8 {
|
|
|
|
concurrency = 8
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-04 13:26:42 +00:00
|
|
|
v1 := apiv1.New(
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
opts.Alerts,
|
|
|
|
opts.Silences,
|
|
|
|
opts.StatusFunc,
|
|
|
|
opts.Peer,
|
2019-02-04 13:26:42 +00:00
|
|
|
log.With(l, "version", "v1"),
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
opts.Registry,
|
2019-02-04 13:26:42 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
v2, err := apiv2.NewAPI(
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
opts.Alerts,
|
|
|
|
opts.StatusFunc,
|
|
|
|
opts.Silences,
|
|
|
|
opts.Peer,
|
2019-02-04 13:26:42 +00:00
|
|
|
log.With(l, "version", "v2"),
|
|
|
|
)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
// TODO(beorn7): For now, this hardcodes the method="get" label. Other
|
|
|
|
// methods should get the same instrumentation.
|
|
|
|
requestsInFlight := prometheus.NewGauge(prometheus.GaugeOpts{
|
|
|
|
Name: "alertmanager_http_requests_in_flight",
|
|
|
|
Help: "Current number of HTTP requests being processed.",
|
|
|
|
ConstLabels: prometheus.Labels{"method": "get"},
|
|
|
|
})
|
|
|
|
concurrencyLimitExceeded := prometheus.NewCounter(prometheus.CounterOpts{
|
|
|
|
Name: "alertmanager_http_concurrency_limit_exceeded_total",
|
|
|
|
Help: "Total number of times an HTTP request failed because the concurrency limit was reached.",
|
|
|
|
ConstLabels: prometheus.Labels{"method": "get"},
|
|
|
|
})
|
|
|
|
if opts.Registry != nil {
|
|
|
|
if err := opts.Registry.Register(requestsInFlight); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if err := opts.Registry.Register(concurrencyLimitExceeded); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-04 13:26:42 +00:00
|
|
|
return &API{
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
v1: v1,
|
|
|
|
v2: v2,
|
|
|
|
requestsInFlight: requestsInFlight,
|
|
|
|
concurrencyLimitExceeded: concurrencyLimitExceeded,
|
|
|
|
timeout: opts.Timeout,
|
|
|
|
inFlightSem: make(chan struct{}, concurrency),
|
2019-02-04 13:26:42 +00:00
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
2019-01-25 17:13:52 +00:00
|
|
|
// Register all APIs. It registers APIv1 with the provided router directly. As
|
|
|
|
// APIv2 works on the http.Handler level, this method also creates a new
|
|
|
|
// http.ServeMux and then uses it to register both the provided router (to
|
|
|
|
// handle "/") and APIv2 (to handle "<routePrefix>/api/v2"). The method returns
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
// the newly created http.ServeMux. If a timeout has been set on construction of
|
|
|
|
// API, it is enforced for all HTTP request going through this mux. The same is
|
|
|
|
// true for the concurrency limit, with the exception that it is only applied to
|
|
|
|
// GET requests.
|
|
|
|
func (api *API) Register(r *route.Router, routePrefix string) *http.ServeMux {
|
2019-02-04 13:26:42 +00:00
|
|
|
api.v1.Register(r.WithPrefix("/api/v1"))
|
|
|
|
|
|
|
|
mux := http.NewServeMux()
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
mux.Handle("/", api.limitHandler(r))
|
2019-02-04 13:26:42 +00:00
|
|
|
|
|
|
|
apiPrefix := ""
|
|
|
|
if routePrefix != "/" {
|
|
|
|
apiPrefix = routePrefix
|
|
|
|
}
|
2019-02-07 14:53:56 +00:00
|
|
|
// TODO(beorn7): HTTP instrumentation is only in place for Router. Since
|
|
|
|
// /api/v2 works on the Handler level, it is currently not instrumented
|
|
|
|
// at all (with the exception of requestsInFlight, which is handled in
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
// limitHandler below).
|
2019-01-25 17:13:52 +00:00
|
|
|
mux.Handle(
|
|
|
|
apiPrefix+"/api/v2/",
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
api.limitHandler(http.StripPrefix(apiPrefix+"/api/v2", api.v2.Handler)),
|
2019-01-25 17:13:52 +00:00
|
|
|
)
|
2019-02-04 13:26:42 +00:00
|
|
|
|
|
|
|
return mux
|
|
|
|
}
|
|
|
|
|
2019-02-18 16:06:51 +00:00
|
|
|
// Update config and resolve timeout of each API. APIv2 also needs
|
|
|
|
// setAlertStatus to be updated.
|
2019-02-26 10:59:14 +00:00
|
|
|
func (api *API) Update(cfg *config.Config, setAlertStatus func(model.LabelSet)) {
|
2019-02-06 18:06:31 +00:00
|
|
|
api.v1.Update(cfg)
|
|
|
|
api.v2.Update(cfg, setAlertStatus)
|
2019-02-04 13:26:42 +00:00
|
|
|
}
|
2019-01-25 17:13:52 +00:00
|
|
|
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
func (api *API) limitHandler(h http.Handler) http.Handler {
|
|
|
|
concLimiter := http.HandlerFunc(func(rsp http.ResponseWriter, req *http.Request) {
|
|
|
|
if req.Method == http.MethodGet { // Only limit concurrency of GETs.
|
|
|
|
select {
|
|
|
|
case api.inFlightSem <- struct{}{}: // All good, carry on.
|
|
|
|
api.requestsInFlight.Inc()
|
|
|
|
defer func() {
|
|
|
|
<-api.inFlightSem
|
|
|
|
api.requestsInFlight.Dec()
|
|
|
|
}()
|
|
|
|
default:
|
|
|
|
api.concurrencyLimitExceeded.Inc()
|
|
|
|
http.Error(rsp, fmt.Sprintf(
|
|
|
|
"Limit of concurrent GET requests reached (%d), try again later.\n", cap(api.inFlightSem),
|
|
|
|
), http.StatusServiceUnavailable)
|
|
|
|
return
|
2019-01-25 17:13:52 +00:00
|
|
|
}
|
|
|
|
}
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
h.ServeHTTP(rsp, req)
|
|
|
|
})
|
|
|
|
if api.timeout <= 0 {
|
|
|
|
return concLimiter
|
2019-01-25 17:13:52 +00:00
|
|
|
}
|
Various improvements after code review
Most importantly, `api.New` now takes an `Options` struct as an
argument, which allows some other things done here as well:
- Timout and concurrency limit are now in the options, streamlining
the registration and the implementation of the limiting middleware.
- A local registry is used for metrics, and the metrics used so far
inside any of the api packages are using it now.
The 'in flight' metric now contains the 'get' as a method label. I
have also added a TODO to instrument other methods in the same way
(otherwise, the label doesn't reall make sense, semantically). I have
also added an explicit error counter for requests rejected because of
the concurrency limit. (They also show up as 503s in the generic HTTP
instrumentation (or they would, if v2 were instrumented, too), but
those 503s might have a number of reasons, while users might want to
alert on concurrency limit problems explicitly).
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-12 16:42:11 +00:00
|
|
|
return http.TimeoutHandler(concLimiter, api.timeout, fmt.Sprintf(
|
|
|
|
"Exceeded configured timeout of %v.\n", api.timeout,
|
|
|
|
))
|
2019-01-25 17:13:52 +00:00
|
|
|
}
|