Fix rebase

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
rubenvp8510 · Jan 12, 2024 · 1187cdb · 1187cdb
1 parent 04504aa
commit 1187cdb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/tempo/app/modules.go b/cmd/tempo/app/modules.go
@@ -393,8 +393,8 @@ func (t *App) initQueryFrontend() (services.Service, error) {
 	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathWSSearch), base.Wrap(queryFrontend.SearchWSHandler))
 	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTags), base.Wrap(queryFrontend.SearchTagsHandler))
 	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTagsV2), base.Wrap(queryFrontend.SearchTagsV2Handler))
-	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTagValues), base.Wrap(queryFrontend.SearchTagValuesHandler))
-	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTagValuesV2), base.Wrap(queryFrontend.SearchTagValuesV2Handler))
+	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTagValues), base.Wrap(queryFrontend.SearchTagsValuesHandler))
+	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTagValuesV2), base.Wrap(queryFrontend.SearchTagsValuesV2Handler))
 
 	// http metrics endpoints
 	t.Server.HTTP.Handle(addHTTPAPIPrefix(&t.cfg, api.PathSpanMetricsSummary), base.Wrap(queryFrontend.SpanMetricsSummaryHandler))

diff --git a/modules/frontend/frontend.go b/modules/frontend/frontend.go
@@ -30,7 +30,7 @@ type streamingSearchHandler func(req *tempopb.SearchRequest, srv tempopb.Streami
 type QueryFrontend struct {
 	log.Logger
 	TraceByIDHandler, SearchHandler, SearchTagsHandler, SearchTagsValuesHandler, SpanMetricsSummaryHandler, SearchWSHandler,
-	SearchTagsV2Handler, SearchTagsValuesV2Handler http.Handler
+	SearchTagsV2Handler, SearchTagsValuesV2Handler, QueryRangeHandler http.Handler
 	cacheProvider   cache.Provider
 	streamingSearch streamingSearchHandler
 	logger          log.Logger

diff --git a/modules/frontend/frontend_test.go b/modules/frontend/frontend_test.go
@@ -77,11 +77,11 @@ func TestFrontendRoundTripsTagSearch(t *testing.T) {
 
 	// search will fail with `no org id` error
 	resSearch := httptest.NewRecorder()
-	f.SearchTagValuesHandler.ServeHTTP(resSearch, req)
+	f.SearchTagsValuesHandler.ServeHTTP(resSearch, req)
 	assert.Equal(t, resSearch.Body.String(), "no org id")
 
 	resSearch1 := httptest.NewRecorder()
-	f.SearchTagValuesV2Handler.ServeHTTP(resSearch1, req)
+	f.SearchTagsValuesV2Handler.ServeHTTP(resSearch1, req)
 	assert.Equal(t, resSearch1.Body.String(), "no org id")
 
 	resSearch2 := httptest.NewRecorder()