Fix gRPC error msg handling for lb-gateway handler

pkg/gateway/lb/handler/grpc/aggregation.go

@@ -31,6 +31,7 @@
  "github.com/vdaas/vald/internal/net/grpc/codes"
  "github.com/vdaas/vald/internal/net/grpc/errdetails"
  "github.com/vdaas/vald/internal/net/grpc/status"
+ "github.com/vdaas/vald/internal/observability/attribute"
  "github.com/vdaas/vald/internal/observability/trace"
  "github.com/vdaas/vald/internal/sync"
  "github.com/vdaas/vald/pkg/gateway/lb/service"
@@ -56,7 +57,7 @@
  f func(ctx context.Context,
  fcfg *payload.Search_Config, // Forwarding Config to Agent
  vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error),
-) (res *payload.Search_Response, err error) {
+) (res *payload.Search_Response, attrs []attribute.KeyValue, err error) {
  ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "aggregationSearch"), apiName+"/aggregationSearch")
  defer func() {
  if span != nil {
@@ -235,12 +236,13 @@
  ResourceType: errdetails.ValdGRPCResourceTypePrefix + "/vald.v1.search",
  ResourceName: fmt.Sprintf("%s: %s(%s) to %v", apiName, s.name, s.ip, s.gateway.Addrs(ctx)),
  })
+ attrs = trace.StatusCodeInternal(err.Error())
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.StatusCodeInternal(err.Error())...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
- return nil, err
+ return nil, attrs, err
  }
  res = aggr.Result()
  if num != 0 && len(res.GetResults()) > num {
@@ -261,12 +263,13 @@
  ResourceName: fmt.Sprintf("%s: %s(%s) to %v", apiName, s.name, s.ip, s.gateway.Addrs(ctx)),
  }, info.Get(),
  )
+ attrs = trace.StatusCodeDeadlineExceeded(err.Error())
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.StatusCodeDeadlineExceeded(err.Error())...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
- return nil, err
+ return nil, attrs, err
  }
  if 0 < min && len(res.GetResults()) < min {
  err = status.WrapWithDeadlineExceeded(
@@ -281,12 +284,13 @@
  ResourceName: fmt.Sprintf("%s: %s(%s) to %v", apiName, s.name, s.ip, s.gateway.Addrs(ctx)),
  }, info.Get(),
  )
+ attrs = trace.StatusCodeDeadlineExceeded(err.Error())
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.StatusCodeDeadlineExceeded(err.Error())...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
- return nil, err
+ return nil, attrs, err
  }
  }
 
@@ -301,14 +305,15 @@
  ResourceType: errdetails.ValdGRPCResourceTypePrefix + "/vald.v1.search",
  ResourceName: fmt.Sprintf("%s: %s(%s) to %v", apiName, s.name, s.ip, s.gateway.Addrs(ctx)),
  }, info.Get())
+ attrs = trace.FromGRPCStatus(st.Code(), msg)
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.FromGRPCStatus(st.Code(), msg)...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
  log.Warn(err)
  if len(res.GetResults()) == 0 {
- return nil, err
+ return nil, attrs, err
  }
  }
  if num != 0 && len(res.GetResults()) == 0 {
@@ -324,21 +329,23 @@
  ResourceType: errdetails.ValdGRPCResourceTypePrefix + "/vald.v1.search",
  ResourceName: fmt.Sprintf("%s: %s(%s) to %v", apiName, s.name, s.ip, s.gateway.Addrs(ctx)),
  }, info.Get())
+ attrs = trace.StatusCodeNotFound(err.Error())
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.StatusCodeNotFound(err.Error())...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
- return nil, err
+ return nil, attrs, err
  }
 
  if 0 < min && len(res.GetResults()) < min {
  if err == nil {
  err = errors.ErrInsuffcientSearchResult
  }
+ attrs = trace.StatusCodeNotFound(err.Error())
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.StatusCodeNotFound(err.Error())...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
  err = status.WrapWithNotFound(
@@ -353,15 +360,16 @@
  ResourceName: fmt.Sprintf("%s: %s(%s) to %v", apiName, s.name, s.ip, s.gateway.Addrs(ctx)),
  }, info.Get(),
  )
+ attrs = trace.StatusCodeNotFound(err.Error())
  if span != nil {
  span.RecordError(err)
- span.SetAttributes(trace.StatusCodeNotFound(err.Error())...)
+ span.SetAttributes(attrs...)
  span.SetStatus(trace.StatusError, err.Error())
  }
- return nil, err
+ return nil, attrs, err
  }
  res.RequestId = bcfg.GetRequestId()
- return res, nil
+ return res, attrs, nil
 }
 
 // vald standard algorithm.