Merge pull request #201 from stripe/jjiang/fix-logging-addrs

Fix outbound IP logging

pkg/smokescreen/conntrack/instrumented_conn.go

@@ -17,7 +17,6 @@ const (
 	LogFieldDuration        = "duration"
 	LogFieldError           = "error"
 	LogFieldLastActivity    = "last_activity"
-	LogFieldOutboundAddr    = "outbound_remote_addr"
 	CanonicalProxyConnClose = "CANONICAL-PROXY-CN-CLOSE"
 )
 
@@ -114,19 +113,13 @@ func (ic *InstrumentedConn) Close() error {
 		errorMessage = ic.ConnError.Error()
 	}
 
-	var outboundAddr string
-	if ic.RemoteAddr() != nil {
-		outboundAddr = ic.RemoteAddr().String()
-	}
-
 	ic.logger.WithFields(logrus.Fields{
 		LogFieldBytesIn:      ic.BytesIn,
 		LogFieldBytesOut:     ic.BytesOut,
 		LogFieldEndTime:      end.UTC(),
 		LogFieldDuration:     duration,
 		LogFieldError:        errorMessage,
 		LogFieldLastActivity: time.Unix(0, atomic.LoadInt64(ic.LastActivity)).UTC(),
-		LogFieldOutboundAddr: outboundAddr,
 	}).Info(CanonicalProxyConnClose)
 
 	ic.tracker.Wg().Done()

pkg/smokescreen/smokescreen.go

@@ -303,16 +303,13 @@ func dialContext(ctx context.Context, network, addr string) (net.Conn, error) {
 	sctx.cfg.ConnTracker.RecordAttempt(sctx.requestedHost, true)
 
 	if conn != nil {
-		fields := logrus.Fields{}
-
 		if addr := conn.LocalAddr(); addr != nil {
 			fields[LogFieldOutLocalAddr] = addr.String()
 		}
 
 		if addr := conn.RemoteAddr(); addr != nil {
 			fields[LogFieldOutRemoteAddr] = addr.String()
 		}
-
 	}
 	sctx.logger = sctx.logger.WithFields(fields)