Skip to content

Commit

Permalink
grpc: fix nil arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
josedonizetti committed Jan 25, 2024
1 parent 4f51607 commit 4d49503
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions pkg/server/grpc/event_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ func getEventData(e trace.Event) ([]*pb.EventValue, error) {
return nil, err
}

// if convertStruct was not able to convert an argument is because we don't support the convertion
if eventValue == nil {
continue
}

eventValue.Name = arg.ArgMeta.Name
data = append(data, eventValue)
}
Expand All @@ -59,10 +64,6 @@ func getEventData(e trace.Event) ([]*pb.EventValue, error) {
}

func getEventValue(arg trace.Argument) (*pb.EventValue, error) {
if arg.Value == nil {
return nil, nil
}

var eventValue *pb.EventValue

eventValue, err := parseArgument(arg)
Expand All @@ -77,6 +78,10 @@ func getEventValue(arg trace.Argument) (*pb.EventValue, error) {
// based on the value type
func parseArgument(arg trace.Argument) (*pb.EventValue, error) {
switch v := arg.Value.(type) {
case nil:
return &pb.EventValue{
Value: nil,
}, nil
case int:
return &pb.EventValue{
Value: &pb.EventValue_Int64{
Expand Down

0 comments on commit 4d49503

Please sign in to comment.