Merge pull request weibocom#7 from zengnjin/server-agent_monitor

add a field named remoteIP for http provider headers
reckcn · Dec 26, 2017 · 4dfba63 · 4dfba63
2 parents 3a0e728 + 1978568
commit 4dfba63
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/core/constants.go b/core/constants.go
@@ -39,6 +39,7 @@ const (
 	AddressKey        = "address"
 	GzipSizeKey       = "mingzSize"
 	HostKey           = "host"
+	RemoteIPKey       = "remoteIP"
 )
 
 // nodeType

diff --git a/metrics/graphite.go b/metrics/graphite.go
@@ -61,7 +61,7 @@ func genGraphiteMessages(localIP string, snap metrics.Registry) []string {
 	snap.Each(func(key string, i interface{}) {
 		var segment string
 		pni := strings.SplitN(key, ":", 4)
-		
+
 		switch m := i.(type) {
 
 		case metrics.Counter:

diff --git a/provider/http.go b/provider/http.go
@@ -134,8 +134,15 @@ func (h *HTTPProvider) Call(request motan.Request) motan.Response {
 		k = strings.Replace(k, "M_", "MOTAN-", -1)
 		req.Header.Add(k, v)
 	}
-	ip := request.GetAttachment(motan.HostKey)
+	var ip string
+	remoteIP,exist := req.GetAttachments()[motan.RemoteIPKey]
+	if(exist){
+		ip = remoteIP
+	}else{
+		ip = request.GetAttachment(motan.HostKey)
+	}
 	req.Header.Add("x-forwarded-for",ip)
+
 	httpResp, err := h.httpClient.Do(req)
 	if err != nil {
 		vlog.Errorf("new HTTP Provider Do HTTP Call err: %v", err)

diff --git a/server/motanserver.go b/server/motanserver.go
@@ -118,11 +118,8 @@ func (m *MotanServer) processReq(request *mpro.Message, conn net.Conn) {
 		serialization := m.extFactory.GetSerialization("", request.Header.GetSerialize())
 		req, err := mpro.ConvertToRequest(request, serialization)
 
-		_,exist := req.GetAttachments()[motan.HostKey]
-		if (!exist){
-			ip := getRemoteIP(conn.RemoteAddr().String())
-			req.SetAttachment(motan.HostKey, ip)
-		}
+		ip := getRemoteIP(conn.RemoteAddr().String())
+		req.SetAttachment(motan.HostKey, ip)
 
 		req.GetRPCContext(true).ExtFactory = m.extFactory
 		if err != nil {