Skip to content

Commit 9b0d790

Browse files
committed
Use LabelNames instead of backdoor query
1 parent b2888fa commit 9b0d790

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

pkg/frontend/readpath/queryfrontend/query_series_labels.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"connectrpc.com/connect"
77
"github.com/go-kit/log/level"
88
"github.com/grafana/dskit/tenant"
9+
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
910

1011
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
1112
queryv1 "github.com/grafana/pyroscope/api/gen/proto/go/query/v1"
@@ -17,7 +18,7 @@ func (q *QueryFrontend) filterLabelNames(
1718
ctx context.Context,
1819
c *connect.Request[querierv1.SeriesRequest],
1920
labelNames []string,
20-
labelSelector string,
21+
matchers []string,
2122
) ([]string, error) {
2223
if capabilities, ok := featureflags.GetClientCapabilities(ctx); ok && capabilities.AllowUtf8LabelNames {
2324
return labelNames, nil
@@ -29,20 +30,17 @@ func (q *QueryFrontend) filterLabelNames(
2930
// Filter out label names not passing legacy validation if utf8 label names not enabled
3031
if len(labelNames) == 0 {
3132
// Querying for all label names; must retrieve all label names to then filter out
32-
report, err := q.querySingle(ctx, &queryv1.QueryRequest{
33-
StartTime: c.Msg.Start,
34-
EndTime: c.Msg.End,
35-
LabelSelector: labelSelector,
36-
Query: []*queryv1.Query{{
37-
QueryType: queryv1.QueryType_QUERY_LABEL_NAMES,
38-
LabelNames: &queryv1.LabelNamesQuery{},
39-
}},
40-
})
33+
response, err := q.LabelNames(ctx, connect.NewRequest(&typesv1.LabelNamesRequest{
34+
Start: c.Msg.Start,
35+
End: c.Msg.End,
36+
Matchers: matchers,
37+
}))
38+
4139
if err != nil {
4240
return nil, err
4341
}
44-
if report != nil {
45-
toFilter = report.LabelNames.LabelNames
42+
if response != nil {
43+
toFilter = response.Msg.Names
4644
}
4745
}
4846

@@ -83,7 +81,7 @@ func (q *QueryFrontend) Series(
8381
return nil, connect.NewError(connect.CodeInvalidArgument, err)
8482
}
8583

86-
labelNames, err := q.filterLabelNames(ctx, c, c.Msg.LabelNames, labelSelector)
84+
labelNames, err := q.filterLabelNames(ctx, c, c.Msg.LabelNames, c.Msg.Matchers)
8785
if err != nil {
8886
return nil, err
8987
}

0 commit comments

Comments
 (0)