fix: Ensure group-by works with sum metrics (#636)

Adds all available columns into the query so that we can properly apply the group by clause.

Ref: HDX-1419

Author: teeohhem

packages/common-utils/src/__tests__/renderChartConfig.test.ts

@@ -100,18 +100,18 @@ describe('renderChartConfig', () => {
     const generatedSql = await renderChartConfig(config, mockMetadata);
     const actual = parameterizedQueryToSql(generatedSql);
     expect(actual).toBe(
-      'WITH RawSum AS (SELECT MetricName,Value,TimeUnix,Attributes,\n' +
+      'WITH RawSum AS (SELECT *,\n' +
         '               any(Value) OVER (ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS PrevValue,\n' +
         '               any(AttributesHash) OVER (ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS PrevAttributesHash,\n' +
         '               IF(AggregationTemporality = 1,\n' +
         '                  Value,IF(Value - PrevValue < 0 AND AttributesHash = PrevAttributesHash, Value,\n' +
         '                      IF(AttributesHash != PrevAttributesHash, 0, Value - PrevValue))) as Rate\n' +
         '            FROM (\n' +
-        '                SELECT mapConcat(ScopeAttributes, ResourceAttributes, Attributes) AS Attributes,\n' +
-        '                       cityHash64(Attributes) AS AttributesHash, Value, MetricName, TimeUnix, AggregationTemporality\n' +
+        '                SELECT *, \n' +
+        '                       cityHash64(mapConcat(ScopeAttributes, ResourceAttributes, Attributes)) AS AttributesHash\n' +
         '                FROM default.otel_metrics_sum\n' +
         "                WHERE MetricName = 'db.client.connections.usage'\n" +
-        '                ORDER BY Attributes, TimeUnix ASC\n' +
+        '                ORDER BY AttributesHash, TimeUnix ASC\n' +
         '            ) )SELECT avg(\n' +
         '      toFloat64OrNull(toString(Rate))\n' +
         '    ),toStartOfInterval(toDateTime(TimeUnix), INTERVAL 5 minutes) AS `__hdx_time_bucket` ' +

packages/common-utils/src/renderChartConfig.ts

@@ -785,18 +785,18 @@ function translateMetricChartConfig(
       with: [
         {
           name: 'RawSum',
-          sql: chSql`SELECT MetricName,Value,TimeUnix,Attributes,
+          sql: chSql`SELECT *,
                any(Value) OVER (ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS PrevValue,
                any(AttributesHash) OVER (ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS PrevAttributesHash,
                IF(AggregationTemporality = 1,
                   Value,IF(Value - PrevValue < 0 AND AttributesHash = PrevAttributesHash, Value,
                       IF(AttributesHash != PrevAttributesHash, 0, Value - PrevValue))) as Rate
             FROM (
-                SELECT mapConcat(ScopeAttributes, ResourceAttributes, Attributes) AS Attributes,
-                       cityHash64(Attributes) AS AttributesHash, Value, MetricName, TimeUnix, AggregationTemporality
+                SELECT *, 
+                       cityHash64(mapConcat(ScopeAttributes, ResourceAttributes, Attributes)) AS AttributesHash
                 FROM ${renderFrom({ from: { ...from, tableName: metricTables[MetricsDataType.Sum] } })}
                 WHERE MetricName = '${metricName}'
-                ORDER BY Attributes, TimeUnix ASC
+                ORDER BY AttributesHash, TimeUnix ASC
             ) `,
         },
       ],