@oneuptime/common 10.0.25 → 10.0.27

package/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -45,6 +45,7 @@ export default class AnalyticsBaseModel extends CommonModel {
     projections?: Array<Projection> | undefined;
     materializedViews?: Array<MaterializedView> | undefined;
     enableMCP?: boolean | undefined;
+    ttlExpression?: string | undefined; // e.g. "retentionDate DELETE"
   }) {
     super({
       tableColumns: data.tableColumns,
@@ -148,6 +149,7 @@ export default class AnalyticsBaseModel extends CommonModel {
     this.projections = data.projections || [];
     this.materializedViews = data.materializedViews || [];
     this.enableMCP = data.enableMCP || false;
+    this.ttlExpression = data.ttlExpression || "";
   }
 
   private _enableWorkflowOn: EnableWorkflowOn | undefined;
@@ -282,6 +284,14 @@ export default class AnalyticsBaseModel extends CommonModel {
     this._enableMCP = v;
   }
 
+  private _ttlExpression: string = "";
+  public get ttlExpression(): string {
+    return this._ttlExpression;
+  }
+  public set ttlExpression(v: string) {
+    this._ttlExpression = v;
+  }
+
   public getTenantColumn(): AnalyticsTableColumn | null {
     const column: AnalyticsTableColumn | undefined = this.tableColumns.find(
       (column: AnalyticsTableColumn) => {

package/Models/AnalyticsModels/ExceptionInstance.ts

@@ -1,7 +1,9 @@
 import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
+import AnalyticsTableColumn, {
+  SkipIndexType,
+} from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -108,6 +110,12 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       description: "Exception Type", // Examples: java.net.ConnectException; OSError; etc.
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_exception_type",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -131,6 +139,10 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       description: "Exception Stack Trace", // Examples: Division by zero; Can't convert 'int' object to str implicitly
       required: false,
       type: TableColumnType.Text,
+      codec: {
+        codec: "ZSTD",
+        level: 3,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -154,6 +166,10 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       description: "Exception Message", // Examples: Division by zero; Can't convert 'int' object to str implicitly
       required: false,
       type: TableColumnType.Text,
+      codec: {
+        codec: "ZSTD",
+        level: 3,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -225,6 +241,12 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       description: "ID of the trace",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_trace_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -248,6 +270,12 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       description: "ID of the span",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_span_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -271,6 +299,12 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       description: "Fingerprint of the exception",
       required: true,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_fingerprint",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -406,6 +440,16 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       },
     });
 
+    const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "retentionDate",
+      title: "Retention Date",
+      description:
+        "Date after which this row is eligible for TTL deletion, computed at ingest time as time + service.retainTelemetryDataForDays",
+      required: true,
+      type: TableColumnType.Date,
+      defaultValue: undefined,
+    });
+
     super({
       tableName: "ExceptionItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -459,11 +503,13 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
         environmentColumn,
         parsedFramesColumn,
         attributesColumn,
+        retentionDateColumn,
       ],
       projections: [],
       sortKeys: ["projectId", "time", "serviceId", "fingerprint"],
       primaryKeys: ["projectId", "time", "serviceId", "fingerprint"],
       partitionKey: "sipHash64(projectId) % 16",
+      ttlExpression: "retentionDate DELETE",
     });
   }
 
@@ -602,4 +648,12 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
   public set parsedFrames(v: string | undefined) {
     this.setColumnValue("parsedFrames", v);
   }
+
+  public get retentionDate(): Date | undefined {
+    return this.getColumnValue("retentionDate") as Date | undefined;
+  }
+
+  public set retentionDate(v: Date | undefined) {
+    this.setColumnValue("retentionDate", v);
+  }
 }

package/Models/AnalyticsModels/Log.ts

@@ -1,7 +1,9 @@
 import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
+import AnalyticsTableColumn, {
+  SkipIndexType,
+} from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
@@ -109,6 +111,12 @@ export default class Log extends AnalyticsBaseModel {
       description: "Log Severity Text",
       required: true,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_severity",
+        type: SkipIndexType.Set,
+        params: [10],
+        granularity: 4,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -205,6 +213,12 @@ export default class Log extends AnalyticsBaseModel {
       description: "ID of the trace",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_trace_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -228,6 +242,12 @@ export default class Log extends AnalyticsBaseModel {
       description: "ID of the span",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_span_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -251,6 +271,16 @@ export default class Log extends AnalyticsBaseModel {
       description: "Body of the Log",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_body",
+        type: SkipIndexType.TokenBF,
+        params: [10240, 3, 0],
+        granularity: 4,
+      },
+      codec: {
+        codec: "ZSTD",
+        level: 3,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -268,6 +298,16 @@ export default class Log extends AnalyticsBaseModel {
       },
     });
 
+    const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "retentionDate",
+      title: "Retention Date",
+      description:
+        "Date after which this row is eligible for TTL deletion, computed at ingest time as time + service.retainTelemetryDataForDays",
+      required: true,
+      type: TableColumnType.Date,
+      defaultValue: undefined,
+    });
+
     super({
       tableName: "LogItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -312,11 +352,13 @@ export default class Log extends AnalyticsBaseModel {
         traceIdColumn,
         spanIdColumn,
         bodyColumn,
+        retentionDateColumn,
       ],
       projections: [],
       sortKeys: ["projectId", "time", "serviceId"],
       primaryKeys: ["projectId", "time", "serviceId"],
       partitionKey: "sipHash64(projectId) % 16",
+      ttlExpression: "retentionDate DELETE",
     });
   }
 
