From e8aa74aba22f18e0b2a69e320038f1b8dd1788b7 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Tue, 29 Aug 2023 09:28:55 +0100
Subject: [PATCH] Rename Group By Metrics to Aggregate by (#73980)

* Rename Group By Metrics to Aggregate by

* Update test
---
 .../datasource/tempo/SearchTraceQLEditor/GroupByField.tsx     | 2 +-
 .../tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx
index 32776acd9c1..2fb1682bcba 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx
@@ -70,7 +70,7 @@ export const GroupByField = (props: Props) => {
 
   return (
     <InlineSearchField
-      label="Group By Metrics"
+      label="Aggregate by"
       tooltip="Select one or more tags to see the metrics summary. Note: the metrics summary API only considers spans of kind = server."
     >
       <>
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
index b863513922b..29a32a89c22 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
@@ -124,7 +124,7 @@ describe('TraceQLSearch', () => {
   it('should not render group by when feature toggle is not enabled', async () => {
     await waitFor(() => {
       render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
-      const groupBy = screen.queryByText('Group By Metrics');
+      const groupBy = screen.queryByText('Aggregate by');
       expect(groupBy).toBeNull();
       expect(groupBy).not.toBeInTheDocument();
     });
@@ -134,7 +134,7 @@ describe('TraceQLSearch', () => {
     config.featureToggles.metricsSummary = true;
     await waitFor(() => {
       render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
-      const groupBy = screen.queryByText('Group By Metrics');
+      const groupBy = screen.queryByText('Aggregate by');
       expect(groupBy).not.toBeNull();
       expect(groupBy).toBeInTheDocument();
     });