From 093544bdcad2e2f70c96f1b97d7340ae1795b2af Mon Sep 17 00:00:00 2001
From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com>
Date: Mon, 29 Jun 2026 15:26:53 -0400
Subject: [PATCH 1/5] fix: change metrics PK for better memory usage

---
 .../schema/seed/00003_otel_metrics.sql        | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/docker/otel-collector/schema/seed/00003_otel_metrics.sql b/docker/otel-collector/schema/seed/00003_otel_metrics.sql
index b5e0b1d2a0..6ddcfa1ace 100644
--- a/docker/otel-collector/schema/seed/00003_otel_metrics.sql
+++ b/docker/otel-collector/schema/seed/00003_otel_metrics.sql
@@ -9,16 +9,16 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_gauge
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
     `Value` Float64 CODEC(ZSTD(1)),
     `Flags` UInt32 CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -27,11 +27,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_gauge
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 
@@ -50,12 +51,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_sum
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
     `Value` Float64 CODEC(ZSTD(1)),
     `Flags` UInt32 CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -66,11 +67,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_sum
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 -- +goose StatementEnd
@@ -90,14 +92,14 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_histogram
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `BucketCounts` Array(UInt64) CODEC(ZSTD(1)),
     `ExplicitBounds` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -110,11 +112,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_histogram
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 -- +goose StatementEnd
@@ -134,8 +137,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `Scale` Int32 CODEC(ZSTD(1)),
@@ -145,7 +148,7 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     `NegativeOffset` Int32 CODEC(ZSTD(1)),
     `NegativeBucketCounts` Array(UInt64) CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -158,11 +161,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 -- +goose StatementEnd
@@ -182,8 +186,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_summary
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `ValueAtQuantiles.Quantile` Array(Float64) CODEC(ZSTD(1)),
@@ -194,11 +198,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_summary
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 -- +goose StatementEnd

From b55c11194cdbc2018625d23633996ba413ee3e6e Mon Sep 17 00:00:00 2001
From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com>
Date: Tue, 30 Jun 2026 09:57:24 -0400
Subject: [PATCH 2/5] fix: change Delta encoding to underlying datatype byte
 number

---
 .../schema/seed/00003_otel_metrics.sql        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/otel-collector/schema/seed/00003_otel_metrics.sql b/docker/otel-collector/schema/seed/00003_otel_metrics.sql
index 6ddcfa1ace..5695d322f1 100644
--- a/docker/otel-collector/schema/seed/00003_otel_metrics.sql
+++ b/docker/otel-collector/schema/seed/00003_otel_metrics.sql
@@ -13,8 +13,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_gauge
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Value` Float64 CODEC(ZSTD(1)),
     `Flags` UInt32 CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
@@ -51,8 +51,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_sum
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Value` Float64 CODEC(ZSTD(1)),
     `Flags` UInt32 CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
@@ -92,8 +92,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_histogram
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `BucketCounts` Array(UInt64) CODEC(ZSTD(1)),
@@ -137,8 +137,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `Scale` Int32 CODEC(ZSTD(1)),
@@ -186,8 +186,8 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_summary
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `ValueAtQuantiles.Quantile` Array(Float64) CODEC(ZSTD(1)),

From ff6690f53094b19e12bb5244b6e0e6c642016138 Mon Sep 17 00:00:00 2001
From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com>
Date: Tue, 30 Jun 2026 12:59:07 -0400
Subject: [PATCH 3/5] fix: all MetricName should be LowCardinality

---
 docker/otel-collector/schema/seed/00003_otel_metrics.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/otel-collector/schema/seed/00003_otel_metrics.sql b/docker/otel-collector/schema/seed/00003_otel_metrics.sql
index 5695d322f1..9a9622755b 100644
--- a/docker/otel-collector/schema/seed/00003_otel_metrics.sql
+++ b/docker/otel-collector/schema/seed/00003_otel_metrics.sql
@@ -47,7 +47,7 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_sum
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
@@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_histogram
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
@@ -133,7 +133,7 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
@@ -182,7 +182,7 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_summary
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),

From 060c03c066780574b94e09f1d8e6e1789903550b Mon Sep 17 00:00:00 2001
From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com>
Date: Wed, 1 Jul 2026 18:16:14 -0400
Subject: [PATCH 4/5] fix: edge case for interval range for toStartOf functions
 in chart rendering

---
 .../src/__tests__/renderChartConfig.test.ts   | 11 ++++++++++
 .../src/core/renderChartConfig.ts             | 20 +++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/common-utils/src/__tests__/renderChartConfig.test.ts b/packages/common-utils/src/__tests__/renderChartConfig.test.ts
