fields rewording in handler

Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com>
This commit is contained in:
Nicolás Pazos 2023-10-23 12:19:59 -03:00
parent ba3422df1f
commit 55c99d4efd
2 changed files with 11 additions and 10 deletions

View file

@ -38,17 +38,18 @@ type writeHandler struct {
samplesWithInvalidLabelsTotal prometheus.Counter
// experimental feature, new remote write proto format
internFormat bool
// Experimental feature, new remote write proto format
// The handler will accept the new format, but it can still accept the old one
enableRemoteWrite11 bool
}
// NewWriteHandler creates a http.Handler that accepts remote write requests and
// writes them to the provided appendable.
func NewWriteHandler(logger log.Logger, reg prometheus.Registerer, appendable storage.Appendable, internFormat bool) http.Handler {
func NewWriteHandler(logger log.Logger, reg prometheus.Registerer, appendable storage.Appendable, enableRemoteWrite11 bool) http.Handler {
h := &writeHandler{
logger: logger,
appendable: appendable,
internFormat: internFormat,
enableRemoteWrite11: enableRemoteWrite11,
samplesWithInvalidLabelsTotal: prometheus.NewCounter(prometheus.CounterOpts{
Namespace: "prometheus",
@ -68,7 +69,7 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
var req *prompb.WriteRequest
var reqWithRefs *prompb.WriteRequestWithRefs
// TODO-RW11: Need to check headers to decide what version is and what to do
if h.internFormat {
if h.enableRemoteWrite11 {
reqWithRefs, err = DecodeReducedWriteRequest(r.Body)
} else {
req, err = DecodeWriteRequest(r.Body)
@ -80,7 +81,7 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
if h.internFormat {
if h.enableRemoteWrite11 {
err = h.writeReduced(r.Context(), reqWithRefs)
} else {
err = h.write(r.Context(), req)

View file

@ -254,7 +254,7 @@ func NewAPI(
statsRenderer StatsRenderer,
rwEnabled bool,
otlpEnabled bool,
remoteWriteReducedProto bool,
enableRemoteWrite11 bool,
) *API {
a := &API{
QueryEngine: qe,
@ -296,7 +296,7 @@ func NewAPI(
}
if rwEnabled {
a.remoteWriteHandler = remote.NewWriteHandler(logger, registerer, ap, remoteWriteReducedProto)
a.remoteWriteHandler = remote.NewWriteHandler(logger, registerer, ap, enableRemoteWrite11)
}
if otlpEnabled {
a.otlpWriteHandler = remote.NewOTLPWriteHandler(logger, ap)