Fixing returning NaN when rate metrics change / reset counter

packages/api/package.json

@@ -72,6 +72,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^28.1.1",
+    "@jest/globals": "29.7.0",
     "nodemon": "^2.0.20",
     "rimraf": "^4.4.1",
     "supertest": "^6.3.1",
@@ -87,6 +88,7 @@
     "dev:task": "ts-node -r tsconfig-paths/register -r '@hyperdx/node-opentelemetry/build/src/tracing' ./src/tasks/index.ts",
     "build": "rimraf ./build && tsc && tsc-alias",
     "lint": "eslint . --ext .ts",
+    "lintfix": "eslint . --ext .ts --fix",
     "ci:lint": "yarn lint && yarn tsc --noEmit",
     "ci:int": "jest --runInBand --ci --forceExit --coverage",
     "dev:int": "jest --watchAll --runInBand --detectOpenHandles"

packages/api/src/clickhouse/__tests__/clickhouse.test.ts

@@ -1,4 +1,5 @@
 import * as clickhouse from '..';
+import { describe, beforeEach, jest, it, expect } from '@jest/globals';
 
 describe('clickhouse', () => {
   beforeEach(() => {
@@ -42,4 +43,29 @@ describe('clickhouse', () => {
     expect(clickhouse.client.insert).toHaveBeenCalledTimes(2);
     expect.assertions(2);
   });
+
+  it('getMetricsChart', async () => {
+    jest
+      .spyOn(clickhouse.client, 'query')
+      .mockResolvedValueOnce({ json: () => Promise.resolve({}) } as any);
+
+    await clickhouse.getMetricsChart({
+      aggFn: clickhouse.AggFn.AvgRate,
+      dataType: 'Sum',
+      endTime: Date.now(),
+      granularity: clickhouse.Granularity.OneHour,
+      name: 'test',
+      q: '',
+      startTime: Date.now() - 1000 * 60 * 60 * 24,
+      teamId: 'test',
+    });
+
+    expect(clickhouse.client.query).toHaveBeenCalledTimes(1);
+    expect(clickhouse.client.query).toHaveBeenCalledWith(
+      expect.objectContaining({
+        format: 'JSON',
+        query: expect.stringContaining('isNaN(rate) = 0'),
+      }),
+    );
+  });
 });

packages/api/src/clickhouse/index.ts

@@ -167,18 +167,18 @@
 });
 
 export const getLogStreamTableName = (
   version: number | undefined | null,
   teamId: string,
 ) => `default.${TableName.LogStream}`;
 
 export const buildTeamLogStreamWhereCondition = (
   version: number | undefined | null,
   teamId: string,
 ) => SqlString.raw('(1 = 1)');
 
 export const buildLogStreamAdditionalFilters = (
   version: number | undefined | null,
   teamId: string,
 ) => SettingsMap.from({});
 
 export const healthCheck = () => client.ping();
@@ -415,7 +415,7 @@
 // TODO: support since, until
 export const fetchMetricsPropertyTypeMappings =
   (intervalSecs: number) =>
   async (tableVersion: number | undefined, teamId: string) => {
     const tableName = `default.${TableName.Metric}`;
     const query = SqlString.format(
       `
@@ -704,6 +704,7 @@
   startTime: number; // unix in ms
   teamId: string;
 }) => {
+  await redisClient.connect();
   const tableName = `default.${TableName.Metric}`;
   const propertyTypeMappingsModel = await buildMetricsPropertyTypeMappingsModel(
     undefined, // default version
@@ -803,6 +804,8 @@
   (
     ?
   )
+WHERE
+  isNaN(rate) = 0
 `.trim(),
     [SqlString.raw(sumMetricSource)],
   );