index 9159687546..edd4e3a641 100644
--- a/packages/common-utils/src/__tests__/renderChartConfig.test.ts
+++ b/packages/common-utils/src/__tests__/renderChartConfig.test.ts
@@ -2095,6 +2095,17 @@ describe('renderChartConfig', () => {
         dateRangeEndInclusive: false,
         expected: `(toDate(timestamp) >= toDate(fromUnixTimestamp64Milli(${new Date('2025-02-12 03:53:38Z').getTime()})) AND toDate(timestamp) <= toDate(fromUnixTimestamp64Milli(${new Date('2025-02-12 04:08:38Z').getTime()})))AND(timestamp > fromUnixTimestamp64Milli(${new Date('2025-02-12 03:53:38Z').getTime()}) AND timestamp < fromUnixTimestamp64Milli(${new Date('2025-02-12 04:08:38Z').getTime()}))`,
       },
+      {
+        description:
+          'wraps includedDataInterval-expanded bound in toStartOf when PK has toStartOfHour(col) — prevents dropping rows whose hour is before the raw expanded start',
+        timestampValueExpression: 'timestamp, toStartOfHour(timestamp)',
+        dateRange: [
+          new Date('2025-02-12 04:00:00Z'),
+          new Date('2025-02-12 04:20:00Z'),
+        ],
+        includedDataInterval: '5 minute',
+        expected: `(timestamp >= toStartOfInterval(fromUnixTimestamp64Milli(${new Date('2025-02-12 04:00:00Z').getTime()}), INTERVAL 5 minute) - INTERVAL 5 minute AND timestamp <= toStartOfInterval(fromUnixTimestamp64Milli(${new Date('2025-02-12 04:20:00Z').getTime()}), INTERVAL 5 minute) + INTERVAL 5 minute)AND(toStartOfHour(timestamp) >= toStartOfHour(toStartOfInterval(fromUnixTimestamp64Milli(${new Date('2025-02-12 04:00:00Z').getTime()}), INTERVAL 5 minute) - INTERVAL 5 minute) AND toStartOfHour(timestamp) <= toStartOfHour(toStartOfInterval(fromUnixTimestamp64Milli(${new Date('2025-02-12 04:20:00Z').getTime()}), INTERVAL 5 minute) + INTERVAL 5 minute))`,
+      },
     ];
 
     beforeEach(() => {
diff --git a/packages/common-utils/src/core/renderChartConfig.ts b/packages/common-utils/src/core/renderChartConfig.ts
index 4f5c8a48d5..9e288fdd2c 100644
--- a/packages/common-utils/src/core/renderChartConfig.ts
+++ b/packages/common-utils/src/core/renderChartConfig.ts
@@ -896,17 +896,21 @@ export async function timeFilterExpr({
         );
       }
 
-      const startTimeCond = includedDataInterval
+      const rawStartBound = includedDataInterval
         ? chSql`toStartOfInterval(fromUnixTimestamp64Milli(${{ Int64: startTime }}), INTERVAL ${includedDataInterval}) - INTERVAL ${includedDataInterval}`
-        : toStartOf
-          ? chSql`${toStartOf.function}(fromUnixTimestamp64Milli(${{ Int64: startTime }})${toStartOf.formattedRemainingArgs})`
-          : chSql`fromUnixTimestamp64Milli(${{ Int64: startTime }})`;
+        : chSql`fromUnixTimestamp64Milli(${{ Int64: startTime }})`;
 
-      const endTimeCond = includedDataInterval
+      const rawEndBound = includedDataInterval
         ? chSql`toStartOfInterval(fromUnixTimestamp64Milli(${{ Int64: endTime }}), INTERVAL ${includedDataInterval}) + INTERVAL ${includedDataInterval}`
-        : toStartOf
-          ? chSql`${toStartOf.function}(fromUnixTimestamp64Milli(${{ Int64: endTime }})${toStartOf.formattedRemainingArgs})`
-          : chSql`fromUnixTimestamp64Milli(${{ Int64: endTime }})`;
+        : chSql`fromUnixTimestamp64Milli(${{ Int64: endTime }})`;
+
+      const startTimeCond = toStartOf
+        ? chSql`${toStartOf.function}(${rawStartBound}${toStartOf.formattedRemainingArgs})`
+        : rawStartBound;
+
+      const endTimeCond = toStartOf
+        ? chSql`${toStartOf.function}(${rawEndBound}${toStartOf.formattedRemainingArgs})`
+        : rawEndBound;
 
       const isDateType = columnMeta?.type === 'Date' || isToDateExpr;
 

From a394f9c785d46b67eaf672e21ec725c56b64d45f Mon Sep 17 00:00:00 2001
From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:23:43 -0400
Subject: [PATCH 5/5] add changeset

---
 .changeset/proud-shrimps-clean.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/proud-shrimps-clean.md

diff --git a/.changeset/proud-shrimps-clean.md b/.changeset/proud-shrimps-clean.md
new file mode 100644
index 0000000000..d28eff301a
--- /dev/null
+++ b/.changeset/proud-shrimps-clean.md
@@ -0,0 +1,6 @@
+---
+"@hyperdx/common-utils": minor
+"@hyperdx/otel-collector": minor
+---
+
+feat: update metrics schema for more efficient PK and time pruning