@miradorlabs/web-grpc 2.0.0 → 2.2.0

package/proto/gateway/web/v1/{telemetry_gateway.ts → metric_gateway.ts}

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.11.10
+//   protoc-gen-ts_proto  v2.12.0
 //   protoc               v3.21.12
-// source: proto/gateway/web/v1/telemetry_gateway.proto
+// source: proto/gateway/web/v1/metric_gateway.proto
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
@@ -131,8 +131,11 @@ export function gaugeAggregationToJSON(object: GaugeAggregation): string {
 
 export enum SumAggregation {
   SUM_AGGREGATION_UNSPECIFIED = 0,
+  /** SUM_AGGREGATION_RATE - Per-second rate from monotonic deltas. */
   SUM_AGGREGATION_RATE = 1,
+  /** SUM_AGGREGATION_INCREASE - Windowed total (sum of per-point deltas). */
   SUM_AGGREGATION_INCREASE = 2,
+  /** SUM_AGGREGATION_LAST - Latest cumulative value in each bucket. */
   SUM_AGGREGATION_LAST = 3,
   SUM_AGGREGATION_COUNT = 4,
   UNRECOGNIZED = -1,
@@ -182,6 +185,7 @@ export function sumAggregationToJSON(object: SumAggregation): string {
 
 export enum HistogramAggregation {
   HISTOGRAM_AGGREGATION_UNSPECIFIED = 0,
+  /** HISTOGRAM_AGGREGATION_QUANTILE - Interpolated percentile; reads HistogramQuerySpec.quantile. */
   HISTOGRAM_AGGREGATION_QUANTILE = 1,
   HISTOGRAM_AGGREGATION_AVG = 2,
   HISTOGRAM_AGGREGATION_MIN = 3,
@@ -237,8 +241,59 @@ export function histogramAggregationToJSON(object: HistogramAggregation): string
   }
 }
 
+export enum AttributeFilterOp {
+  ATTRIBUTE_FILTER_OP_UNSPECIFIED = 0,
+  ATTRIBUTE_FILTER_OP_EQUALS = 1,
+  ATTRIBUTE_FILTER_OP_NOT_EQUALS = 2,
+  ATTRIBUTE_FILTER_OP_IN = 3,
+  ATTRIBUTE_FILTER_OP_NOT_IN = 4,
+  UNRECOGNIZED = -1,
+}
+
+export function attributeFilterOpFromJSON(object: any): AttributeFilterOp {
+  switch (object) {
+    case 0:
+    case "ATTRIBUTE_FILTER_OP_UNSPECIFIED":
+      return AttributeFilterOp.ATTRIBUTE_FILTER_OP_UNSPECIFIED;
+    case 1:
+    case "ATTRIBUTE_FILTER_OP_EQUALS":
+      return AttributeFilterOp.ATTRIBUTE_FILTER_OP_EQUALS;
+    case 2:
+    case "ATTRIBUTE_FILTER_OP_NOT_EQUALS":
+      return AttributeFilterOp.ATTRIBUTE_FILTER_OP_NOT_EQUALS;
+    case 3:
+    case "ATTRIBUTE_FILTER_OP_IN":
+      return AttributeFilterOp.ATTRIBUTE_FILTER_OP_IN;
+    case 4:
+    case "ATTRIBUTE_FILTER_OP_NOT_IN":
+      return AttributeFilterOp.ATTRIBUTE_FILTER_OP_NOT_IN;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return AttributeFilterOp.UNRECOGNIZED;
+  }
+}
+
+export function attributeFilterOpToJSON(object: AttributeFilterOp): string {
+  switch (object) {
+    case AttributeFilterOp.ATTRIBUTE_FILTER_OP_UNSPECIFIED:
+      return "ATTRIBUTE_FILTER_OP_UNSPECIFIED";
+    case AttributeFilterOp.ATTRIBUTE_FILTER_OP_EQUALS:
+      return "ATTRIBUTE_FILTER_OP_EQUALS";
+    case AttributeFilterOp.ATTRIBUTE_FILTER_OP_NOT_EQUALS:
+      return "ATTRIBUTE_FILTER_OP_NOT_EQUALS";
+    case AttributeFilterOp.ATTRIBUTE_FILTER_OP_IN:
+      return "ATTRIBUTE_FILTER_OP_IN";
+    case AttributeFilterOp.ATTRIBUTE_FILTER_OP_NOT_IN:
+      return "ATTRIBUTE_FILTER_OP_NOT_IN";
+    case AttributeFilterOp.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 export interface StreamMetricsRequest {
-  /** Stamped by the gateway from the verified identity — never client-supplied. */
+  /** Verified against the caller's identity before proxying. */
   organizationId: string;
   projectId: string;
 }
@@ -259,7 +314,7 @@ export interface MetricInfo {
 }
 
 export interface StreamMetricAttributesRequest {
-  /** Stamped by the gateway from the verified identity — never client-supplied. */
+  /** Verified against the caller's identity before proxying. */
   organizationId: string;
   projectId: string;
   metricName: string;
@@ -279,66 +334,134 @@ export interface MetricAttribute {
   values: string[];
 }
 
-export interface GaugeQueryRequest {
-  /** Stamped by the gateway from the verified identity — never client-supplied. */
+export interface StreamQueryRequest {
+  /** Verified against the caller's identity before proxying. */
   organizationId: string;
   projectId: string;
-  metricName: string;
-  aggregation: GaugeAggregation;
-  timeWindow: AnalyticsTimeWindow;
+  query: MetricQuery | undefined;
+  timeRange:
+    | TimeRange
+    | undefined;
+  /**
+   * UNSPECIFIED = the server picks a sane interval for the range;
+   * WHOLE_RANGE = one bucket spanning the range (stat/pie/table shapes).
+   */
   timeInterval: AnalyticsTimeInterval;
 }
 
-export interface SumQueryRequest {
-  /** Stamped by the gateway from the verified identity — never client-supplied. */
-  organizationId: string;
-  projectId: string;
+/**
+ * MetricQuery is the stored, validated unit of computation: which metric, how
+ * to aggregate it, filtered and split by attributes. The kind arm must match
+ * the metric's catalog kind, and each arm exposes only its own aggregations.
+ */
+export interface MetricQuery {
   metricName: string;
+  gauge?: GaugeQuerySpec | undefined;
+  sum?: SumQuerySpec | undefined;
+  histogram?:
+    | HistogramQuerySpec
+    | undefined;
+  /** ≤16 filters, ANDed. Keys resolve point attributes first, then resource. */
+  filters: AttributeFilter[];
+  /**
+   * Attribute keys to split series by (≤4), same key resolution as filters.
+   * Empty = one unlabeled series.
+   */
+  groupBy: string[];
+  /**
+   * Top-k series kept when group_by is set, ranked by aggregate magnitude
+   * over the range. 0 = server default (10); server-capped at 50.
+   */
+  groupLimit: number;
+}
+
+export interface GaugeQuerySpec {
+  aggregation: GaugeAggregation;
+}
+
+export interface SumQuerySpec {
   aggregation: SumAggregation;
-  timeWindow: AnalyticsTimeWindow;
-  timeInterval: AnalyticsTimeInterval;
 }
 
-export interface HistogramQueryRequest {
-  /** Stamped by the gateway from the verified identity — never client-supplied. */
-  organizationId: string;
-  projectId: string;
-  metricName: string;
+export interface HistogramQuerySpec {
   aggregation: HistogramAggregation;
   /** Quantile level in (0,1); required iff aggregation == QUANTILE. */
   quantile: number;
-  timeWindow: AnalyticsTimeWindow;
-  timeInterval: AnalyticsTimeInterval;
 }
 
-export interface MetricAnalyticsEnvelope {
-  snapshot?: MetricAnalyticsSnapshot | undefined;
-  bucketUpdate?: MetricSeriesBucketUpdate | undefined;
+export interface AttributeFilter {
+  key: string;
+  op: AttributeFilterOp;
+  /** EQUALS / NOT_EQUALS use exactly one value; IN / NOT_IN use one or more. */
+  values: string[];
+}
+
+export interface TimeRange {
+  /** Relative: [now - window, now). Slides while the stream is open. */
+  window?:
+    | AnalyticsTimeWindow
+    | undefined;
+  /** Fixed range (e.g. drag-to-zoom): snapshot only, then the stream completes. */
+  absolute?: AbsoluteTimeRange | undefined;
+}
+
+export interface AbsoluteTimeRange {
+  start: Date | undefined;
+  end: Date | undefined;
+}
+
+export interface QueryDataEnvelope {
+  snapshot?: QuerySnapshot | undefined;
+  update?: QuerySeriesUpdate | undefined;
 }
 
-export interface MetricAnalyticsSnapshot {
+export interface QuerySnapshot {
+  /**
+   * One entry per group_by value combination; a single series with empty
+   * group_values when the query has no group_by.
+   */
   series: MetricSeries[];
-  windowStart: Date | undefined;
-  windowEnd: Date | undefined;
+  rangeStart: Date | undefined;
+  rangeEnd: Date | undefined;
   bucketSizeMs: number;
+  /** Drives frontend gap fill (buckets are sparse); 1 for WHOLE_RANGE. */
   expectedBucketCount: number;
   unit: string;
 }
 
 export interface MetricSeries {
+  /** group_by key → this series' value. Empty for ungrouped queries. */
+  groupValues: { [key: string]: string };
+  /** Sparse: buckets with no data are omitted. */
   buckets: MetricBucket[];
 }
 
+export interface MetricSeries_GroupValuesEntry {
+  key: string;
+  value: string;
+}
+
 export interface MetricBucket {
   bucketStart: Date | undefined;
   value: number;
 }
 
-export interface MetricSeriesBucketUpdate {
+/**
+ * QuerySeriesUpdate replaces the bucket with the same bucket_start in the
+ * identified series; unseen group_values introduce a new series. For
+ * WHOLE_RANGE queries it replaces the single whole-range bucket.
+ */
+export interface QuerySeriesUpdate {
+  groupValues: { [key: string]: string };
   bucket: MetricBucket | undefined;
   generatedAt: Date | undefined;
 }
 
+export interface QuerySeriesUpdate_GroupValuesEntry {
+  key: string;
+  value: string;
+}
+
 function createBaseStreamMetricsRequest(): StreamMetricsRequest {
   return { organizationId: "", projectId: "" };
 }
@@ -979,37 +1102,34 @@ export const MetricAttribute: MessageFns<MetricAttribute> = {
   },
 };
 
-function createBaseGaugeQueryRequest(): GaugeQueryRequest {
-  return { organizationId: "", projectId: "", metricName: "", aggregation: 0, timeWindow: 0, timeInterval: 0 };
+function createBaseStreamQueryRequest(): StreamQueryRequest {
+  return { organizationId: "", projectId: "", query: undefined, timeRange: undefined, timeInterval: 0 };
 }
 
-export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
-  encode(message: GaugeQueryRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const StreamQueryRequest: MessageFns<StreamQueryRequest> = {
+  encode(message: StreamQueryRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
     if (message.organizationId !== "") {
       writer.uint32(10).string(message.organizationId);
     }
     if (message.projectId !== "") {
       writer.uint32(18).string(message.projectId);
     }
-    if (message.metricName !== "") {
-      writer.uint32(26).string(message.metricName);
-    }
-    if (message.aggregation !== 0) {
-      writer.uint32(32).int32(message.aggregation);
+    if (message.query !== undefined) {
+      MetricQuery.encode(message.query, writer.uint32(26).fork()).join();
     }
-    if (message.timeWindow !== 0) {
-      writer.uint32(40).int32(message.timeWindow);
+    if (message.timeRange !== undefined) {
+      TimeRange.encode(message.timeRange, writer.uint32(34).fork()).join();
     }
     if (message.timeInterval !== 0) {
-      writer.uint32(48).int32(message.timeInterval);
+      writer.uint32(40).int32(message.timeInterval);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): GaugeQueryRequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): StreamQueryRequest {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseGaugeQueryRequest();
+    const message = createBaseStreamQueryRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1034,15 +1154,15 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
             break;
           }
 
-          message.metricName = reader.string();
+          message.query = MetricQuery.decode(reader, reader.uint32());
           continue;
         }
         case 4: {
-          if (tag !== 32) {
+          if (tag !== 34) {
             break;
           }
 
-          message.aggregation = reader.int32() as any;
+          message.timeRange = TimeRange.decode(reader, reader.uint32());
           continue;
         }
         case 5: {
@@ -1050,14 +1170,6 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
             break;
           }
 
-          message.timeWindow = reader.int32() as any;
-          continue;
-        }
-        case 6: {
-          if (tag !== 48) {
-            break;
-          }
-
           message.timeInterval = reader.int32() as any;
           continue;
         }
@@ -1070,7 +1182,7 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
     return message;
   },
 
-  fromJSON(object: any): GaugeQueryRequest {
+  fromJSON(object: any): StreamQueryRequest {
     return {
       organizationId: isSet(object.organizationId)
         ? globalThis.String(object.organizationId)
@@ -1082,17 +1194,12 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
         : isSet(object.project_id)
         ? globalThis.String(object.project_id)
         : "",
-      metricName: isSet(object.metricName)
-        ? globalThis.String(object.metricName)
-        : isSet(object.metric_name)
-        ? globalThis.String(object.metric_name)
-        : "",
-      aggregation: isSet(object.aggregation) ? gaugeAggregationFromJSON(object.aggregation) : 0,
-      timeWindow: isSet(object.timeWindow)
-        ? analyticsTimeWindowFromJSON(object.timeWindow)
-        : isSet(object.time_window)
-        ? analyticsTimeWindowFromJSON(object.time_window)
-        : 0,
+      query: isSet(object.query) ? MetricQuery.fromJSON(object.query) : undefined,
+      timeRange: isSet(object.timeRange)
+        ? TimeRange.fromJSON(object.timeRange)
+        : isSet(object.time_range)
+        ? TimeRange.fromJSON(object.time_range)
+        : undefined,
       timeInterval: isSet(object.timeInterval)
         ? analyticsTimeIntervalFromJSON(object.timeInterval)
         : isSet(object.time_interval)
@@ -1101,7 +1208,7 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
     };
   },
 
-  toJSON(message: GaugeQueryRequest): unknown {
+  toJSON(message: StreamQueryRequest): unknown {
     const obj: any = {};
     if (message.organizationId !== "") {
       obj.organizationId = message.organizationId;
@@ -1109,14 +1216,11 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
     if (message.projectId !== "") {
       obj.projectId = message.projectId;
     }
-    if (message.metricName !== "") {
-      obj.metricName = message.metricName;
-    }
-    if (message.aggregation !== 0) {
-      obj.aggregation = gaugeAggregationToJSON(message.aggregation);
+    if (message.query !== undefined) {
+      obj.query = MetricQuery.toJSON(message.query);
     }
-    if (message.timeWindow !== 0) {
-      obj.timeWindow = analyticsTimeWindowToJSON(message.timeWindow);
+    if (message.timeRange !== undefined) {
+      obj.timeRange = TimeRange.toJSON(message.timeRange);
     }
     if (message.timeInterval !== 0) {
       obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
@@ -1124,52 +1228,66 @@ export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<GaugeQueryRequest>, I>>(base?: I): GaugeQueryRequest {
-    return GaugeQueryRequest.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<StreamQueryRequest>, I>>(base?: I): StreamQueryRequest {
+    return StreamQueryRequest.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<GaugeQueryRequest>, I>>(object: I): GaugeQueryRequest {
-    const message = createBaseGaugeQueryRequest();
+  fromPartial<I extends Exact<DeepPartial<StreamQueryRequest>, I>>(object: I): StreamQueryRequest {
+    const message = createBaseStreamQueryRequest();
     message.organizationId = object.organizationId ?? "";
     message.projectId = object.projectId ?? "";
-    message.metricName = object.metricName ?? "";
-    message.aggregation = object.aggregation ?? 0;
-    message.timeWindow = object.timeWindow ?? 0;
+    message.query = (object.query !== undefined && object.query !== null)
+      ? MetricQuery.fromPartial(object.query)
+      : undefined;
+    message.timeRange = (object.timeRange !== undefined && object.timeRange !== null)
+      ? TimeRange.fromPartial(object.timeRange)
+      : undefined;
     message.timeInterval = object.timeInterval ?? 0;
     return message;
   },
 };
 
-function createBaseSumQueryRequest(): SumQueryRequest {
-  return { organizationId: "", projectId: "", metricName: "", aggregation: 0, timeWindow: 0, timeInterval: 0 };
+function createBaseMetricQuery(): MetricQuery {
+  return {
+    metricName: "",
+    gauge: undefined,
+    sum: undefined,
+    histogram: undefined,
+    filters: [],
+    groupBy: [],
+    groupLimit: 0,
+  };
 }
 
-export const SumQueryRequest: MessageFns<SumQueryRequest> = {
-  encode(message: SumQueryRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.organizationId !== "") {
-      writer.uint32(10).string(message.organizationId);
+export const MetricQuery: MessageFns<MetricQuery> = {
+  encode(message: MetricQuery, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.metricName !== "") {
+      writer.uint32(10).string(message.metricName);
     }
-    if (message.projectId !== "") {
-      writer.uint32(18).string(message.projectId);
+    if (message.gauge !== undefined) {
+      GaugeQuerySpec.encode(message.gauge, writer.uint32(18).fork()).join();
     }
-    if (message.metricName !== "") {
-      writer.uint32(26).string(message.metricName);
+    if (message.sum !== undefined) {
+      SumQuerySpec.encode(message.sum, writer.uint32(26).fork()).join();
     }
-    if (message.aggregation !== 0) {
-      writer.uint32(32).int32(message.aggregation);
+    if (message.histogram !== undefined) {
+      HistogramQuerySpec.encode(message.histogram, writer.uint32(34).fork()).join();
     }
-    if (message.timeWindow !== 0) {
-      writer.uint32(40).int32(message.timeWindow);
+    for (const v of message.filters) {
+      AttributeFilter.encode(v!, writer.uint32(42).fork()).join();
     }
-    if (message.timeInterval !== 0) {
-      writer.uint32(48).int32(message.timeInterval);
+    for (const v of message.groupBy) {
+      writer.uint32(50).string(v!);
+    }
+    if (message.groupLimit !== 0) {
+      writer.uint32(56).int32(message.groupLimit);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): SumQueryRequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricQuery {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseSumQueryRequest();
+    const message = createBaseMetricQuery();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1178,7 +1296,7 @@ export const SumQueryRequest: MessageFns<SumQueryRequest> = {
             break;
           }
 
-          message.organizationId = reader.string();
+          message.metricName = reader.string();
           continue;
         }
         case 2: {
@@ -1186,7 +1304,7 @@ export const SumQueryRequest: MessageFns<SumQueryRequest> = {
             break;
           }
 
-          message.projectId = reader.string();
+          message.gauge = GaugeQuerySpec.decode(reader, reader.uint32());
           continue;
         }
         case 3: {
@@ -1194,31 +1312,39 @@ export const SumQueryRequest: MessageFns<SumQueryRequest> = {
             break;
           }
 
-          message.metricName = reader.string();
+          message.sum = SumQuerySpec.decode(reader, reader.uint32());
           continue;
         }
         case 4: {
-          if (tag !== 32) {
+          if (tag !== 34) {
             break;
           }
 
-          message.aggregation = reader.int32() as any;
+          message.histogram = HistogramQuerySpec.decode(reader, reader.uint32());
           continue;
         }
         case 5: {
-          if (tag !== 40) {
+          if (tag !== 42) {
             break;
           }
 
-          message.timeWindow = reader.int32() as any;
+          message.filters.push(AttributeFilter.decode(reader, reader.uint32()));
           continue;
         }
         case 6: {
-          if (tag !== 48) {
+          if (tag !== 50) {
             break;
           }
 
-          message.timeInterval = reader.int32() as any;
+          message.groupBy.push(reader.string());
+          continue;
+        }
+        case 7: {
+          if (tag !== 56) {
+            break;
+          }
+
+          message.groupLimit = reader.int32();
           continue;
         }
       }
@@ -1230,176 +1356,105 @@ export const SumQueryRequest: MessageFns<SumQueryRequest> = {
     return message;
   },
 
-  fromJSON(object: any): SumQueryRequest {
+  fromJSON(object: any): MetricQuery {
     return {
-      organizationId: isSet(object.organizationId)
-        ? globalThis.String(object.organizationId)
-        : isSet(object.organization_id)
-        ? globalThis.String(object.organization_id)
-        : "",
-      projectId: isSet(object.projectId)
-        ? globalThis.String(object.projectId)
-        : isSet(object.project_id)
-        ? globalThis.String(object.project_id)
-        : "",
       metricName: isSet(object.metricName)
         ? globalThis.String(object.metricName)
         : isSet(object.metric_name)
         ? globalThis.String(object.metric_name)
         : "",
-      aggregation: isSet(object.aggregation) ? sumAggregationFromJSON(object.aggregation) : 0,
-      timeWindow: isSet(object.timeWindow)
-        ? analyticsTimeWindowFromJSON(object.timeWindow)
-        : isSet(object.time_window)
-        ? analyticsTimeWindowFromJSON(object.time_window)
-        : 0,
-      timeInterval: isSet(object.timeInterval)
-        ? analyticsTimeIntervalFromJSON(object.timeInterval)
-        : isSet(object.time_interval)
-        ? analyticsTimeIntervalFromJSON(object.time_interval)
+      gauge: isSet(object.gauge) ? GaugeQuerySpec.fromJSON(object.gauge) : undefined,
+      sum: isSet(object.sum) ? SumQuerySpec.fromJSON(object.sum) : undefined,
+      histogram: isSet(object.histogram) ? HistogramQuerySpec.fromJSON(object.histogram) : undefined,
+      filters: globalThis.Array.isArray(object?.filters)
+        ? object.filters.map((e: any) => AttributeFilter.fromJSON(e))
+        : [],
+      groupBy: globalThis.Array.isArray(object?.groupBy)
+        ? object.groupBy.map((e: any) => globalThis.String(e))
+        : globalThis.Array.isArray(object?.group_by)
+        ? object.group_by.map((e: any) => globalThis.String(e))
+        : [],
+      groupLimit: isSet(object.groupLimit)
+        ? globalThis.Number(object.groupLimit)
+        : isSet(object.group_limit)
+        ? globalThis.Number(object.group_limit)
         : 0,
     };
   },
 
-  toJSON(message: SumQueryRequest): unknown {
+  toJSON(message: MetricQuery): unknown {
     const obj: any = {};
-    if (message.organizationId !== "") {
-      obj.organizationId = message.organizationId;
-    }
-    if (message.projectId !== "") {
-      obj.projectId = message.projectId;
-    }
     if (message.metricName !== "") {
       obj.metricName = message.metricName;
     }
-    if (message.aggregation !== 0) {
-      obj.aggregation = sumAggregationToJSON(message.aggregation);
+    if (message.gauge !== undefined) {
+      obj.gauge = GaugeQuerySpec.toJSON(message.gauge);
     }
-    if (message.timeWindow !== 0) {
-      obj.timeWindow = analyticsTimeWindowToJSON(message.timeWindow);
+    if (message.sum !== undefined) {
+      obj.sum = SumQuerySpec.toJSON(message.sum);
     }
-    if (message.timeInterval !== 0) {
-      obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
+    if (message.histogram !== undefined) {
+      obj.histogram = HistogramQuerySpec.toJSON(message.histogram);
+    }
+    if (message.filters?.length) {
+      obj.filters = message.filters.map((e) => AttributeFilter.toJSON(e));
+    }
+    if (message.groupBy?.length) {
+      obj.groupBy = message.groupBy;
+    }
+    if (message.groupLimit !== 0) {
+      obj.groupLimit = Math.round(message.groupLimit);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<SumQueryRequest>, I>>(base?: I): SumQueryRequest {
-    return SumQueryRequest.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<MetricQuery>, I>>(base?: I): MetricQuery {
+    return MetricQuery.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<SumQueryRequest>, I>>(object: I): SumQueryRequest {
-    const message = createBaseSumQueryRequest();
-    message.organizationId = object.organizationId ?? "";
-    message.projectId = object.projectId ?? "";
+  fromPartial<I extends Exact<DeepPartial<MetricQuery>, I>>(object: I): MetricQuery {
+    const message = createBaseMetricQuery();
     message.metricName = object.metricName ?? "";
-    message.aggregation = object.aggregation ?? 0;
-    message.timeWindow = object.timeWindow ?? 0;
-    message.timeInterval = object.timeInterval ?? 0;
+    message.gauge = (object.gauge !== undefined && object.gauge !== null)
+      ? GaugeQuerySpec.fromPartial(object.gauge)
+      : undefined;
+    message.sum = (object.sum !== undefined && object.sum !== null) ? SumQuerySpec.fromPartial(object.sum) : undefined;
+    message.histogram = (object.histogram !== undefined && object.histogram !== null)
+      ? HistogramQuerySpec.fromPartial(object.histogram)
+      : undefined;
+    message.filters = object.filters?.map((e) => AttributeFilter.fromPartial(e)) || [];
+    message.groupBy = object.groupBy?.map((e) => e) || [];
+    message.groupLimit = object.groupLimit ?? 0;
     return message;
   },
 };
 
-function createBaseHistogramQueryRequest(): HistogramQueryRequest {
-  return {
-    organizationId: "",
-    projectId: "",
-    metricName: "",
-    aggregation: 0,
-    quantile: 0,
-    timeWindow: 0,
-    timeInterval: 0,
-  };
+function createBaseGaugeQuerySpec(): GaugeQuerySpec {
+  return { aggregation: 0 };
 }
 
-export const HistogramQueryRequest: MessageFns<HistogramQueryRequest> = {
-  encode(message: HistogramQueryRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.organizationId !== "") {
-      writer.uint32(10).string(message.organizationId);
-    }
-    if (message.projectId !== "") {
-      writer.uint32(18).string(message.projectId);
-    }
-    if (message.metricName !== "") {
-      writer.uint32(26).string(message.metricName);
-    }
+export const GaugeQuerySpec: MessageFns<GaugeQuerySpec> = {
+  encode(message: GaugeQuerySpec, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
     if (message.aggregation !== 0) {
-      writer.uint32(32).int32(message.aggregation);
-    }
-    if (message.quantile !== 0) {
-      writer.uint32(41).double(message.quantile);
-    }
-    if (message.timeWindow !== 0) {
-      writer.uint32(48).int32(message.timeWindow);
-    }
-    if (message.timeInterval !== 0) {
-      writer.uint32(56).int32(message.timeInterval);
+      writer.uint32(8).int32(message.aggregation);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): HistogramQueryRequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): GaugeQuerySpec {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseHistogramQueryRequest();
+    const message = createBaseGaugeQuerySpec();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1: {
-          if (tag !== 10) {
-            break;
-          }
-
-          message.organizationId = reader.string();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-
-          message.projectId = reader.string();
-          continue;
-        }
-        case 3: {
-          if (tag !== 26) {
-            break;
-          }
-
-          message.metricName = reader.string();
-          continue;
-        }
-        case 4: {
-          if (tag !== 32) {
+          if (tag !== 8) {
             break;
           }
 
           message.aggregation = reader.int32() as any;
           continue;
         }
-        case 5: {
-          if (tag !== 41) {
-            break;
-          }
-
-          message.quantile = reader.double();
-          continue;
-        }
-        case 6: {
-          if (tag !== 48) {
-            break;
-          }
-
-          message.timeWindow = reader.int32() as any;
-          continue;
-        }
-        case 7: {
-          if (tag !== 56) {
-            break;
-          }
-
-          message.timeInterval = reader.int32() as any;
-          continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1409,99 +1464,427 @@ export const HistogramQueryRequest: MessageFns<HistogramQueryRequest> = {
     return message;
   },
 
-  fromJSON(object: any): HistogramQueryRequest {
-    return {
-      organizationId: isSet(object.organizationId)
-        ? globalThis.String(object.organizationId)
-        : isSet(object.organization_id)
-        ? globalThis.String(object.organization_id)
-        : "",
-      projectId: isSet(object.projectId)
-        ? globalThis.String(object.projectId)
-        : isSet(object.project_id)
-        ? globalThis.String(object.project_id)
-        : "",
-      metricName: isSet(object.metricName)
-        ? globalThis.String(object.metricName)
-        : isSet(object.metric_name)
-        ? globalThis.String(object.metric_name)
-        : "",
-      aggregation: isSet(object.aggregation) ? histogramAggregationFromJSON(object.aggregation) : 0,
-      quantile: isSet(object.quantile) ? globalThis.Number(object.quantile) : 0,
-      timeWindow: isSet(object.timeWindow)
-        ? analyticsTimeWindowFromJSON(object.timeWindow)
-        : isSet(object.time_window)
-        ? analyticsTimeWindowFromJSON(object.time_window)
-        : 0,
-      timeInterval: isSet(object.timeInterval)
-        ? analyticsTimeIntervalFromJSON(object.timeInterval)
-        : isSet(object.time_interval)
-        ? analyticsTimeIntervalFromJSON(object.time_interval)
-        : 0,
-    };
+  fromJSON(object: any): GaugeQuerySpec {
+    return { aggregation: isSet(object.aggregation) ? gaugeAggregationFromJSON(object.aggregation) : 0 };
   },
 
-  toJSON(message: HistogramQueryRequest): unknown {
+  toJSON(message: GaugeQuerySpec): unknown {
     const obj: any = {};
-    if (message.organizationId !== "") {
-      obj.organizationId = message.organizationId;
-    }
-    if (message.projectId !== "") {
-      obj.projectId = message.projectId;
-    }
-    if (message.metricName !== "") {
-      obj.metricName = message.metricName;
-    }
     if (message.aggregation !== 0) {
-      obj.aggregation = histogramAggregationToJSON(message.aggregation);
-    }
-    if (message.quantile !== 0) {
-      obj.quantile = message.quantile;
-    }
-    if (message.timeWindow !== 0) {
-      obj.timeWindow = analyticsTimeWindowToJSON(message.timeWindow);
-    }
-    if (message.timeInterval !== 0) {
-      obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
+      obj.aggregation = gaugeAggregationToJSON(message.aggregation);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<HistogramQueryRequest>, I>>(base?: I): HistogramQueryRequest {
-    return HistogramQueryRequest.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<GaugeQuerySpec>, I>>(base?: I): GaugeQuerySpec {
+    return GaugeQuerySpec.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<HistogramQueryRequest>, I>>(object: I): HistogramQueryRequest {
-    const message = createBaseHistogramQueryRequest();
-    message.organizationId = object.organizationId ?? "";
-    message.projectId = object.projectId ?? "";
-    message.metricName = object.metricName ?? "";
+  fromPartial<I extends Exact<DeepPartial<GaugeQuerySpec>, I>>(object: I): GaugeQuerySpec {
+    const message = createBaseGaugeQuerySpec();
+    message.aggregation = object.aggregation ?? 0;
+    return message;
+  },
+};
+
+function createBaseSumQuerySpec(): SumQuerySpec {
+  return { aggregation: 0 };
+}
+
+export const SumQuerySpec: MessageFns<SumQuerySpec> = {
+  encode(message: SumQuerySpec, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.aggregation !== 0) {
+      writer.uint32(8).int32(message.aggregation);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): SumQuerySpec {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseSumQuerySpec();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.aggregation = reader.int32() as any;
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): SumQuerySpec {
+    return { aggregation: isSet(object.aggregation) ? sumAggregationFromJSON(object.aggregation) : 0 };
+  },
+
+  toJSON(message: SumQuerySpec): unknown {
+    const obj: any = {};
+    if (message.aggregation !== 0) {
+      obj.aggregation = sumAggregationToJSON(message.aggregation);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<SumQuerySpec>, I>>(base?: I): SumQuerySpec {
+    return SumQuerySpec.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<SumQuerySpec>, I>>(object: I): SumQuerySpec {
+    const message = createBaseSumQuerySpec();
+    message.aggregation = object.aggregation ?? 0;
+    return message;
+  },
+};
+
+function createBaseHistogramQuerySpec(): HistogramQuerySpec {
+  return { aggregation: 0, quantile: 0 };
+}
+
+export const HistogramQuerySpec: MessageFns<HistogramQuerySpec> = {
+  encode(message: HistogramQuerySpec, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.aggregation !== 0) {
+      writer.uint32(8).int32(message.aggregation);
+    }
+    if (message.quantile !== 0) {
+      writer.uint32(17).double(message.quantile);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): HistogramQuerySpec {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHistogramQuerySpec();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.aggregation = reader.int32() as any;
+          continue;
+        }
+        case 2: {
+          if (tag !== 17) {
+            break;
+          }
+
+          message.quantile = reader.double();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HistogramQuerySpec {
+    return {
+      aggregation: isSet(object.aggregation) ? histogramAggregationFromJSON(object.aggregation) : 0,
+      quantile: isSet(object.quantile) ? globalThis.Number(object.quantile) : 0,
+    };
+  },
+
+  toJSON(message: HistogramQuerySpec): unknown {
+    const obj: any = {};
+    if (message.aggregation !== 0) {
+      obj.aggregation = histogramAggregationToJSON(message.aggregation);
+    }
+    if (message.quantile !== 0) {
+      obj.quantile = message.quantile;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<HistogramQuerySpec>, I>>(base?: I): HistogramQuerySpec {
+    return HistogramQuerySpec.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<HistogramQuerySpec>, I>>(object: I): HistogramQuerySpec {
+    const message = createBaseHistogramQuerySpec();
     message.aggregation = object.aggregation ?? 0;
     message.quantile = object.quantile ?? 0;
-    message.timeWindow = object.timeWindow ?? 0;
-    message.timeInterval = object.timeInterval ?? 0;
     return message;
   },
 };
 
-function createBaseMetricAnalyticsEnvelope(): MetricAnalyticsEnvelope {
-  return { snapshot: undefined, bucketUpdate: undefined };
+function createBaseAttributeFilter(): AttributeFilter {
+  return { key: "", op: 0, values: [] };
+}
+
+export const AttributeFilter: MessageFns<AttributeFilter> = {
+  encode(message: AttributeFilter, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.op !== 0) {
+      writer.uint32(16).int32(message.op);
+    }
+    for (const v of message.values) {
+      writer.uint32(26).string(v!);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): AttributeFilter {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAttributeFilter();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.op = reader.int32() as any;
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.values.push(reader.string());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AttributeFilter {
+    return {
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      op: isSet(object.op) ? attributeFilterOpFromJSON(object.op) : 0,
+      values: globalThis.Array.isArray(object?.values) ? object.values.map((e: any) => globalThis.String(e)) : [],
+    };
+  },
+
+  toJSON(message: AttributeFilter): unknown {
+    const obj: any = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.op !== 0) {
+      obj.op = attributeFilterOpToJSON(message.op);
+    }
+    if (message.values?.length) {
+      obj.values = message.values;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AttributeFilter>, I>>(base?: I): AttributeFilter {
+    return AttributeFilter.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<AttributeFilter>, I>>(object: I): AttributeFilter {
+    const message = createBaseAttributeFilter();
+    message.key = object.key ?? "";
+    message.op = object.op ?? 0;
+    message.values = object.values?.map((e) => e) || [];
+    return message;
+  },
+};
+
+function createBaseTimeRange(): TimeRange {
+  return { window: undefined, absolute: undefined };
+}
+
+export const TimeRange: MessageFns<TimeRange> = {
+  encode(message: TimeRange, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.window !== undefined) {
+      writer.uint32(8).int32(message.window);
+    }
+    if (message.absolute !== undefined) {
+      AbsoluteTimeRange.encode(message.absolute, writer.uint32(18).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): TimeRange {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseTimeRange();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.window = reader.int32() as any;
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.absolute = AbsoluteTimeRange.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): TimeRange {
+    return {
+      window: isSet(object.window) ? analyticsTimeWindowFromJSON(object.window) : undefined,
+      absolute: isSet(object.absolute) ? AbsoluteTimeRange.fromJSON(object.absolute) : undefined,
+    };
+  },
+
+  toJSON(message: TimeRange): unknown {
+    const obj: any = {};
+    if (message.window !== undefined) {
+      obj.window = analyticsTimeWindowToJSON(message.window);
+    }
+    if (message.absolute !== undefined) {
+      obj.absolute = AbsoluteTimeRange.toJSON(message.absolute);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<TimeRange>, I>>(base?: I): TimeRange {
+    return TimeRange.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<TimeRange>, I>>(object: I): TimeRange {
+    const message = createBaseTimeRange();
+    message.window = object.window ?? undefined;
+    message.absolute = (object.absolute !== undefined && object.absolute !== null)
+      ? AbsoluteTimeRange.fromPartial(object.absolute)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseAbsoluteTimeRange(): AbsoluteTimeRange {
+  return { start: undefined, end: undefined };
 }
 
-export const MetricAnalyticsEnvelope: MessageFns<MetricAnalyticsEnvelope> = {
-  encode(message: MetricAnalyticsEnvelope, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const AbsoluteTimeRange: MessageFns<AbsoluteTimeRange> = {
+  encode(message: AbsoluteTimeRange, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.start !== undefined) {
+      Timestamp.encode(toTimestamp(message.start), writer.uint32(10).fork()).join();
+    }
+    if (message.end !== undefined) {
+      Timestamp.encode(toTimestamp(message.end), writer.uint32(18).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): AbsoluteTimeRange {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAbsoluteTimeRange();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.start = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.end = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AbsoluteTimeRange {
+    return {
+      start: isSet(object.start) ? fromJsonTimestamp(object.start) : undefined,
+      end: isSet(object.end) ? fromJsonTimestamp(object.end) : undefined,
+    };
+  },
+
+  toJSON(message: AbsoluteTimeRange): unknown {
+    const obj: any = {};
+    if (message.start !== undefined) {
+      obj.start = message.start.toISOString();
+    }
+    if (message.end !== undefined) {
+      obj.end = message.end.toISOString();
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AbsoluteTimeRange>, I>>(base?: I): AbsoluteTimeRange {
+    return AbsoluteTimeRange.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<AbsoluteTimeRange>, I>>(object: I): AbsoluteTimeRange {
+    const message = createBaseAbsoluteTimeRange();
+    message.start = object.start ?? undefined;
+    message.end = object.end ?? undefined;
+    return message;
+  },
+};
+
+function createBaseQueryDataEnvelope(): QueryDataEnvelope {
+  return { snapshot: undefined, update: undefined };
+}
+
+export const QueryDataEnvelope: MessageFns<QueryDataEnvelope> = {
+  encode(message: QueryDataEnvelope, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
     if (message.snapshot !== undefined) {
-      MetricAnalyticsSnapshot.encode(message.snapshot, writer.uint32(10).fork()).join();
+      QuerySnapshot.encode(message.snapshot, writer.uint32(10).fork()).join();
     }
-    if (message.bucketUpdate !== undefined) {
-      MetricSeriesBucketUpdate.encode(message.bucketUpdate, writer.uint32(18).fork()).join();
+    if (message.update !== undefined) {
+      QuerySeriesUpdate.encode(message.update, writer.uint32(18).fork()).join();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricAnalyticsEnvelope {
+  decode(input: BinaryReader | Uint8Array, length?: number): QueryDataEnvelope {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricAnalyticsEnvelope();
+    const message = createBaseQueryDataEnvelope();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1510,7 +1893,7 @@ export const MetricAnalyticsEnvelope: MessageFns<MetricAnalyticsEnvelope> = {
             break;
           }
 
-          message.snapshot = MetricAnalyticsSnapshot.decode(reader, reader.uint32());
+          message.snapshot = QuerySnapshot.decode(reader, reader.uint32());
           continue;
         }
         case 2: {
@@ -1518,7 +1901,7 @@ export const MetricAnalyticsEnvelope: MessageFns<MetricAnalyticsEnvelope> = {
             break;
           }
 
-          message.bucketUpdate = MetricSeriesBucketUpdate.decode(reader, reader.uint32());
+          message.update = QuerySeriesUpdate.decode(reader, reader.uint32());
           continue;
         }
       }
@@ -1530,64 +1913,53 @@ export const MetricAnalyticsEnvelope: MessageFns<MetricAnalyticsEnvelope> = {
     return message;
   },
 
-  fromJSON(object: any): MetricAnalyticsEnvelope {
+  fromJSON(object: any): QueryDataEnvelope {
     return {
-      snapshot: isSet(object.snapshot) ? MetricAnalyticsSnapshot.fromJSON(object.snapshot) : undefined,
-      bucketUpdate: isSet(object.bucketUpdate)
-        ? MetricSeriesBucketUpdate.fromJSON(object.bucketUpdate)
-        : isSet(object.bucket_update)
-        ? MetricSeriesBucketUpdate.fromJSON(object.bucket_update)
-        : undefined,
+      snapshot: isSet(object.snapshot) ? QuerySnapshot.fromJSON(object.snapshot) : undefined,
+      update: isSet(object.update) ? QuerySeriesUpdate.fromJSON(object.update) : undefined,
     };
   },
 
-  toJSON(message: MetricAnalyticsEnvelope): unknown {
+  toJSON(message: QueryDataEnvelope): unknown {
     const obj: any = {};
     if (message.snapshot !== undefined) {
-      obj.snapshot = MetricAnalyticsSnapshot.toJSON(message.snapshot);
+      obj.snapshot = QuerySnapshot.toJSON(message.snapshot);
     }
-    if (message.bucketUpdate !== undefined) {
-      obj.bucketUpdate = MetricSeriesBucketUpdate.toJSON(message.bucketUpdate);
+    if (message.update !== undefined) {
+      obj.update = QuerySeriesUpdate.toJSON(message.update);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<MetricAnalyticsEnvelope>, I>>(base?: I): MetricAnalyticsEnvelope {
-    return MetricAnalyticsEnvelope.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<QueryDataEnvelope>, I>>(base?: I): QueryDataEnvelope {
+    return QueryDataEnvelope.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<MetricAnalyticsEnvelope>, I>>(object: I): MetricAnalyticsEnvelope {
-    const message = createBaseMetricAnalyticsEnvelope();
+  fromPartial<I extends Exact<DeepPartial<QueryDataEnvelope>, I>>(object: I): QueryDataEnvelope {
+    const message = createBaseQueryDataEnvelope();
     message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
-      ? MetricAnalyticsSnapshot.fromPartial(object.snapshot)
+      ? QuerySnapshot.fromPartial(object.snapshot)
       : undefined;
-    message.bucketUpdate = (object.bucketUpdate !== undefined && object.bucketUpdate !== null)
-      ? MetricSeriesBucketUpdate.fromPartial(object.bucketUpdate)
+    message.update = (object.update !== undefined && object.update !== null)
+      ? QuerySeriesUpdate.fromPartial(object.update)
       : undefined;
     return message;
   },
 };
 
-function createBaseMetricAnalyticsSnapshot(): MetricAnalyticsSnapshot {
-  return {
-    series: [],
-    windowStart: undefined,
-    windowEnd: undefined,
-    bucketSizeMs: 0,
-    expectedBucketCount: 0,
-    unit: "",
-  };
+function createBaseQuerySnapshot(): QuerySnapshot {
+  return { series: [], rangeStart: undefined, rangeEnd: undefined, bucketSizeMs: 0, expectedBucketCount: 0, unit: "" };
 }
 
-export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
-  encode(message: MetricAnalyticsSnapshot, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const QuerySnapshot: MessageFns<QuerySnapshot> = {
+  encode(message: QuerySnapshot, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
     for (const v of message.series) {
       MetricSeries.encode(v!, writer.uint32(10).fork()).join();
     }
-    if (message.windowStart !== undefined) {
-      Timestamp.encode(toTimestamp(message.windowStart), writer.uint32(18).fork()).join();
+    if (message.rangeStart !== undefined) {
+      Timestamp.encode(toTimestamp(message.rangeStart), writer.uint32(18).fork()).join();
     }
-    if (message.windowEnd !== undefined) {
-      Timestamp.encode(toTimestamp(message.windowEnd), writer.uint32(26).fork()).join();
+    if (message.rangeEnd !== undefined) {
+      Timestamp.encode(toTimestamp(message.rangeEnd), writer.uint32(26).fork()).join();
     }
     if (message.bucketSizeMs !== 0) {
       writer.uint32(32).int64(message.bucketSizeMs);
@@ -1601,10 +1973,10 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricAnalyticsSnapshot {
+  decode(input: BinaryReader | Uint8Array, length?: number): QuerySnapshot {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricAnalyticsSnapshot();
+    const message = createBaseQuerySnapshot();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1621,7 +1993,7 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
             break;
           }
 
-          message.windowStart = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          message.rangeStart = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 3: {
@@ -1629,7 +2001,7 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
             break;
           }
 
-          message.windowEnd = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          message.rangeEnd = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 4: {
@@ -1665,18 +2037,18 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
     return message;
   },
 
-  fromJSON(object: any): MetricAnalyticsSnapshot {
+  fromJSON(object: any): QuerySnapshot {
     return {
       series: globalThis.Array.isArray(object?.series) ? object.series.map((e: any) => MetricSeries.fromJSON(e)) : [],
-      windowStart: isSet(object.windowStart)
-        ? fromJsonTimestamp(object.windowStart)
-        : isSet(object.window_start)
-        ? fromJsonTimestamp(object.window_start)
+      rangeStart: isSet(object.rangeStart)
+        ? fromJsonTimestamp(object.rangeStart)
+        : isSet(object.range_start)
+        ? fromJsonTimestamp(object.range_start)
         : undefined,
-      windowEnd: isSet(object.windowEnd)
-        ? fromJsonTimestamp(object.windowEnd)
-        : isSet(object.window_end)
-        ? fromJsonTimestamp(object.window_end)
+      rangeEnd: isSet(object.rangeEnd)
+        ? fromJsonTimestamp(object.rangeEnd)
+        : isSet(object.range_end)
+        ? fromJsonTimestamp(object.range_end)
         : undefined,
       bucketSizeMs: isSet(object.bucketSizeMs)
         ? globalThis.Number(object.bucketSizeMs)
@@ -1692,16 +2064,16 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
     };
   },
 
-  toJSON(message: MetricAnalyticsSnapshot): unknown {
+  toJSON(message: QuerySnapshot): unknown {
     const obj: any = {};
     if (message.series?.length) {
       obj.series = message.series.map((e) => MetricSeries.toJSON(e));
     }
-    if (message.windowStart !== undefined) {
-      obj.windowStart = message.windowStart.toISOString();
+    if (message.rangeStart !== undefined) {
+      obj.rangeStart = message.rangeStart.toISOString();
     }
-    if (message.windowEnd !== undefined) {
-      obj.windowEnd = message.windowEnd.toISOString();
+    if (message.rangeEnd !== undefined) {
+      obj.rangeEnd = message.rangeEnd.toISOString();
     }
     if (message.bucketSizeMs !== 0) {
       obj.bucketSizeMs = Math.round(message.bucketSizeMs);
@@ -1715,14 +2087,14 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<MetricAnalyticsSnapshot>, I>>(base?: I): MetricAnalyticsSnapshot {
-    return MetricAnalyticsSnapshot.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<QuerySnapshot>, I>>(base?: I): QuerySnapshot {
+    return QuerySnapshot.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<MetricAnalyticsSnapshot>, I>>(object: I): MetricAnalyticsSnapshot {
-    const message = createBaseMetricAnalyticsSnapshot();
+  fromPartial<I extends Exact<DeepPartial<QuerySnapshot>, I>>(object: I): QuerySnapshot {
+    const message = createBaseQuerySnapshot();
     message.series = object.series?.map((e) => MetricSeries.fromPartial(e)) || [];
-    message.windowStart = object.windowStart ?? undefined;
-    message.windowEnd = object.windowEnd ?? undefined;
+    message.rangeStart = object.rangeStart ?? undefined;
+    message.rangeEnd = object.rangeEnd ?? undefined;
     message.bucketSizeMs = object.bucketSizeMs ?? 0;
     message.expectedBucketCount = object.expectedBucketCount ?? 0;
     message.unit = object.unit ?? "";
@@ -1731,13 +2103,16 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
 };
 
 function createBaseMetricSeries(): MetricSeries {
-  return { buckets: [] };
+  return { groupValues: {}, buckets: [] };
 }
 
 export const MetricSeries: MessageFns<MetricSeries> = {
   encode(message: MetricSeries, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    globalThis.Object.entries(message.groupValues).forEach(([key, value]: [string, string]) => {
+      MetricSeries_GroupValuesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join();
+    });
     for (const v of message.buckets) {
-      MetricBucket.encode(v!, writer.uint32(10).fork()).join();
+      MetricBucket.encode(v!, writer.uint32(18).fork()).join();
     }
     return writer;
   },
@@ -1754,6 +2129,17 @@ export const MetricSeries: MessageFns<MetricSeries> = {
             break;
           }
 
+          const entry1 = MetricSeries_GroupValuesEntry.decode(reader, reader.uint32());
+          if (entry1.value !== undefined) {
+            message.groupValues[entry1.key] = entry1.value;
+          }
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
           message.buckets.push(MetricBucket.decode(reader, reader.uint32()));
           continue;
         }
@@ -1768,6 +2154,23 @@ export const MetricSeries: MessageFns<MetricSeries> = {
 
   fromJSON(object: any): MetricSeries {
     return {
+      groupValues: isObject(object.groupValues)
+        ? (globalThis.Object.entries(object.groupValues) as [string, any][]).reduce(
+          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
+            acc[key] = globalThis.String(value);
+            return acc;
+          },
+          {},
+        )
+        : isObject(object.group_values)
+        ? (globalThis.Object.entries(object.group_values) as [string, any][]).reduce(
+          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
+            acc[key] = globalThis.String(value);
+            return acc;
+          },
+          {},
+        )
+        : {},
       buckets: globalThis.Array.isArray(object?.buckets)
         ? object.buckets.map((e: any) => MetricBucket.fromJSON(e))
         : [],
@@ -1776,6 +2179,15 @@ export const MetricSeries: MessageFns<MetricSeries> = {
 
   toJSON(message: MetricSeries): unknown {
     const obj: any = {};
+    if (message.groupValues) {
+      const entries = globalThis.Object.entries(message.groupValues) as [string, string][];
+      if (entries.length > 0) {
+        obj.groupValues = {};
+        entries.forEach(([k, v]) => {
+          obj.groupValues[k] = v;
+        });
+      }
+    }
     if (message.buckets?.length) {
       obj.buckets = message.buckets.map((e) => MetricBucket.toJSON(e));
     }
@@ -1787,11 +2199,98 @@ export const MetricSeries: MessageFns<MetricSeries> = {
   },
   fromPartial<I extends Exact<DeepPartial<MetricSeries>, I>>(object: I): MetricSeries {
     const message = createBaseMetricSeries();
+    message.groupValues = (globalThis.Object.entries(object.groupValues ?? {}) as [string, string][]).reduce(
+      (acc: { [key: string]: string }, [key, value]: [string, string]) => {
+        if (value !== undefined) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {},
+    );
     message.buckets = object.buckets?.map((e) => MetricBucket.fromPartial(e)) || [];
     return message;
   },
 };
 
+function createBaseMetricSeries_GroupValuesEntry(): MetricSeries_GroupValuesEntry {
+  return { key: "", value: "" };
+}
+
+export const MetricSeries_GroupValuesEntry: MessageFns<MetricSeries_GroupValuesEntry> = {
+  encode(message: MetricSeries_GroupValuesEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricSeries_GroupValuesEntry {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseMetricSeries_GroupValuesEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): MetricSeries_GroupValuesEntry {
+    return {
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      value: isSet(object.value) ? globalThis.String(object.value) : "",
+    };
+  },
+
+  toJSON(message: MetricSeries_GroupValuesEntry): unknown {
+    const obj: any = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<MetricSeries_GroupValuesEntry>, I>>(base?: I): MetricSeries_GroupValuesEntry {
+    return MetricSeries_GroupValuesEntry.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<MetricSeries_GroupValuesEntry>, I>>(
+    object: I,
+  ): MetricSeries_GroupValuesEntry {
+    const message = createBaseMetricSeries_GroupValuesEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  },
+};
+
 function createBaseMetricBucket(): MetricBucket {
   return { bucketStart: undefined, value: 0 };
 }
@@ -1872,25 +2371,28 @@ export const MetricBucket: MessageFns<MetricBucket> = {
   },
 };
 
-function createBaseMetricSeriesBucketUpdate(): MetricSeriesBucketUpdate {
-  return { bucket: undefined, generatedAt: undefined };
+function createBaseQuerySeriesUpdate(): QuerySeriesUpdate {
+  return { groupValues: {}, bucket: undefined, generatedAt: undefined };
 }
 
-export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
-  encode(message: MetricSeriesBucketUpdate, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const QuerySeriesUpdate: MessageFns<QuerySeriesUpdate> = {
+  encode(message: QuerySeriesUpdate, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    globalThis.Object.entries(message.groupValues).forEach(([key, value]: [string, string]) => {
+      QuerySeriesUpdate_GroupValuesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join();
+    });
     if (message.bucket !== undefined) {
-      MetricBucket.encode(message.bucket, writer.uint32(10).fork()).join();
+      MetricBucket.encode(message.bucket, writer.uint32(18).fork()).join();
     }
     if (message.generatedAt !== undefined) {
-      Timestamp.encode(toTimestamp(message.generatedAt), writer.uint32(18).fork()).join();
+      Timestamp.encode(toTimestamp(message.generatedAt), writer.uint32(26).fork()).join();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricSeriesBucketUpdate {
+  decode(input: BinaryReader | Uint8Array, length?: number): QuerySeriesUpdate {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricSeriesBucketUpdate();
+    const message = createBaseQuerySeriesUpdate();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1899,7 +2401,10 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
             break;
           }
 
-          message.bucket = MetricBucket.decode(reader, reader.uint32());
+          const entry1 = QuerySeriesUpdate_GroupValuesEntry.decode(reader, reader.uint32());
+          if (entry1.value !== undefined) {
+            message.groupValues[entry1.key] = entry1.value;
+          }
           continue;
         }
         case 2: {
@@ -1907,6 +2412,14 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
             break;
           }
 
+          message.bucket = MetricBucket.decode(reader, reader.uint32());
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
           message.generatedAt = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
@@ -1919,8 +2432,25 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
     return message;
   },
 
-  fromJSON(object: any): MetricSeriesBucketUpdate {
+  fromJSON(object: any): QuerySeriesUpdate {
     return {
+      groupValues: isObject(object.groupValues)
+        ? (globalThis.Object.entries(object.groupValues) as [string, any][]).reduce(
+          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
+            acc[key] = globalThis.String(value);
+            return acc;
+          },
+          {},
+        )
+        : isObject(object.group_values)
+        ? (globalThis.Object.entries(object.group_values) as [string, any][]).reduce(
+          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
+            acc[key] = globalThis.String(value);
+            return acc;
+          },
+          {},
+        )
+        : {},
       bucket: isSet(object.bucket) ? MetricBucket.fromJSON(object.bucket) : undefined,
       generatedAt: isSet(object.generatedAt)
         ? fromJsonTimestamp(object.generatedAt)
@@ -1930,8 +2460,17 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
     };
   },
 
-  toJSON(message: MetricSeriesBucketUpdate): unknown {
+  toJSON(message: QuerySeriesUpdate): unknown {
     const obj: any = {};
+    if (message.groupValues) {
+      const entries = globalThis.Object.entries(message.groupValues) as [string, string][];
+      if (entries.length > 0) {
+        obj.groupValues = {};
+        entries.forEach(([k, v]) => {
+          obj.groupValues[k] = v;
+        });
+      }
+    }
     if (message.bucket !== undefined) {
       obj.bucket = MetricBucket.toJSON(message.bucket);
     }
@@ -1941,11 +2480,20 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<MetricSeriesBucketUpdate>, I>>(base?: I): MetricSeriesBucketUpdate {
-    return MetricSeriesBucketUpdate.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<QuerySeriesUpdate>, I>>(base?: I): QuerySeriesUpdate {
+    return QuerySeriesUpdate.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<MetricSeriesBucketUpdate>, I>>(object: I): MetricSeriesBucketUpdate {
-    const message = createBaseMetricSeriesBucketUpdate();
+  fromPartial<I extends Exact<DeepPartial<QuerySeriesUpdate>, I>>(object: I): QuerySeriesUpdate {
+    const message = createBaseQuerySeriesUpdate();
+    message.groupValues = (globalThis.Object.entries(object.groupValues ?? {}) as [string, string][]).reduce(
+      (acc: { [key: string]: string }, [key, value]: [string, string]) => {
+        if (value !== undefined) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {},
+    );
     message.bucket = (object.bucket !== undefined && object.bucket !== null)
       ? MetricBucket.fromPartial(object.bucket)
       : undefined;
@@ -1954,34 +2502,119 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
   },
 };
 
+function createBaseQuerySeriesUpdate_GroupValuesEntry(): QuerySeriesUpdate_GroupValuesEntry {
+  return { key: "", value: "" };
+}
+
+export const QuerySeriesUpdate_GroupValuesEntry: MessageFns<QuerySeriesUpdate_GroupValuesEntry> = {
+  encode(message: QuerySeriesUpdate_GroupValuesEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): QuerySeriesUpdate_GroupValuesEntry {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQuerySeriesUpdate_GroupValuesEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QuerySeriesUpdate_GroupValuesEntry {
+    return {
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      value: isSet(object.value) ? globalThis.String(object.value) : "",
+    };
+  },
+
+  toJSON(message: QuerySeriesUpdate_GroupValuesEntry): unknown {
+    const obj: any = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QuerySeriesUpdate_GroupValuesEntry>, I>>(
+    base?: I,
+  ): QuerySeriesUpdate_GroupValuesEntry {
+    return QuerySeriesUpdate_GroupValuesEntry.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QuerySeriesUpdate_GroupValuesEntry>, I>>(
+    object: I,
+  ): QuerySeriesUpdate_GroupValuesEntry {
+    const message = createBaseQuerySeriesUpdate_GroupValuesEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  },
+};
+
 /**
- * TelemetryGatewayService is the web surface of telemetry.api.v1 — the types
+ * MetricGatewayService is the web surface of telemetry.api.v1 MetricService — the types
  * are domain-isolated copies converted in gateways/internal/convert. Every RPC
- * is a server stream (snapshot first, then live updates), split by metric kind.
+ * is a server stream: snapshot first, then live updates.
+ *
+ * StreamQuery executes one MetricQuery — the same message a dashboard widget
+ * stores (dashboard_gateway.proto) — so the metrics explorer, the widget
+ * editor preview, and a saved dashboard all run through one query path.
  */
-export interface TelemetryGatewayService {
+export interface MetricGatewayService {
   StreamMetrics(request: StreamMetricsRequest, metadata?: Metadata): Observable<MetricCatalogEnvelope>;
   StreamMetricAttributes(
     request: StreamMetricAttributesRequest,
     metadata?: Metadata,
   ): Observable<MetricAttributeEnvelope>;
-  StreamGaugeAnalytics(request: GaugeQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope>;
-  StreamSumAnalytics(request: SumQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope>;
-  StreamHistogramAnalytics(request: HistogramQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope>;
+  /**
+   * Ad-hoc query execution: snapshot, then live bucket updates while the
+   * stream stays open (relative ranges only; absolute ranges complete after
+   * the snapshot). Query failures abort the stream with a gRPC status.
+   */
+  StreamQuery(request: StreamQueryRequest, metadata?: Metadata): Observable<QueryDataEnvelope>;
 }
 
-export const TelemetryGatewayServiceServiceName = "gateway.web.v1.TelemetryGatewayService";
-export class TelemetryGatewayServiceClientImpl implements TelemetryGatewayService {
+export const MetricGatewayServiceServiceName = "gateway.web.v1.MetricGatewayService";
+export class MetricGatewayServiceClientImpl implements MetricGatewayService {
   private readonly rpc: Rpc;
   private readonly service: string;
   constructor(rpc: Rpc, opts?: { service?: string }) {
-    this.service = opts?.service || TelemetryGatewayServiceServiceName;
+    this.service = opts?.service || MetricGatewayServiceServiceName;
     this.rpc = rpc;
     this.StreamMetrics = this.StreamMetrics.bind(this);
     this.StreamMetricAttributes = this.StreamMetricAttributes.bind(this);
-    this.StreamGaugeAnalytics = this.StreamGaugeAnalytics.bind(this);
-    this.StreamSumAnalytics = this.StreamSumAnalytics.bind(this);
-    this.StreamHistogramAnalytics = this.StreamHistogramAnalytics.bind(this);
+    this.StreamQuery = this.StreamQuery.bind(this);
   }
   StreamMetrics(request: StreamMetricsRequest, metadata?: Metadata): Observable<MetricCatalogEnvelope> {
     const data = StreamMetricsRequest.encode(request).finish();
@@ -1998,22 +2631,10 @@ export class TelemetryGatewayServiceClientImpl implements TelemetryGatewayServic
     return result.pipe(map((data) => MetricAttributeEnvelope.decode(new BinaryReader(data))));
   }
 
-  StreamGaugeAnalytics(request: GaugeQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope> {
-    const data = GaugeQueryRequest.encode(request).finish();
-    const result = this.rpc.serverStreamingRequest(this.service, "StreamGaugeAnalytics", data, metadata);
-    return result.pipe(map((data) => MetricAnalyticsEnvelope.decode(new BinaryReader(data))));
-  }
-
-  StreamSumAnalytics(request: SumQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope> {
-    const data = SumQueryRequest.encode(request).finish();
-    const result = this.rpc.serverStreamingRequest(this.service, "StreamSumAnalytics", data, metadata);
-    return result.pipe(map((data) => MetricAnalyticsEnvelope.decode(new BinaryReader(data))));
-  }
-
-  StreamHistogramAnalytics(request: HistogramQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope> {
-    const data = HistogramQueryRequest.encode(request).finish();
-    const result = this.rpc.serverStreamingRequest(this.service, "StreamHistogramAnalytics", data, metadata);
-    return result.pipe(map((data) => MetricAnalyticsEnvelope.decode(new BinaryReader(data))));
+  StreamQuery(request: StreamQueryRequest, metadata?: Metadata): Observable<QueryDataEnvelope> {
+    const data = StreamQueryRequest.encode(request).finish();
+    const result = this.rpc.serverStreamingRequest(this.service, "StreamQuery", data, metadata);
+    return result.pipe(map((data) => QueryDataEnvelope.decode(new BinaryReader(data))));
   }
 }
 
@@ -2084,6 +2705,10 @@ function longToNumber(int64: { toString(): string }): number {
   return num;
 }
 
+function isObject(value: any): boolean {
+  return typeof value === "object" && value !== null;
+}
+
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }