Skip to content

Commit db6c565

Browse files
committed
Re-use DecodeOTLPWriteRequest
Signed-off-by: Friedrich Gonzalez <[email protected]>
1 parent 24a66fc commit db6c565

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

pkg/util/push/otlp.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package push
22

33
import (
4-
"io"
54
"net/http"
65

76
"github.com/go-kit/log/level"
87
"github.com/prometheus/prometheus/model/labels"
98
"github.com/prometheus/prometheus/prompb"
9+
"github.com/prometheus/prometheus/storage/remote"
1010
"github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite"
1111
"github.com/weaveworks/common/httpgrpc"
1212
"github.com/weaveworks/common/middleware"
1313
"go.opentelemetry.io/collector/pdata/pcommon"
1414
"go.opentelemetry.io/collector/pdata/pmetric"
15-
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
1615

1716
"github.com/cortexproject/cortex/pkg/cortexpb"
1817
"github.com/cortexproject/cortex/pkg/util"
@@ -31,16 +30,7 @@ func OTLPHandler(sourceIPs *middleware.SourceIPExtractor, push Func) http.Handle
3130
logger = log.WithSourceIPs(source, logger)
3231
}
3332
}
34-
35-
buf, err := io.ReadAll(r.Body)
36-
if err != nil {
37-
level.Error(logger).Log("err", err.Error())
38-
http.Error(w, err.Error(), http.StatusBadRequest)
39-
return
40-
}
41-
42-
req := pmetricotlp.NewExportRequest()
43-
err = req.UnmarshalProto(buf)
33+
req, err := remote.DecodeOTLPWriteRequest(r)
4434
if err != nil {
4535
level.Error(logger).Log("err", err.Error())
4636
http.Error(w, err.Error(), http.StatusBadRequest)

0 commit comments

Comments
 (0)