[registry-facade] Improve IPFS logging

Author: aledbf

components/registry-facade/pkg/registry/blob.go

@@ -123,8 +123,9 @@ func (bh *blobHandler) getBlob(w http.ResponseWriter, r *http.Request) {
 
 		var srcs []BlobSource
 
+		ipfsSrc := ipfsBlobSource{source: bh.IPFS}
 		if bh.IPFS != nil {
-			srcs = append(srcs, ipfsBlobSource{source: bh.IPFS})
+			srcs = append(srcs, ipfsSrc)
 		}
 
 		srcs = append(srcs, storeBlobSource{Store: bh.Store})
@@ -176,6 +177,11 @@ func (bh *blobHandler) getBlob(w http.ResponseWriter, r *http.Request) {
 			return nil
 		}
 
+		// do not duplicate content in IPFS
+		if src == ipfsSrc {
+			return nil
+		}
+
 		go func() {
 			// we can do this only after the io.Copy above. Otherwise we might expect the blob
 			// to be in the blobstore when in reality it isn't.

components/registry-facade/pkg/registry/http_client.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/hashicorp/go-retryablehttp"
+	"github.com/sirupsen/logrus"
 )
 
 type Option func(opts *httpOpts)
@@ -35,7 +36,7 @@ func NewRetryableHTTPClient(options ...Option) *http.Client {
 func defaultOptions() httpOpts {
 	return httpOpts{
 		RetryMax: 5,
-		Logger:   log.Log,
+		Logger:   retryablehttp.LeveledLogger(&leveledLogrus{log.Log}),
 
 		RequestLogHook: func(logger retryablehttp.Logger, req *http.Request, attempt int) {
 			if attempt > 0 {
@@ -47,7 +48,7 @@ func defaultOptions() httpOpts {
 
 type httpOpts struct {
 	HTTPClient *http.Client
-	Logger     interface{}
+	Logger     retryablehttp.LeveledLogger
 
 	RetryMax int
 
@@ -82,3 +83,33 @@ func WithHTTPClient(client *http.Client) Option {
 		opts.HTTPClient = client
 	}
 }
+
+type leveledLogrus struct {
+	*logrus.Entry
+}
+
+func (l *leveledLogrus) fields(keysAndValues ...interface{}) map[string]interface{} {
+	fields := make(map[string]interface{})
+
+	for i := 0; i < len(keysAndValues)-1; i += 2 {
+		fields[keysAndValues[i].(string)] = keysAndValues[i+1]
+	}
+
+	return fields
+}
+
+func (l *leveledLogrus) Error(msg string, keysAndValues ...interface{}) {
+	l.WithFields(l.fields(keysAndValues...)).Error(msg)
+}
+
+func (l *leveledLogrus) Info(msg string, keysAndValues ...interface{}) {
+	l.WithFields(l.fields(keysAndValues...)).Info(msg)
+}
+
+func (l *leveledLogrus) Debug(msg string, keysAndValues ...interface{}) {
+	l.WithFields(l.fields(keysAndValues...)).Debug(msg)
+}
+
+func (l *leveledLogrus) Warn(msg string, keysAndValues ...interface{}) {
+	l.WithFields(l.fields(keysAndValues...)).Warn(msg)
+}