Skip to content

Commit 710c973

Browse files
alsoba13alsoba13
authored
chore: log query params (#4294)
* chore: log query params * support for /pyroscope/render and friends * fmt * query_window tag * slice to string lazily * use lazy join instead of lazy sprintf * delete sep
1 parent dec755e commit 710c973

19 files changed

+238
-133
lines changed

‎pkg/frontend/frontend_analyze_query.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"connectrpc.com/connect"
77
"github.com/grafana/dskit/tenant"
8-
"github.com/opentracing/opentracing-go"
98
"github.com/prometheus/common/model"
109

1110
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
@@ -19,8 +18,6 @@ func (f *Frontend) AnalyzeQuery(
1918
ctx context.Context,
2019
c *connect.Request[querierv1.AnalyzeQueryRequest],
2120
) (*connect.Response[querierv1.AnalyzeQueryResponse], error) {
22-
opentracing.SpanFromContext(ctx)
23-
2421
tenantID, err := tenant.TenantID(ctx)
2522
if err != nil {
2623
return nil, connect.NewError(connect.CodeInvalidArgument, err)

‎pkg/frontend/frontend_get_profile_stats.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55

66
"connectrpc.com/connect"
7-
"github.com/opentracing/opentracing-go"
87

98
"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
109
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
@@ -15,8 +14,6 @@ func (f *Frontend) GetProfileStats(
1514
ctx context.Context,
1615
c *connect.Request[typesv1.GetProfileStatsRequest],
1716
) (*connect.Response[typesv1.GetProfileStatsResponse], error) {
18-
opentracing.SpanFromContext(ctx)
19-
2017
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceGetProfileStatsProcedure)
2118
res, err := connectgrpc.RoundTripUnary[typesv1.GetProfileStatsRequest, typesv1.GetProfileStatsResponse](ctx, f, c)
2219
return res, err

‎pkg/frontend/frontend_label_names.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"connectrpc.com/connect"
77
"github.com/grafana/dskit/tenant"
8-
"github.com/opentracing/opentracing-go"
98
"github.com/prometheus/common/model"
109

1110
"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
@@ -19,11 +18,6 @@ func (f *Frontend) LabelNames(
1918
ctx context.Context,
2019
c *connect.Request[typesv1.LabelNamesRequest],
2120
) (*connect.Response[typesv1.LabelNamesResponse], error) {
22-
opentracing.SpanFromContext(ctx).
23-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
24-
SetTag("end", model.Time(c.Msg.End).Time().String()).
25-
SetTag("matchers", c.Msg.Matchers)
26-
2721
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceLabelNamesProcedure)
2822

2923
tenantIDs, err := tenant.TenantIDs(ctx)

‎pkg/frontend/frontend_label_values.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"connectrpc.com/connect"
77
"github.com/grafana/dskit/tenant"
8-
"github.com/opentracing/opentracing-go"
98
"github.com/prometheus/common/model"
109

1110
"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
@@ -19,12 +18,6 @@ func (f *Frontend) LabelValues(
1918
ctx context.Context,
2019
c *connect.Request[typesv1.LabelValuesRequest],
2120
) (*connect.Response[typesv1.LabelValuesResponse], error) {
22-
opentracing.SpanFromContext(ctx).
23-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
24-
SetTag("end", model.Time(c.Msg.End).Time().String()).
25-
SetTag("matchers", c.Msg.Matchers).
26-
SetTag("name", c.Msg.Name)
27-
2821
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceLabelValuesProcedure)
2922

3023
interval, ok := phlaremodel.GetTimeRange(c.Msg)

‎pkg/frontend/frontend_profile_types.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"connectrpc.com/connect"
77
"github.com/grafana/dskit/tenant"
8-
"github.com/opentracing/opentracing-go"
98
"github.com/prometheus/common/model"
109

1110
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
@@ -19,10 +18,6 @@ func (f *Frontend) ProfileTypes(
1918
ctx context.Context,
2019
c *connect.Request[querierv1.ProfileTypesRequest],
2120
) (*connect.Response[querierv1.ProfileTypesResponse], error) {
22-
opentracing.SpanFromContext(ctx).
23-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
24-
SetTag("end", model.Time(c.Msg.End).Time().String())
25-
2621
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceProfileTypesProcedure)
2722

2823
interval, ok := phlaremodel.GetTimeRange(c.Msg)

‎pkg/frontend/frontend_select_merge_profile.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"connectrpc.com/connect"
88
"github.com/grafana/dskit/tenant"
9-
"github.com/opentracing/opentracing-go"
109
"github.com/prometheus/common/model"
1110
"golang.org/x/sync/errgroup"
1211

@@ -23,13 +22,6 @@ func (f *Frontend) SelectMergeProfile(
2322
ctx context.Context,
2423
c *connect.Request[querierv1.SelectMergeProfileRequest],
2524
) (*connect.Response[profilev1.Profile], error) {
26-
opentracing.SpanFromContext(ctx).
27-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
28-
SetTag("end", model.Time(c.Msg.End).Time().String()).
29-
SetTag("selector", c.Msg.LabelSelector).
30-
SetTag("max_nodes", c.Msg.GetMaxNodes()).
31-
SetTag("profile_type", c.Msg.ProfileTypeID)
32-
3325
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceSelectMergeProfileProcedure)
3426
tenantIDs, err := tenant.TenantIDs(ctx)
3527
if err != nil {

‎pkg/frontend/frontend_select_merge_span_profile.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"connectrpc.com/connect"
88
"github.com/grafana/dskit/tenant"
9-
"github.com/opentracing/opentracing-go"
109
"github.com/prometheus/common/model"
1110
"golang.org/x/sync/errgroup"
1211

@@ -22,13 +21,6 @@ func (f *Frontend) SelectMergeSpanProfile(
2221
ctx context.Context,
2322
c *connect.Request[querierv1.SelectMergeSpanProfileRequest],
2423
) (*connect.Response[querierv1.SelectMergeSpanProfileResponse], error) {
25-
opentracing.SpanFromContext(ctx).
26-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
27-
SetTag("end", model.Time(c.Msg.End).Time().String()).
28-
SetTag("selector", c.Msg.LabelSelector).
29-
SetTag("max_nodes", c.Msg.MaxNodes).
30-
SetTag("profile_type", c.Msg.ProfileTypeID)
31-
3224
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceSelectMergeSpanProfileProcedure)
3325
tenantIDs, err := tenant.TenantIDs(ctx)
3426
if err != nil {

‎pkg/frontend/frontend_select_merge_stacktraces.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"connectrpc.com/connect"
88
"github.com/grafana/dskit/tenant"
9-
"github.com/opentracing/opentracing-go"
109
"github.com/prometheus/common/model"
1110
"golang.org/x/sync/errgroup"
1211

@@ -40,13 +39,6 @@ func (f *Frontend) selectMergeStacktracesTree(
4039
ctx context.Context,
4140
c *connect.Request[querierv1.SelectMergeStacktracesRequest],
4241
) (*phlaremodel.Tree, error) {
43-
opentracing.SpanFromContext(ctx).
44-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
45-
SetTag("end", model.Time(c.Msg.End).Time().String()).
46-
SetTag("selector", c.Msg.LabelSelector).
47-
SetTag("max_nodes", c.Msg.GetMaxNodes()).
48-
SetTag("profile_type", c.Msg.ProfileTypeID)
49-
5042
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceSelectMergeStacktracesProcedure)
5143
tenantIDs, err := tenant.TenantIDs(ctx)
5244
if err != nil {

‎pkg/frontend/frontend_select_time_series.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"connectrpc.com/connect"
88
"github.com/grafana/dskit/tenant"
9-
"github.com/opentracing/opentracing-go"
109
"github.com/prometheus/common/model"
1110
"golang.org/x/sync/errgroup"
1211

@@ -22,14 +21,6 @@ func (f *Frontend) SelectSeries(
2221
ctx context.Context,
2322
c *connect.Request[querierv1.SelectSeriesRequest],
2423
) (*connect.Response[querierv1.SelectSeriesResponse], error) {
25-
opentracing.SpanFromContext(ctx).
26-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
27-
SetTag("end", model.Time(c.Msg.End).Time().String()).
28-
SetTag("selector", c.Msg.LabelSelector).
29-
SetTag("step", c.Msg.Step).
30-
SetTag("by", c.Msg.GroupBy).
31-
SetTag("profile_type", c.Msg.ProfileTypeID)
32-
3324
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceSelectSeriesProcedure)
3425
tenantIDs, err := tenant.TenantIDs(ctx)
3526
if err != nil {

‎pkg/frontend/frontend_series_labels.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"connectrpc.com/connect"
77
"github.com/grafana/dskit/tenant"
8-
"github.com/opentracing/opentracing-go"
98
"github.com/prometheus/common/model"
109

1110
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
@@ -19,12 +18,6 @@ func (f *Frontend) Series(
1918
ctx context.Context,
2019
c *connect.Request[querierv1.SeriesRequest],
2120
) (*connect.Response[querierv1.SeriesResponse], error) {
22-
opentracing.SpanFromContext(ctx).
23-
SetTag("start", model.Time(c.Msg.Start).Time().String()).
24-
SetTag("end", model.Time(c.Msg.End).Time().String()).
25-
SetTag("matchers", c.Msg.Matchers).
26-
SetTag("label_names", c.Msg.LabelNames)
27-
2821
ctx = connectgrpc.WithProcedure(ctx, querierv1connect.QuerierServiceSeriesProcedure)
2922

3023
tenantIDs, err := tenant.TenantIDs(ctx)

0 commit comments

Comments
 (0)