Skip to content

Commit

Permalink
Fix build due to a race condition in merging PRs (#3440)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu authored Jun 15, 2021
1 parent d5a1e43 commit fc6ba8e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions config/configgrpc/configgrpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,8 @@ func TestReceiveOnUnixDomainSocket(t *testing.T) {

type grpcTraceServer struct{}

func (gts *grpcTraceServer) Export(context.Context, pdata.Traces) (interface{}, error) {
return nil, nil
func (gts *grpcTraceServer) Export(context.Context, pdata.Traces) (pdatagrpc.TracesResponse, error) {
return pdatagrpc.NewTracesResponse(), nil
}

// tempSocketName provides a temporary Unix socket name for testing.
Expand Down

0 comments on commit fc6ba8e

Please sign in to comment.