misc

scouter-contrib · Jan 17, 2021 · 9734f7d · 9734f7d
1 parent e640549
commit 9734f7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/scouterx/netio/dataproxy_test.go b/scouterx/netio/dataproxy_test.go
@@ -3,7 +3,6 @@ package netio
 import (
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/conf"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/netio/udpsender"
-	util2 "github.com/scouter-contrib/scouter-agent-golang/scouterx/util"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/netdata"
 	util "github.com/scouter-contrib/scouter-agent-golang/scouterx/common/util"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/util/keygen"
@@ -23,7 +22,7 @@ func TestSendXlog(t *testing.T) {
 	xlog.Service = SendServiceName(service)
 	xlog.Elapsed = 100
 	xlog.DiscardType = netdata.XLOG_DISCARD_NONE
-	xlog.Ipaddr = util2.IpToBytes("127.0.0.1")
+	xlog.Ipaddr = util.IpToBytes("127.0.0.1")
 
 	SendXlog(xlog)
 }
@@ -51,7 +50,7 @@ func TestSendProfileAndXlog(t *testing.T) {
 	xlog.Service = context.ServiceHash
 	xlog.Elapsed = 100
 	xlog.DiscardType = netdata.XLOG_DISCARD_NONE
-	xlog.Ipaddr = util2.IpToBytes("127.0.0.1")
+	xlog.Ipaddr = util.IpToBytes("127.0.0.1")
 	SendXlog(xlog)
 }
 

diff --git a/scouterx/netio/tracecontext.go b/scouterx/netio/tracecontext.go
@@ -116,7 +116,7 @@ func (tctx (TraceContext)) ToXlog(discardType netdata.XlogDiscardType, elapsed i
 	}
 	xlog.Text1 = tctx.Text1
 	xlog.Text2 = tctx.Text2
-	xlog.Text4 = tctx.Text3
+	xlog.Text3 = tctx.Text3
 	xlog.Text4 = tctx.Text4
 	xlog.Text5 = tctx.Text5