@@ -407,4 +449,12 @@ export default class Log extends AnalyticsBaseModel {
   public set spanId(v: string | undefined) {
     this.setColumnValue("spanId", v);
   }
+
+  public get retentionDate(): Date | undefined {
+    return this.getColumnValue("retentionDate") as Date | undefined;
+  }
+
+  public set retentionDate(v: Date | undefined) {
+    this.setColumnValue("retentionDate", v);
+  }
 }

package/Models/AnalyticsModels/Metric.ts

@@ -1,7 +1,9 @@
 import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
+import AnalyticsTableColumn, {
+  SkipIndexType,
+} from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
@@ -83,6 +85,12 @@ export default class Metric extends AnalyticsBaseModel {
       description: "Type of the service that this telemetry belongs to",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_service_type",
+        type: SkipIndexType.Set,
+        params: [5],
+        granularity: 4,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -107,6 +115,12 @@ export default class Metric extends AnalyticsBaseModel {
       description: "Name of the Metric",
       required: true,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_name",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -503,6 +517,16 @@ export default class Metric extends AnalyticsBaseModel {
       },
     );
 
+    const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "retentionDate",
+      title: "Retention Date",
+      description:
+        "Date after which this row is eligible for TTL deletion, computed at ingest time as time + service.retainTelemetryDataForDays",
+      required: true,
+      type: TableColumnType.Date,
+      defaultValue: undefined,
+    });
+
     super({
       tableName: "MetricItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -556,11 +580,13 @@ export default class Metric extends AnalyticsBaseModel {
         maxColumn,
         bucketCountsColumn,
         explicitBoundsColumn,
+        retentionDateColumn,
       ],
       projections: [],
       sortKeys: ["projectId", "time", "serviceId"],
       primaryKeys: ["projectId", "time", "serviceId"],
       partitionKey: "sipHash64(projectId) % 16",
+      ttlExpression: "retentionDate DELETE",
     });
   }
 
@@ -727,4 +753,12 @@ export default class Metric extends AnalyticsBaseModel {
   public set explicitBounds(v: Array<number> | undefined) {
     this.setColumnValue("explicitBounds", v);
   }
+
+  public get retentionDate(): Date | undefined {
+    return this.getColumnValue("retentionDate") as Date | undefined;
+  }
+
+  public set retentionDate(v: Date | undefined) {
+    this.setColumnValue("retentionDate", v);
+  }
 }

package/Models/AnalyticsModels/MonitorLog.ts

@@ -103,6 +103,16 @@ export default class MonitorLog extends AnalyticsBaseModel {
       },
     });
 
+    const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "retentionDate",
+      title: "Retention Date",
+      description:
+        "Date after which this row is eligible for TTL deletion, computed at ingest time as time + service.retainTelemetryDataForDays",
+      required: true,
+      type: TableColumnType.Date,
+      defaultValue: undefined,
+    });
+
     super({
       tableName: "MonitorLog",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -140,11 +150,13 @@ export default class MonitorLog extends AnalyticsBaseModel {
         monitorIdColumn,
         timeColumn,
         logBodyColumn,
+        retentionDateColumn,
       ],
       projections: [],
       sortKeys: ["projectId", "time", "monitorId"],
       primaryKeys: ["projectId", "time", "monitorId"],
       partitionKey: "sipHash64(projectId) % 16",
+      ttlExpression: "retentionDate DELETE",
     });
   }
 
