Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[#9187] Fix span dispatch failed #9194

Merged
merged 1 commit into from
Sep 19, 2022
Merged

[#9187] Fix span dispatch failed #9194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .../src/main/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcSpanMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.navercorp.pinpoint.common.annotations.VisibleForTesting;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.common.util.IntStringValue;
import com.navercorp.pinpoint.common.util.StringUtils;
import com.navercorp.pinpoint.grpc.trace.PAcceptEvent;
import com.navercorp.pinpoint.grpc.trace.PAnnotation;
import com.navercorp.pinpoint.grpc.trace.PAnnotationValue;
Expand Down Expand Up @@ -58,6 +59,9 @@
* @author Woonduk Kang(emeroad)
*/
public class GrpcSpanMessageConverter implements MessageConverter<SpanType, GeneratedMessageV3> {
public static final String DEFAULT_END_POINT = "UNKNOWN";
public static final String DEFAULT_RPC_NAME = "UNKNOWN";
public static final String DEFAULT_REMOTE_ADDRESS = "UNKNOWN";

private final String agentId;
private final short applicationServiceType;
Expand Down Expand Up @@ -170,10 +174,13 @@ private boolean isCompressedType(TraceId traceId) {
private PAcceptEvent newAcceptEvent(Span span) {
PAcceptEvent.Builder builder = PAcceptEvent.newBuilder();

builder.setRemoteAddr(span.getRemoteAddr());
final String remoteAddr = StringUtils.defaultIfEmpty(span.getRemoteAddr(), DEFAULT_REMOTE_ADDRESS);
builder.setRemoteAddr(remoteAddr);
final Shared shared = span.getTraceRoot().getShared();
builder.setRpc(shared.getRpcName());
builder.setEndPoint(shared.getEndPoint());
final String rpc = StringUtils.defaultIfEmpty(shared.getRpcName(), DEFAULT_RPC_NAME);
builder.setRpc(rpc);
final String endPoint = StringUtils.defaultIfEmpty(shared.getEndPoint(), DEFAULT_END_POINT);
builder.setEndPoint(endPoint);

PParentInfo pParentInfo = newParentInfo(span);
if (pParentInfo != null) {
Expand Down