From 4079d3df4f91fde8feb8a38a36741b05116812d3 Mon Sep 17 00:00:00 2001 From: tdakkota Date: Thu, 29 Jun 2023 16:40:28 +0300 Subject: [PATCH] fix(server): set `Content-Type` to JSON in label handlers (#1969) --- pkg/server/labels.go | 8 +------- pkg/server/labelvalues.go | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkg/server/labels.go b/pkg/server/labels.go index 9dcb2a182e..24d10b3776 100644 --- a/pkg/server/labels.go +++ b/pkg/server/labels.go @@ -1,7 +1,6 @@ package server import ( - "encoding/json" "net/http" "github.com/pyroscope-io/pyroscope/pkg/server/httputils" @@ -39,11 +38,6 @@ func NewLabelsHandler(s storage.LabelsGetter, httpUtils httputils.Utils) http.Ha }) } - b, err := json.Marshal(keys) - if err != nil { - httpUtils.WriteJSONEncodeError(r, w, err) - return - } - _, _ = w.Write(b) + httpUtils.WriteResponseJSON(r, w, keys) } } diff --git a/pkg/server/labelvalues.go b/pkg/server/labelvalues.go index 9b54eb588d..38ab5138f1 100644 --- a/pkg/server/labelvalues.go +++ b/pkg/server/labelvalues.go @@ -1,7 +1,6 @@ package server import ( - "encoding/json" "net/http" "github.com/pyroscope-io/pyroscope/pkg/server/httputils" @@ -45,11 +44,6 @@ func NewLabelValuesHandler(s storage.LabelValuesGetter, httpUtils httputils.Util }) } - b, err := json.Marshal(values) - if err != nil { - httpUtils.WriteJSONEncodeError(r, w, err) - return - } - _, _ = w.Write(b) + httpUtils.WriteResponseJSON(r, w, values) } }