@@ -176,4 +188,12 @@ export default class MonitorLog extends AnalyticsBaseModel {
   public set logBody(v: JSONObject | undefined) {
     this.setColumnValue("logBody", v);
   }
+
+  public get retentionDate(): Date | undefined {
+    return this.getColumnValue("retentionDate") as Date | undefined;
+  }
+
+  public set retentionDate(v: Date | undefined) {
+    this.setColumnValue("retentionDate", v);
+  }
 }

package/Models/AnalyticsModels/Span.ts

@@ -1,7 +1,9 @@
 import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
+import AnalyticsTableColumn, {
+  SkipIndexType,
+} from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
@@ -212,6 +214,12 @@ export default class Span extends AnalyticsBaseModel {
       description: "ID of the trace",
       required: true,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_trace_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -235,6 +243,12 @@ export default class Span extends AnalyticsBaseModel {
       description: "ID of the span",
       required: true,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_span_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -400,6 +414,12 @@ export default class Span extends AnalyticsBaseModel {
       description: "Status Code",
       required: false,
       type: TableColumnType.Number,
+      skipIndex: {
+        name: "idx_status_code",
+        type: SkipIndexType.Set,
+        params: [5],
+        granularity: 4,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -446,6 +466,12 @@ export default class Span extends AnalyticsBaseModel {
       description: "Name of the span",
       required: false,
       type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_name",
+        type: SkipIndexType.TokenBF,
+        params: [10240, 3, 0],
+        granularity: 4,
+      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -486,6 +512,16 @@ export default class Span extends AnalyticsBaseModel {
       },
     });
 
+    const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "retentionDate",
+      title: "Retention Date",
+      description:
+        "Date after which this row is eligible for TTL deletion, computed at ingest time as startTime + service.retainTelemetryDataForDays",
+      required: true,
+      type: TableColumnType.Date,
+      defaultValue: undefined,
+    });
+
     super({
       tableName: "SpanItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -538,11 +574,13 @@ export default class Span extends AnalyticsBaseModel {
         statusMessageColumn,
         nameColumn,
         kindColumn,
+        retentionDateColumn,
       ],
       projections: [],
       sortKeys: ["projectId", "startTime", "serviceId", "traceId"],
       primaryKeys: ["projectId", "startTime", "serviceId", "traceId"],
       partitionKey: "sipHash64(projectId) % 16",
+      ttlExpression: "retentionDate DELETE",
     });
   }
 
@@ -697,4 +735,12 @@ export default class Span extends AnalyticsBaseModel {
   public set statusMessage(v: string | undefined) {
     this.setColumnValue("statusMessage", v);
   }
+
+  public get retentionDate(): Date | undefined {
+    return this.getColumnValue("retentionDate") as Date | undefined;
+  }
+
+  public set retentionDate(v: Date | undefined) {
+    this.setColumnValue("retentionDate", v);
+  }
 }

package/Models/DatabaseModels/GlobalConfig.ts

@@ -605,4 +605,22 @@ export default class GlobalConfig extends GlobalConfigModel {
     unique: true,
   })
   public monitorLogRetentionInDays?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    title: "Monitor Metric Retention Days",
+    description:
+      "Number of days to retain monitor metrics. Monitor metrics older than this will be automatically deleted. Default is 1 day.",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+    unique: true,
+  })
+  public monitorMetricRetentionInDays?: number = undefined;
 }

