Skip to content

Commit c0a5a3f

Browse files
chore: remove metrics summary (#6510)
* chore: remove metrics summary * CHANGELOG
1 parent 9f55aec commit c0a5a3f

File tree

17 files changed

+269
-1600
lines changed

17 files changed

+269
-1600
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* [CHANGE] **BREAKING CHANGE** Remove ingesters and compactor alerts [#6369](https://github.com/grafana/tempo/pull/6369) (@javiermolinar)
4040
* [CHANGE] **BREAKING CHANGE** Removed `v2` block encoding and compactor component. [#6273](https://github.com/grafana/tempo/pull/6273) (@joe-elliott)
4141
This includes the removal of the following CLI commands which were `v2` specific: `list block`, `list index`, `view index`, `gen index`, `gen bloom`.
42-
* [CHANGE] **BREAKING CHANGE** SpanMetricsSummary is removed and querier code simplified [#6496](https://github.com/grafana/tempo/pull/6496) (@javiermolinar)
42+
* [CHANGE] **BREAKING CHANGE** SpanMetricsSummary is removed and querier code simplified [#6496](https://github.com/grafana/tempo/pull/6496) [#6510](https://github.com/grafana/tempo/pull/6510) (@javiermolinar)
4343
* [CHANGE] **BREAKING CHANGE** Sets the `all` target to be 3.0 compatible and removes the `scalable-single-binary` target [#6283](https://github.com/grafana/tempo/pull/6283) (@joe-elliott)
4444
* [CHANGE] **BREAKING CHANGE** Clean up enterprise jsonnet [#6505](https://github.com/grafana/tempo/pull/6505) (@javiermolinar)
4545
* [CHANGE] Expose otlp http and grpc ports for Docker examples [#6296](https://github.com/grafana/tempo/pull/6296) (@javiermolinar)

cmd/tempo-vulture/mocks.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ func (m *MockHTTPClient) GetOverrides() (*userconfigurableoverrides.Limits, stri
6565
panic("unimplemented")
6666
}
6767

68-
//nolint:all
69-
func (m *MockHTTPClient) MetricsSummary(_ string, _ string, _ int64, _ int64) (*tempopb.SpanMetricsSummaryResponse, error) {
70-
panic("unimplemented")
71-
}
72-
7368
//nolint:all
7469
func (m *MockHTTPClient) MetricsQueryRange(_ string, _, _ int64, _ string, _ int) (*tempopb.QueryRangeResponse, error) {
7570
if m.err != nil {

cmd/tempo/app/modules.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,6 @@ func (t *App) initQuerier() (services.Service, error) {
444444
searchTagValuesV2Handler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.querier.SearchTagValuesV2Handler))
445445
t.Server.HTTPRouter().Handle(path.Join(api.PathPrefixQuerier, addHTTPAPIPrefix(&t.cfg, api.PathSearchTagValuesV2)), searchTagValuesV2Handler)
446446

447-
spanMetricsSummaryHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.querier.SpanMetricsSummaryHandler))
448-
t.Server.HTTPRouter().Handle(path.Join(api.PathPrefixQuerier, addHTTPAPIPrefix(&t.cfg, api.PathSpanMetricsSummary)), spanMetricsSummaryHandler)
449-
450447
queryRangeHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.querier.QueryRangeHandler))
451448
t.Server.HTTPRouter().Handle(path.Join(api.PathPrefixQuerier, addHTTPAPIPrefix(&t.cfg, api.PathMetricsQueryRange)), queryRangeHandler)
452449

@@ -500,7 +497,6 @@ func (t *App) initQueryFrontend() (services.Service, error) {
500497
t.Server.HTTPRouter().Handle(addHTTPAPIPrefix(&t.cfg, api.PathSearchTagValuesV2), base.Wrap(queryFrontend.SearchTagsValuesV2Handler))
501498

502499
// http metrics endpoints
503-
t.Server.HTTPRouter().Handle(addHTTPAPIPrefix(&t.cfg, api.PathSpanMetricsSummary), base.Wrap(queryFrontend.MetricsSummaryHandler))
504500
t.Server.HTTPRouter().Handle(addHTTPAPIPrefix(&t.cfg, api.PathMetricsQueryInstant), base.Wrap(queryFrontend.MetricsQueryInstantHandler))
505501
t.Server.HTTPRouter().Handle(addHTTPAPIPrefix(&t.cfg, api.PathMetricsQueryRange), base.Wrap(queryFrontend.MetricsQueryRangeHandler))
506502

docs/sources/tempo/api_docs/metrics-summary.md

Lines changed: 0 additions & 170 deletions
This file was deleted.

docs/sources/tempo/configuration/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ query_frontend:
706706
# Set a maximum timeout for all api queries at which point the frontend will cancel queued jobs
707707
# and return cleanly. HTTP will return a 503 and GRPC will return a context canceled error.
708708
# This timeout impacts all http and grpc streaming queries as part of the Tempo api surface such as
709-
# search, metrics summary, tags and tag values lookups, etc.
709+
# search, metrics queries, tags and tag values lookups, etc.
710710
# Generally it is preferred to let the client cancel context. This is a failsafe to prevent a client
711711
# from imposing more work on Tempo than desired.
712712
# (default: 0)

0 commit comments

Comments
 (0)