adding debug log lines

Author: bramhaghosh

api/forwarder.go

@@ -42,6 +42,7 @@ func NewForwarder(host string, port int) *Forwarder {
 // ModifyRequest forwards the request to the local API server running at f.port,
 // downgrades the scheme to http and marks the request context for skipped logging.
 func (f *Forwarder) ModifyRequest(req *http.Request) error {
+	log.Debugf("api.Forwarder: request: %s", req)
 	ctx := martian.NewContext(req)
 	ctx.APIRequest()
 	ctx.SkipLogging()
@@ -50,7 +51,7 @@ func (f *Forwarder) ModifyRequest(req *http.Request) error {
 	req.URL.Scheme = "http"
 	req.URL.Host = fmt.Sprintf("%s:%d", "localhost", f.port)
 	out := req.URL.String()
-	log.Infof("api.Forwarder: forwarding %s to %s", in, out)
+	log.Debugf("api.Forwarder: request forwarding from %s to %s", in, out)
 
 	return nil
 }

auth/auth_filter.go

@@ -22,6 +22,7 @@ import (
 	"sync"
 
 	"github.com/google/martian"
+	"github.com/google/martian/log"
 )
 
 // Filter filters RequestModifiers and ResponseModifiers by auth ID.
@@ -98,14 +99,17 @@ func (f *Filter) ResponseModifier(id string) martian.ResponseModifier {
 // ModifyRequest runs the RequestModifier for the associated auth ID. If no
 // modifier is found for auth ID then auth error is set.
 func (f *Filter) ModifyRequest(req *http.Request) error {
+	log.Debugf("auth.Filter: request: %s", req)
 	ctx := martian.NewContext(req)
 	actx := FromContext(ctx)
 
 	if reqmod, ok := f.reqmods[actx.ID()]; ok {
+		log.Debugf("auth.Filter: request match on ID %s", actx.ID())
 		return reqmod.ModifyRequest(req)
 	}
 
 	if err := f.requireKnownAuth(actx.ID()); err != nil {
+		log.Debugf("auth.Filter: request error on require auth for ID %s", actx.ID())
 		actx.SetError(err)
 	}
 
@@ -115,14 +119,17 @@ func (f *Filter) ModifyRequest(req *http.Request) error {
 // ModifyResponse runs the ResponseModifier for the associated auth ID. If no
 // modifier is found for the auth ID then the auth error is set.
 func (f *Filter) ModifyResponse(res *http.Response) error {
+	log.Debugf("auth.Filter: response to request: %s", res.Request)
 	ctx := martian.NewContext(res.Request)
 	actx := FromContext(ctx)
 
 	if resmod, ok := f.resmods[actx.ID()]; ok {
+		log.Debugf("auth.Filter: response match on ID %s", actx.ID())
 		return resmod.ModifyResponse(res)
 	}
 
 	if err := f.requireKnownAuth(actx.ID()); err != nil {
+		log.Debugf("auth.Filter: response error on require auth for ID %s", actx.ID())
 		actx.SetError(err)
 	}
 

body/body_modifier.go

@@ -21,6 +21,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"github.com/google/martian/log"
 	"github.com/google/martian/parse"
 )
 
@@ -69,6 +70,7 @@ func modifierFromJSON(b []byte) (*parse.Result, error) {
 
 // ModifyRequest sets the Content-Type header and overrides the request body.
 func (m *Modifier) ModifyRequest(req *http.Request) error {
+	log.Debugf("body.Modifier: request: %s", req)
 	req.Body.Close()
 
 	req.Header.Set("Content-Type", m.contentType)
@@ -84,6 +86,7 @@ func (m *Modifier) ModifyRequest(req *http.Request) error {
 
 // ModifyResponse sets the Content-Type header and overrides the response body.
 func (m *Modifier) ModifyResponse(res *http.Response) error {
+	log.Debugf("body.Modifier: response to request: %s", res.Request)
 	// Replace the existing body, close it first.
 	res.Body.Close()
 

cookie/cookie_matcher.go

@@ -14,7 +14,11 @@
 
 package cookie
 
-import "net/http"
+import (
+	"net/http"
+
+	"github.com/google/martian/log"
+)
 
 // Matcher is a conditonal evalutor of request or
 // response cookies to be used in structs that take conditions.
@@ -35,10 +39,12 @@ func NewMatcher(cookie *http.Cookie) *Matcher {
 func (m *Matcher) MatchRequest(req *http.Request) bool {
 	for _, c := range req.Cookies() {
 		if m.match(c) {
+			log.Debugf("cookie.Filter: match on request: %s", req)
 			return true
 		}
 	}
 
+	log.Debugf("cookie.Filter: no match on request: %s", req)
 	return false
 }
 
@@ -47,10 +53,12 @@ func (m *Matcher) MatchRequest(req *http.Request) bool {
 func (m *Matcher) MatchResponse(res *http.Response) bool {
 	for _, c := range res.Cookies() {
 		if m.match(c) {
+			log.Debugf("cookie.Filter: match on response to request: %s", res.Request)
 			return true
 		}
 	}
 
+	log.Debugf("cookie.Filter: no match on response to request: %s", res.Request)
 	return false
 }
 

cookie/cookie_modifier.go

@@ -48,15 +48,17 @@ type modifierJSON struct {
 // ModifyRequest adds cookie to the request.
 func (m *modifier) ModifyRequest(req *http.Request) error {
 	req.AddCookie(m.cookie)
-	log.Debugf("cookie: %s: append request cookie: %s", req.URL, m.cookie)
+	log.Debugf("cookie.Modifier: request: %s", req)
+	log.Debugf("cookie.Modifier: append request cookie: %s", m.cookie)
 
 	return nil
 }
 
 // ModifyResponse sets cookie on the response.
 func (m *modifier) ModifyResponse(res *http.Response) error {
 	res.Header.Add("Set-Cookie", m.cookie.String())
-	log.Debugf("cookie: %s: append response cookie: %s", res.Request.URL, m.cookie)
+	log.Debugf("cookie.Modifier: response to request: %s", res.Request)
+	log.Debugf("cookie.Modifier: append response cookie: %s", m.cookie)
 
 	return nil
 }

header/copy_modifier.go

@@ -19,6 +19,7 @@ import (
 	"net/http"
 
 	"github.com/google/martian"
+	"github.com/google/martian/log"
 	"github.com/google/martian/parse"
 	"github.com/google/martian/proxyutil"
 )
@@ -41,13 +42,18 @@ type copyModifierJSON struct {
 func (m *copyModifier) ModifyRequest(req *http.Request) error {
 	h := proxyutil.RequestHeader(req)
 
+	log.Debugf("header.Copy: request: %s", req)
+	log.Debugf("header.Copy: copying from %s to %s", m.from, m.to)
 	return h.Set(m.to, h.Get(m.from))
 }
 
 // ModifyResponse copies the header in from to the response header for to.
 func (m *copyModifier) ModifyResponse(res *http.Response) error {
 	h := proxyutil.ResponseHeader(res)
 
+	log.Debugf("header.Copy: response to request: %s", res.Request)
+	log.Debugf("header.Copy: copying from %s to %s", m.from, m.to)
+
 	return h.Set(m.to, h.Get(m.from))
 }