package/Server/Infrastructure/Postgres/SchemaMigrations/1772350000000-MigrationName.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1772350000000 implements MigrationInterface {
+  public name = "MigrationName1772350000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "monitorMetricRetentionInDays" integer`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_monitor_metric_retention" UNIQUE ("monitorMetricRetentionInDays")`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_monitor_metric_retention"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "monitorMetricRetentionInDays"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -261,6 +261,7 @@ import { MigrationName1770834237090 } from "./1770834237090-MigrationName";
 import { MigrationName1770834237091 } from "./1770834237091-MigrationName";
 import { MigrationName1772111896988 } from "./1772111896988-MigrationName";
 import { MigrationName1772280000000 } from "./1772280000000-MigrationName";
+import { MigrationName1772350000000 } from "./1772350000000-MigrationName";
 
 export default [
   InitialMigration,
@@ -526,4 +527,5 @@ export default [
   MigrationName1770834237091,
   MigrationName1772111896988,
   MigrationName1772280000000,
+  MigrationName1772350000000,
 ];

package/Server/Services/LogAggregationService.ts

@@ -4,6 +4,7 @@ import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import BadDataException from "../../Types/Exception/BadDataException";
+import Includes from "../../Types/BaseDatabase/Includes";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import { DbJSONResponse, Results } from "./AnalyticsDatabaseService";
 
@@ -204,39 +205,43 @@ export class LogAggregationService {
     >,
   ): void {
     if (request.serviceIds && request.serviceIds.length > 0) {
-      const idStrings: Array<string> = request.serviceIds.map(
-        (id: ObjectID): string => {
-          return `'${id.toString()}'`;
-        },
+      statement.append(
+        SQL` AND serviceId IN (${{
+          type: TableColumnType.ObjectID,
+          value: new Includes(
+            request.serviceIds.map((id: ObjectID) => {
+              return id.toString();
+            }),
+          ),
+        }})`,
       );
-      statement.append(` AND serviceId IN (${idStrings.join(",")})`);
     }
 
     if (request.severityTexts && request.severityTexts.length > 0) {
-      const sevStrings: Array<string> = request.severityTexts.map(
-        (s: string): string => {
-          return `'${LogAggregationService.escapeSingleQuotes(s)}'`;
-        },
+      statement.append(
+        SQL` AND severityText IN (${{
+          type: TableColumnType.Text,
+          value: new Includes(request.severityTexts),
+        }})`,
       );
-      statement.append(` AND severityText IN (${sevStrings.join(",")})`);
     }
 
     if (request.traceIds && request.traceIds.length > 0) {
-      const traceStrings: Array<string> = request.traceIds.map(
-        (s: string): string => {
-          return `'${LogAggregationService.escapeSingleQuotes(s)}'`;
-        },
+      statement.append(
+        SQL` AND traceId IN (${{
+          type: TableColumnType.Text,
+          value: new Includes(request.traceIds),
+        }})`,
       );
-      statement.append(` AND traceId IN (${traceStrings.join(",")})`);
     }
 
     if (request.spanIds && request.spanIds.length > 0) {
-      const spanStrings: Array<string> = request.spanIds.map(
-        (s: string): string => {
-          return `'${LogAggregationService.escapeSingleQuotes(s)}'`;
-        },
+      statement.append(
+        SQL` AND spanId IN (${{
+          type: TableColumnType.Text,
+          value: new Includes(request.spanIds),
+        }})`,
       );
-      statement.append(` AND spanId IN (${spanStrings.join(",")})`);
     }
 
     if (request.bodySearchText && request.bodySearchText.trim().length > 0) {
@@ -275,10 +280,6 @@ export class LogAggregationService {
       throw new BadDataException("Invalid facetKey");
     }
   }
-
-  private static escapeSingleQuotes(value: string): string {
-    return value.replace(/'/g, "\\'");
-  }
 }
 
 export default LogAggregationService;

package/Server/Utils/AnalyticsDatabase/Statement.ts

@@ -9,6 +9,7 @@ import LessThan from "../../../Types/BaseDatabase/LessThan";
 import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
 import LessThanOrNull from "../../../Types/BaseDatabase/LessThanOrNull";
 import GreaterThanOrNull from "../../../Types/BaseDatabase/GreaterThanOrNull";
+import NotEqual from "../../../Types/BaseDatabase/NotEqual";
 import Search from "../../../Types/BaseDatabase/Search";
 import OneUptimeDate from "../../../Types/Date";
 import Dictionary from "../../../Types/Dictionary";
@@ -103,7 +104,8 @@ export class Statement implements BaseQueryParams {
       v.value instanceof GreaterThan ||
       v.value instanceof GreaterThanOrEqual ||
       v.value instanceof LessThanOrNull ||
-      v.value instanceof GreaterThanOrNull
+      v.value instanceof GreaterThanOrNull ||
+      v.value instanceof NotEqual
     ) {
       finalValue = v.value.value;
     } else if (v.value instanceof Includes) {