From 925654a748a850f7a33cee62c717e13ed49470ab Mon Sep 17 00:00:00 2001 From: ytsuchiya Date: Mon, 21 Nov 2022 09:00:18 +0900 Subject: [PATCH 1/2] fix http client error handling --- merger/merge.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/merger/merge.go b/merger/merge.go index 41cd668..bf2dc86 100644 --- a/merger/merge.go +++ b/merger/merge.go @@ -7,7 +7,6 @@ import ( "sort" "sync" - "github.com/pkg/errors" prom "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" "golang.org/x/sync/errgroup" @@ -24,13 +23,19 @@ func (m *merger) merge(ctx context.Context, w io.Writer) error { g.Go(func() error { resp, err := m.client.Get(source.url) if err != nil { - return errors.Wrap(err, fmt.Sprintf("get url: %s", source.url)) + fmt.Printf("get url: %s", source.url) + return nil } - defer resp.Body.Close() + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + } + }(resp.Body) tp := new(expfmt.TextParser) out, err := tp.TextToMetricFamilies(resp.Body) if err != nil { - return errors.Wrap(err, fmt.Sprintf("parse url: %s", source.url)) + fmt.Printf("parse url: %s", source.url) + return nil } mu.Lock() defer mu.Unlock() From 017fe6050fd4068fade769c21cd11c9a624d1c69 Mon Sep 17 00:00:00 2001 From: ytsuchiya Date: Mon, 21 Nov 2022 09:21:12 +0900 Subject: [PATCH 2/2] fix http client error handling --- merger/merge.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/merger/merge.go b/merger/merge.go index bf2dc86..2539655 100644 --- a/merger/merge.go +++ b/merger/merge.go @@ -26,11 +26,7 @@ func (m *merger) merge(ctx context.Context, w io.Writer) error { fmt.Printf("get url: %s", source.url) return nil } - defer func(Body io.ReadCloser) { - err := Body.Close() - if err != nil { - } - }(resp.Body) + defer resp.Body.Close() tp := new(expfmt.TextParser) out, err := tp.TextToMetricFamilies(resp.Body) if err != nil {