From 29ba963c48b5bdb82fbd20b71cbb39d591c7b9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= Date: Tue, 19 Oct 2021 16:13:03 +0300 Subject: [PATCH] Remove `github.com/romana/rlog` dependency completely (#374) * Remove `github.com/romana/rlog` dependency completely * Comment out all the unnecessary logging in the protocol extensions * Remove commented out all the unnecessary logging lines * Remove two more lines related to logging --- agent/go.sum | 1 - agent/pkg/api/contract_validation.go | 6 +-- cli/go.mod | 1 - cli/go.sum | 2 - tap/api/api.go | 3 -- tap/api/go.mod | 5 +-- tap/api/go.sum | 2 - tap/extensions/amqp/go.mod | 4 +- tap/extensions/amqp/go.sum | 2 - tap/extensions/http/go.mod | 4 +- tap/extensions/http/go.sum | 2 - tap/extensions/http/handlers.go | 39 ------------------- tap/extensions/http/main.go | 16 +------- tap/extensions/http/matcher.go | 8 ---- tap/extensions/http/sensitive_data_cleaner.go | 3 -- tap/extensions/kafka/go.sum | 2 - tap/extensions/redis/go.mod | 4 +- tap/extensions/redis/go.sum | 2 - tap/extensions/redis/read.go | 3 -- tap/go.mod | 13 +++---- tap/go.sum | 29 ++++---------- 21 files changed, 22 insertions(+), 129 deletions(-) diff --git a/agent/go.sum b/agent/go.sum index 359a91043..0bb7d54a6 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -268,7 +268,6 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= diff --git a/agent/pkg/api/contract_validation.go b/agent/pkg/api/contract_validation.go index e98e165df..d57e40b38 100644 --- a/agent/pkg/api/contract_validation.go +++ b/agent/pkg/api/contract_validation.go @@ -11,9 +11,9 @@ import ( "github.com/getkin/kin-openapi/openapi3filter" "github.com/getkin/kin-openapi/routers" legacyrouter "github.com/getkin/kin-openapi/routers/legacy" - "github.com/romana/rlog" "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/tap/api" ) @@ -27,7 +27,7 @@ func loadOAS(ctx context.Context) (doc *openapi3.T, contractContent string, rout path := fmt.Sprintf("%s/%s", shared.RulePolicyPath, shared.ContractFileName) bytes, err := ioutil.ReadFile(path) if err != nil { - rlog.Error(err.Error()) + logger.Log.Error(err.Error()) return } contractContent = string(bytes) @@ -35,7 +35,7 @@ func loadOAS(ctx context.Context) (doc *openapi3.T, contractContent string, rout doc, _ = loader.LoadFromData(bytes) err = doc.Validate(ctx) if err != nil { - rlog.Error(err.Error()) + logger.Log.Error(err.Error()) return } router, _ = legacyrouter.NewRouter(doc) diff --git a/cli/go.mod b/cli/go.mod index c2ded4547..c43a05001 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -8,7 +8,6 @@ require ( github.com/getkin/kin-openapi v0.79.0 github.com/google/go-github/v37 v37.0.0 github.com/google/uuid v1.1.2 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 github.com/up9inc/mizu/shared v0.0.0 diff --git a/cli/go.sum b/cli/go.sum index 7d815da49..0e75a3958 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -381,8 +381,6 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= diff --git a/tap/api/api.go b/tap/api/api.go index 66de128ec..7f4169ae0 100644 --- a/tap/api/api.go +++ b/tap/api/api.go @@ -13,7 +13,6 @@ import ( "time" "github.com/google/martian/har" - "github.com/romana/rlog" ) type Protocol struct { @@ -251,7 +250,6 @@ func (h HTTPPayload) MarshalJSON() ([]byte, error) { case TypeHttpRequest: harRequest, err := har.NewRequest(h.Data.(*http.Request), true) if err != nil { - rlog.Debugf("convert-request-to-har", "Failed converting request to HAR %s (%v,%+v)", err, err, err) return nil, errors.New("Failed converting request to HAR") } return json.Marshal(&HTTPWrapper{ @@ -263,7 +261,6 @@ func (h HTTPPayload) MarshalJSON() ([]byte, error) { case TypeHttpResponse: harResponse, err := har.NewResponse(h.Data.(*http.Response), true) if err != nil { - rlog.Debugf("convert-response-to-har", "Failed converting response to HAR %s (%v,%+v)", err, err, err) return nil, errors.New("Failed converting response to HAR") } return json.Marshal(&HTTPWrapper{ diff --git a/tap/api/go.mod b/tap/api/go.mod index bd49ce403..e6aa29754 100644 --- a/tap/api/go.mod +++ b/tap/api/go.mod @@ -2,7 +2,4 @@ module github.com/up9inc/mizu/tap/api go 1.16 -require ( - github.com/google/martian v2.1.0+incompatible // indirect - github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 // indirect -) +require github.com/google/martian v2.1.0+incompatible diff --git a/tap/api/go.sum b/tap/api/go.sum index f25f09c37..bbcb7d053 100644 --- a/tap/api/go.sum +++ b/tap/api/go.sum @@ -1,4 +1,2 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= diff --git a/tap/extensions/amqp/go.mod b/tap/extensions/amqp/go.mod index 716aebec8..bf07536ee 100644 --- a/tap/extensions/amqp/go.mod +++ b/tap/extensions/amqp/go.mod @@ -2,8 +2,6 @@ module github.com/up9inc/mizu/tap/extensions/amqp go 1.16 -require ( - github.com/up9inc/mizu/tap/api v0.0.0 -) +require github.com/up9inc/mizu/tap/api v0.0.0 replace github.com/up9inc/mizu/tap/api v0.0.0 => ../../api diff --git a/tap/extensions/amqp/go.sum b/tap/extensions/amqp/go.sum index f25f09c37..bbcb7d053 100644 --- a/tap/extensions/amqp/go.sum +++ b/tap/extensions/amqp/go.sum @@ -1,4 +1,2 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= diff --git a/tap/extensions/http/go.mod b/tap/extensions/http/go.mod index ab576cf81..c11c8f1bf 100644 --- a/tap/extensions/http/go.mod +++ b/tap/extensions/http/go.mod @@ -3,9 +3,7 @@ module github.com/up9inc/mizu/tap/extensions/http go 1.16 require ( - github.com/beevik/etree v1.1.0 // indirect - github.com/google/martian v2.1.0+incompatible - github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 + github.com/beevik/etree v1.1.0 github.com/up9inc/mizu/tap/api v0.0.0 golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 golang.org/x/text v0.3.5 // indirect diff --git a/tap/extensions/http/go.sum b/tap/extensions/http/go.sum index 03fbf179f..a9d408e60 100644 --- a/tap/extensions/http/go.sum +++ b/tap/extensions/http/go.sum @@ -2,8 +2,6 @@ github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/tap/extensions/http/handlers.go b/tap/extensions/http/handlers.go index d41bf3e54..3cfe98588 100644 --- a/tap/extensions/http/handlers.go +++ b/tap/extensions/http/handlers.go @@ -2,14 +2,9 @@ package main import ( "bufio" - "bytes" "fmt" - "io" - "io/ioutil" "net/http" - "github.com/romana/rlog" - "github.com/up9inc/mizu/tap/api" ) @@ -85,23 +80,10 @@ func handleHTTP2Stream(grpcAssembler *GrpcAssembler, tcpID *api.TcpID, superTime func handleHTTP1ClientStream(b *bufio.Reader, tcpID *api.TcpID, counterPair *api.CounterPair, superTimer *api.SuperTimer, emitter api.Emitter, options *api.TrafficFilteringOptions) error { req, err := http.ReadRequest(b) if err != nil { - // log.Println("Error reading stream:", err) return err } counterPair.Request++ - body, err := ioutil.ReadAll(req.Body) - req.Body = io.NopCloser(bytes.NewBuffer(body)) // rewind - s := len(body) - if err != nil { - rlog.Debugf("[HTTP-request-body] stream %s Got body err: %s", tcpID.Ident, err) - } - if err := req.Body.Close(); err != nil { - rlog.Debugf("[HTTP-request-body-close] stream %s Failed to close request body: %s", tcpID.Ident, err) - } - encoding := req.Header["Content-Encoding"] - rlog.Tracef(1, "HTTP/1 Request: %s %s %s (Body:%d) -> %s", tcpID.Ident, req.Method, req.URL, s, encoding) - ident := fmt.Sprintf( "%s->%s %s->%s %d", tcpID.SrcIP, @@ -127,31 +109,10 @@ func handleHTTP1ClientStream(b *bufio.Reader, tcpID *api.TcpID, counterPair *api func handleHTTP1ServerStream(b *bufio.Reader, tcpID *api.TcpID, counterPair *api.CounterPair, superTimer *api.SuperTimer, emitter api.Emitter, options *api.TrafficFilteringOptions) error { res, err := http.ReadResponse(b, nil) if err != nil { - // log.Println("Error reading stream:", err) return err } counterPair.Response++ - body, err := ioutil.ReadAll(res.Body) - res.Body = io.NopCloser(bytes.NewBuffer(body)) // rewind - s := len(body) - if err != nil { - rlog.Debugf("[HTTP-response-body] HTTP/%s: failed to get body(parsed len:%d): %s", tcpID.Ident, s, err) - } - if err := res.Body.Close(); err != nil { - rlog.Debugf("[HTTP-response-body-close] HTTP/%s: failed to close body(parsed len:%d): %s", tcpID.Ident, s, err) - } - sym := "," - if res.ContentLength > 0 && res.ContentLength != int64(s) { - sym = "!=" - } - contentType, ok := res.Header["Content-Type"] - if !ok { - contentType = []string{http.DetectContentType(body)} - } - encoding := res.Header["Content-Encoding"] - rlog.Tracef(1, "HTTP/1 Response: %s %s (%d%s%d%s) -> %s", tcpID.Ident, res.Status, res.ContentLength, sym, s, contentType, encoding) - ident := fmt.Sprintf( "%s->%s %s->%s %d", tcpID.DstIP, diff --git a/tap/extensions/http/main.go b/tap/extensions/http/main.go index d8beac84f..3ca432a71 100644 --- a/tap/extensions/http/main.go +++ b/tap/extensions/http/main.go @@ -10,8 +10,6 @@ import ( "net/url" "time" - "github.com/romana/rlog" - "github.com/up9inc/mizu/tap/api" ) @@ -62,19 +60,11 @@ func (d dissecting) Ping() { } func (d dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID, counterPair *api.CounterPair, superTimer *api.SuperTimer, superIdentifier *api.SuperIdentifier, emitter api.Emitter, options *api.TrafficFilteringOptions) error { - ident := fmt.Sprintf("%s->%s:%s->%s", tcpID.SrcIP, tcpID.DstIP, tcpID.SrcPort, tcpID.DstPort) isHTTP2, err := checkIsHTTP2Connection(b, isClient) - if err != nil { - rlog.Debugf("[HTTP/2-Prepare-Connection] stream %s Failed to check if client is HTTP/2: %s (%v,%+v)", ident, err, err, err) - // Do something? - } var grpcAssembler *GrpcAssembler if isHTTP2 { - err := prepareHTTP2Connection(b, isClient) - if err != nil { - rlog.Debugf("[HTTP/2-Prepare-Connection-After-Check] stream %s error: %s (%v,%+v)", ident, err, err, err) - } + prepareHTTP2Connection(b, isClient) grpcAssembler = createGrpcAssembler(b) } @@ -89,7 +79,6 @@ func (d dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID, co if err == io.EOF || err == io.ErrUnexpectedEOF { break } else if err != nil { - rlog.Debugf("[HTTP/2] stream %s error: %s (%v,%+v)", ident, err, err, err) continue } dissected = true @@ -98,7 +87,6 @@ func (d dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID, co if err == io.EOF || err == io.ErrUnexpectedEOF { break } else if err != nil { - rlog.Debugf("[HTTP-request] stream %s Request error: %s (%v,%+v)", ident, err, err, err) continue } dissected = true @@ -107,7 +95,6 @@ func (d dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID, co if err == io.EOF || err == io.ErrUnexpectedEOF { break } else if err != nil { - rlog.Debugf("[HTTP-response], stream %s Response error: %s (%v,%+v)", ident, err, err, err) continue } dissected = true @@ -124,7 +111,6 @@ func (d dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID, co func SetHostname(address, newHostname string) string { replacedUrl, err := url.Parse(address) if err != nil { - log.Printf("error replacing hostname to %s in address %s, returning original %v", newHostname, address, err) return address } replacedUrl.Host = newHostname diff --git a/tap/extensions/http/matcher.go b/tap/extensions/http/matcher.go index 588391c40..08a0b4e5c 100644 --- a/tap/extensions/http/matcher.go +++ b/tap/extensions/http/matcher.go @@ -7,8 +7,6 @@ import ( "sync" "time" - "github.com/romana/rlog" - "github.com/up9inc/mizu/tap/api" ) @@ -41,15 +39,12 @@ func (matcher *requestResponseMatcher) registerRequest(ident string, request *ht // Type assertion always succeeds because all of the map's values are of api.GenericMessage type responseHTTPMessage := response.(*api.GenericMessage) if responseHTTPMessage.IsRequest { - rlog.Debugf("[Request-Duplicate] Got duplicate request with same identifier") return nil } - rlog.Tracef(1, "Matched open Response for %s", key) return matcher.preparePair(&requestHTTPMessage, responseHTTPMessage) } matcher.openMessagesMap.Store(key, &requestHTTPMessage) - rlog.Tracef(1, "Registered open Request for %s", key) return nil } @@ -70,15 +65,12 @@ func (matcher *requestResponseMatcher) registerResponse(ident string, response * // Type assertion always succeeds because all of the map's values are of api.GenericMessage type requestHTTPMessage := request.(*api.GenericMessage) if !requestHTTPMessage.IsRequest { - rlog.Debugf("[Response-Duplicate] Got duplicate response with same identifier") return nil } - rlog.Tracef(1, "Matched open Request for %s", key) return matcher.preparePair(requestHTTPMessage, &responseHTTPMessage) } matcher.openMessagesMap.Store(key, &responseHTTPMessage) - rlog.Tracef(1, "Registered open Response for %s", key) return nil } diff --git a/tap/extensions/http/sensitive_data_cleaner.go b/tap/extensions/http/sensitive_data_cleaner.go index 9c45fb0e4..4d4487333 100644 --- a/tap/extensions/http/sensitive_data_cleaner.go +++ b/tap/extensions/http/sensitive_data_cleaner.go @@ -12,7 +12,6 @@ import ( "strings" "github.com/beevik/etree" - "github.com/romana/rlog" "github.com/up9inc/mizu/tap/api" ) @@ -64,7 +63,6 @@ func filterRequestBody(request *http.Request, options *api.TrafficFilteringOptio contenType := getContentTypeHeaderValue(request.Header) body, err := ioutil.ReadAll(request.Body) if err != nil { - rlog.Debugf("Filtering error reading body: %v", err) return } filteredBody, err := filterHttpBody([]byte(body), contenType, options) @@ -79,7 +77,6 @@ func filterResponseBody(response *http.Response, options *api.TrafficFilteringOp contentType := getContentTypeHeaderValue(response.Header) body, err := ioutil.ReadAll(response.Body) if err != nil { - rlog.Debugf("Filtering error reading body: %v", err) return } filteredBody, err := filterHttpBody([]byte(body), contentType, options) diff --git a/tap/extensions/kafka/go.sum b/tap/extensions/kafka/go.sum index e0cefe951..70ec03308 100644 --- a/tap/extensions/kafka/go.sum +++ b/tap/extensions/kafka/go.sum @@ -19,8 +19,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= github.com/segmentio/kafka-go v0.4.17 h1:IyqRstL9KUTDb3kyGPOOa5VffokKWSEzN6geJ92dSDY= github.com/segmentio/kafka-go v0.4.17/go.mod h1:19+Eg7KwrNKy/PFhiIthEPkO8k+ac7/ZYXwYM9Df10w= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/tap/extensions/redis/go.mod b/tap/extensions/redis/go.mod index a69f319af..c8f5a04c6 100644 --- a/tap/extensions/redis/go.mod +++ b/tap/extensions/redis/go.mod @@ -2,8 +2,6 @@ module github.com/up9inc/mizu/tap/extensions/redis go 1.16 -require ( - github.com/up9inc/mizu/tap/api v0.0.0 -) +require github.com/up9inc/mizu/tap/api v0.0.0 replace github.com/up9inc/mizu/tap/api v0.0.0 => ../../api diff --git a/tap/extensions/redis/go.sum b/tap/extensions/redis/go.sum index f25f09c37..bbcb7d053 100644 --- a/tap/extensions/redis/go.sum +++ b/tap/extensions/redis/go.sum @@ -1,4 +1,2 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= diff --git a/tap/extensions/redis/read.go b/tap/extensions/redis/read.go index 3128c1513..2732970a1 100644 --- a/tap/extensions/redis/read.go +++ b/tap/extensions/redis/read.go @@ -4,7 +4,6 @@ import ( "bufio" "errors" "fmt" - "log" "math" "reflect" "strconv" @@ -315,7 +314,6 @@ func (p *RedisProtocol) Read() (packet *RedisPacket, err error) { } default: msg := fmt.Sprintf("Unrecognized element in Redis array: %v\n", reflect.TypeOf(array[0])) - log.Printf(msg) err = errors.New(msg) return } @@ -336,7 +334,6 @@ func (p *RedisProtocol) Read() (packet *RedisPacket, err error) { packet.Value = fmt.Sprintf("%d", x.(int64)) default: msg := fmt.Sprintf("Unrecognized Redis data type: %v\n", reflect.TypeOf(x)) - log.Printf(msg) err = errors.New(msg) return } diff --git a/tap/go.mod b/tap/go.mod index 87ce42cf3..8c8fce755 100644 --- a/tap/go.mod +++ b/tap/go.mod @@ -3,15 +3,14 @@ module github.com/up9inc/mizu/tap go 1.16 require ( - github.com/bradleyfalzon/tlsx v0.0.0-20170624122154-28fd0e59bac4 // indirect + github.com/bradleyfalzon/tlsx v0.0.0-20170624122154-28fd0e59bac4 github.com/google/gopacket v1.1.19 - github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 + github.com/up9inc/mizu/shared v0.0.0 github.com/up9inc/mizu/tap/api v0.0.0 - golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 - golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 - golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d - golang.org/x/text v0.3.5 - golang.org/x/tools v0.0.0-20210106214847-113979e3529a + golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect + golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 // indirect ) replace github.com/up9inc/mizu/tap/api v0.0.0 => ./api + +replace github.com/up9inc/mizu/shared v0.0.0 => ../shared diff --git a/tap/go.sum b/tap/go.sum index 83a0c8f74..57a018ead 100644 --- a/tap/go.sum +++ b/tap/go.sum @@ -1,45 +1,32 @@ github.com/bradleyfalzon/tlsx v0.0.0-20170624122154-28fd0e59bac4 h1:NJOOlc6ZJjix0A1rAU+nxruZtR8KboG1848yqpIUo4M= github.com/bradleyfalzon/tlsx v0.0.0-20170624122154-28fd0e59bac4/go.mod h1:DQPxZS994Ld1Y8uwnJT+dRL04XPD0cElP/pHH/zEBHM= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI= -github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a h1:CB3a9Nez8M13wwlr/E2YtwoU+qYHKfC+JrDa45RXXoQ= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=