提交 c769fed3 编写于 作者: H heyanlong

fix bugs

上级 55a333a4
......@@ -103,6 +103,7 @@ func register(c net.Conn, j string) {
ApplicationCode: info.AppCode,
})
if regErr != nil {
fmt.Println("register error", regErr)
break
}
if regResp.GetApplication() != nil {
......@@ -128,6 +129,7 @@ func register(c net.Conn, j string) {
Services: services,
})
if regErr != nil {
fmt.Println("register error", regErr)
break
}
......@@ -173,6 +175,7 @@ func register(c net.Conn, j string) {
for {
instanceResp, instanceErr = instanceClient.RegisterInstance(instanceCtx, instanceReq)
if instanceErr != nil {
fmt.Println("register error", instanceErr)
break
}
if instanceResp.GetApplicationInstanceId() != 0 {
......@@ -233,6 +236,7 @@ func register(c net.Conn, j string) {
for {
instanceResp, instanceErr = instanceClient.DoServiceInstanceRegister(instanceCtx, instanceReq)
if instanceErr != nil {
fmt.Println("register error", instanceErr)
break
}
if instanceResp.GetServiceInstances() != nil {
......
......@@ -282,16 +282,36 @@ func buildRefs6(span *agent2.SpanObjectV2, refs []ref) {
refType = agent.RefType_CrossProcess
}
spanRefs = append(spanRefs, &agent2.SegmentReference{
var reference = &agent2.SegmentReference{
RefType: refType,
ParentTraceSegmentId: buildUniqueId(rev.ParentTraceSegmentId),
ParentSpanId: rev.ParentSpanId,
ParentServiceInstanceId: rev.ParentApplicationInstanceId,
NetworkAddress: rev.NetworkAddress,
EntryServiceInstanceId: rev.EntryApplicationInstanceId,
EntryEndpoint: rev.EntryServiceName,
ParentEndpoint: rev.ParentServiceName,
})
}
if rev.NetworkAddress[0:1] == "#" {
reference.NetworkAddress = rev.NetworkAddress
} else {
i, _ := strconv.ParseInt(rev.NetworkAddress, 10, 64)
reference.NetworkAddressId = int32(i)
}
if rev.EntryServiceName[0:1] == "#" {
reference.EntryEndpoint = rev.EntryServiceName
} else {
i, _ := strconv.ParseInt(rev.EntryServiceName, 10, 64)
reference.EntryEndpointId = int32(i)
}
if rev.ParentServiceName[0:1] == "#" {
reference.ParentEndpoint = rev.ParentServiceName
} else {
i, _ := strconv.ParseInt(rev.ParentServiceName, 10, 64)
reference.ParentEndpointId = int32(i)
}
spanRefs = append(spanRefs, reference)
}
if len(spanRefs) > 0 {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册