From 49e072dd9bcf348e36ce3b72eca5a5c33efc74b6 Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Thu, 9 Nov 2023 22:49:19 -0600 Subject: [PATCH] fix some rebase stuff Signed-off-by: Ruben Vargas --- modules/querier/querier.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/querier/querier.go b/modules/querier/querier.go index b34c2d294b9..c0935b8b960 100644 --- a/modules/querier/querier.go +++ b/modules/querier/querier.go @@ -809,7 +809,7 @@ func (q *Querier) internalSearchBlock(ctx context.Context, req *tempopb.SearchBl func (q *Querier) internalTagSearchBlock(ctx context.Context, req *tempopb.SearchTagsBlockRequest) (*tempopb.SearchTagsResponse, error) { tenantID, err := user.ExtractOrgID(ctx) if err != nil { - return nil, errors.Wrap(err, "error extracting org id in Querier.BackendSearch") + return nil, fmt.Errorf("error extracting org id in Querier.BackendSearch: %w", err) } blockID, err := uuid.Parse(req.BlockID) @@ -854,7 +854,7 @@ func (q *Querier) internalTagSearchBlock(ctx context.Context, req *tempopb.Searc func (q *Querier) internalTagValueSearchBlock(ctx context.Context, req *tempopb.SearchTagsValuesBlockRequest) (*tempopb.SearchTagValuesResponse, error) { tenantID, err := user.ExtractOrgID(ctx) if err != nil { - return nil, errors.Wrap(err, "error extracting org id in Querier.BackendSearch") + return nil, fmt.Errorf("error extracting org id in Querier.BackendSearch: %w", err) } blockID, err := uuid.Parse(req.BlockID)