Skip to content

Commit 1d34307

Browse files
committed
[#9202] Backport: Fix span dispatch failed
1 parent f79d161 commit 1d34307

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcSpanMessageConverter.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.navercorp.pinpoint.common.annotations.VisibleForTesting;
2323
import com.navercorp.pinpoint.common.util.CollectionUtils;
2424
import com.navercorp.pinpoint.common.util.IntStringValue;
25+
import com.navercorp.pinpoint.common.util.StringUtils;
2526
import com.navercorp.pinpoint.grpc.trace.PAcceptEvent;
2627
import com.navercorp.pinpoint.grpc.trace.PAnnotation;
2728
import com.navercorp.pinpoint.grpc.trace.PAnnotationValue;
@@ -58,6 +59,9 @@
5859
* @author Woonduk Kang(emeroad)
5960
*/
6061
public class GrpcSpanMessageConverter implements MessageConverter<SpanType, GeneratedMessageV3> {
62+
public static final String DEFAULT_END_POINT = "UNKNOWN";
63+
public static final String DEFAULT_RPC_NAME = "UNKNOWN";
64+
public static final String DEFAULT_REMOTE_ADDRESS = "UNKNOWN";
6165

6266
private final String agentId;
6367
private final short applicationServiceType;
@@ -170,10 +174,13 @@ private boolean isCompressedType(TraceId traceId) {
170174
private PAcceptEvent newAcceptEvent(Span span) {
171175
PAcceptEvent.Builder builder = PAcceptEvent.newBuilder();
172176

173-
builder.setRemoteAddr(span.getRemoteAddr());
177+
final String remoteAddr = StringUtils.defaultIfEmpty(span.getRemoteAddr(), DEFAULT_REMOTE_ADDRESS);
178+
builder.setRemoteAddr(remoteAddr);
174179
final Shared shared = span.getTraceRoot().getShared();
175-
builder.setRpc(shared.getRpcName());
176-
builder.setEndPoint(shared.getEndPoint());
180+
final String rpc = StringUtils.defaultIfEmpty(shared.getRpcName(), DEFAULT_RPC_NAME);
181+
builder.setRpc(rpc);
182+
final String endPoint = StringUtils.defaultIfEmpty(shared.getEndPoint(), DEFAULT_END_POINT);
183+
builder.setEndPoint(endPoint);
177184

178185
PParentInfo pParentInfo = newParentInfo(span);
179186
if (pParentInfo != null) {

0 commit comments

Comments
 (0)