fix some rebase stuff

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
rubenvp8510 · Nov 10, 2023 · 49e072d · 49e072d
1 parent c5e6796
commit 49e072d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)