@miradorlabs/web-grpc 2.23.0 → 2.25.0

package/proto/gateway/web/v1/metric_gateway.ts

@@ -73,290 +73,6 @@ export function metricKindToJSON(object: MetricKind): string {
   }
 }
 
-export enum GaugeAggregation {
-  GAUGE_AGGREGATION_UNSPECIFIED = 0,
-  GAUGE_AGGREGATION_LAST = 1,
-  GAUGE_AGGREGATION_AVG = 2,
-  GAUGE_AGGREGATION_MIN = 3,
-  GAUGE_AGGREGATION_MAX = 4,
-  GAUGE_AGGREGATION_SUM = 5,
-  GAUGE_AGGREGATION_COUNT = 6,
-  UNRECOGNIZED = -1,
-}
-
-export function gaugeAggregationFromJSON(object: any): GaugeAggregation {
-  switch (object) {
-    case 0:
-    case "GAUGE_AGGREGATION_UNSPECIFIED":
-      return GaugeAggregation.GAUGE_AGGREGATION_UNSPECIFIED;
-    case 1:
-    case "GAUGE_AGGREGATION_LAST":
-      return GaugeAggregation.GAUGE_AGGREGATION_LAST;
-    case 2:
-    case "GAUGE_AGGREGATION_AVG":
-      return GaugeAggregation.GAUGE_AGGREGATION_AVG;
-    case 3:
-    case "GAUGE_AGGREGATION_MIN":
-      return GaugeAggregation.GAUGE_AGGREGATION_MIN;
-    case 4:
-    case "GAUGE_AGGREGATION_MAX":
-      return GaugeAggregation.GAUGE_AGGREGATION_MAX;
-    case 5:
-    case "GAUGE_AGGREGATION_SUM":
-      return GaugeAggregation.GAUGE_AGGREGATION_SUM;
-    case 6:
-    case "GAUGE_AGGREGATION_COUNT":
-      return GaugeAggregation.GAUGE_AGGREGATION_COUNT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return GaugeAggregation.UNRECOGNIZED;
-  }
-}
-
-export function gaugeAggregationToJSON(object: GaugeAggregation): string {
-  switch (object) {
-    case GaugeAggregation.GAUGE_AGGREGATION_UNSPECIFIED:
-      return "GAUGE_AGGREGATION_UNSPECIFIED";
-    case GaugeAggregation.GAUGE_AGGREGATION_LAST:
-      return "GAUGE_AGGREGATION_LAST";
-    case GaugeAggregation.GAUGE_AGGREGATION_AVG:
-      return "GAUGE_AGGREGATION_AVG";
-    case GaugeAggregation.GAUGE_AGGREGATION_MIN:
-      return "GAUGE_AGGREGATION_MIN";
-    case GaugeAggregation.GAUGE_AGGREGATION_MAX:
-      return "GAUGE_AGGREGATION_MAX";
-    case GaugeAggregation.GAUGE_AGGREGATION_SUM:
-      return "GAUGE_AGGREGATION_SUM";
-    case GaugeAggregation.GAUGE_AGGREGATION_COUNT:
-      return "GAUGE_AGGREGATION_COUNT";
-    case GaugeAggregation.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-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,
-}
-
-export function sumAggregationFromJSON(object: any): SumAggregation {
-  switch (object) {
-    case 0:
-    case "SUM_AGGREGATION_UNSPECIFIED":
-      return SumAggregation.SUM_AGGREGATION_UNSPECIFIED;
-    case 1:
-    case "SUM_AGGREGATION_RATE":
-      return SumAggregation.SUM_AGGREGATION_RATE;
-    case 2:
-    case "SUM_AGGREGATION_INCREASE":
-      return SumAggregation.SUM_AGGREGATION_INCREASE;
-    case 3:
-    case "SUM_AGGREGATION_LAST":
-      return SumAggregation.SUM_AGGREGATION_LAST;
-    case 4:
-    case "SUM_AGGREGATION_COUNT":
-      return SumAggregation.SUM_AGGREGATION_COUNT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return SumAggregation.UNRECOGNIZED;
-  }
-}
-
-export function sumAggregationToJSON(object: SumAggregation): string {
-  switch (object) {
-    case SumAggregation.SUM_AGGREGATION_UNSPECIFIED:
-      return "SUM_AGGREGATION_UNSPECIFIED";
-    case SumAggregation.SUM_AGGREGATION_RATE:
-      return "SUM_AGGREGATION_RATE";
-    case SumAggregation.SUM_AGGREGATION_INCREASE:
-      return "SUM_AGGREGATION_INCREASE";
-    case SumAggregation.SUM_AGGREGATION_LAST:
-      return "SUM_AGGREGATION_LAST";
-    case SumAggregation.SUM_AGGREGATION_COUNT:
-      return "SUM_AGGREGATION_COUNT";
-    case SumAggregation.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-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,
-  HISTOGRAM_AGGREGATION_MAX = 4,
-  HISTOGRAM_AGGREGATION_COUNT = 5,
-  UNRECOGNIZED = -1,
-}
-
-export function histogramAggregationFromJSON(object: any): HistogramAggregation {
-  switch (object) {
-    case 0:
-    case "HISTOGRAM_AGGREGATION_UNSPECIFIED":
-      return HistogramAggregation.HISTOGRAM_AGGREGATION_UNSPECIFIED;
-    case 1:
-    case "HISTOGRAM_AGGREGATION_QUANTILE":
-      return HistogramAggregation.HISTOGRAM_AGGREGATION_QUANTILE;
-    case 2:
-    case "HISTOGRAM_AGGREGATION_AVG":
-      return HistogramAggregation.HISTOGRAM_AGGREGATION_AVG;
-    case 3:
-    case "HISTOGRAM_AGGREGATION_MIN":
-      return HistogramAggregation.HISTOGRAM_AGGREGATION_MIN;
-    case 4:
-    case "HISTOGRAM_AGGREGATION_MAX":
-      return HistogramAggregation.HISTOGRAM_AGGREGATION_MAX;
-    case 5:
-    case "HISTOGRAM_AGGREGATION_COUNT":
-      return HistogramAggregation.HISTOGRAM_AGGREGATION_COUNT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return HistogramAggregation.UNRECOGNIZED;
-  }
-}
-
-export function histogramAggregationToJSON(object: HistogramAggregation): string {
-  switch (object) {
-    case HistogramAggregation.HISTOGRAM_AGGREGATION_UNSPECIFIED:
-      return "HISTOGRAM_AGGREGATION_UNSPECIFIED";
-    case HistogramAggregation.HISTOGRAM_AGGREGATION_QUANTILE:
-      return "HISTOGRAM_AGGREGATION_QUANTILE";
-    case HistogramAggregation.HISTOGRAM_AGGREGATION_AVG:
-      return "HISTOGRAM_AGGREGATION_AVG";
-    case HistogramAggregation.HISTOGRAM_AGGREGATION_MIN:
-      return "HISTOGRAM_AGGREGATION_MIN";
-    case HistogramAggregation.HISTOGRAM_AGGREGATION_MAX:
-      return "HISTOGRAM_AGGREGATION_MAX";
-    case HistogramAggregation.HISTOGRAM_AGGREGATION_COUNT:
-      return "HISTOGRAM_AGGREGATION_COUNT";
-    case HistogramAggregation.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export enum ExponentialHistogramAggregation {
-  EXPONENTIAL_HISTOGRAM_AGGREGATION_UNSPECIFIED = 0,
-  /** EXPONENTIAL_HISTOGRAM_AGGREGATION_QUANTILE - Percentile from exponential buckets; reads ExponentialHistogramQuerySpec.quantile. */
-  EXPONENTIAL_HISTOGRAM_AGGREGATION_QUANTILE = 1,
-  EXPONENTIAL_HISTOGRAM_AGGREGATION_AVG = 2,
-  EXPONENTIAL_HISTOGRAM_AGGREGATION_MIN = 3,
-  EXPONENTIAL_HISTOGRAM_AGGREGATION_MAX = 4,
-  EXPONENTIAL_HISTOGRAM_AGGREGATION_COUNT = 5,
-  UNRECOGNIZED = -1,
-}
-
-export function exponentialHistogramAggregationFromJSON(object: any): ExponentialHistogramAggregation {
-  switch (object) {
-    case 0:
-    case "EXPONENTIAL_HISTOGRAM_AGGREGATION_UNSPECIFIED":
-      return ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_UNSPECIFIED;
-    case 1:
-    case "EXPONENTIAL_HISTOGRAM_AGGREGATION_QUANTILE":
-      return ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_QUANTILE;
-    case 2:
-    case "EXPONENTIAL_HISTOGRAM_AGGREGATION_AVG":
-      return ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_AVG;
-    case 3:
-    case "EXPONENTIAL_HISTOGRAM_AGGREGATION_MIN":
-      return ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_MIN;
-    case 4:
-    case "EXPONENTIAL_HISTOGRAM_AGGREGATION_MAX":
-      return ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_MAX;
-    case 5:
-    case "EXPONENTIAL_HISTOGRAM_AGGREGATION_COUNT":
-      return ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_COUNT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return ExponentialHistogramAggregation.UNRECOGNIZED;
-  }
-}
-
-export function exponentialHistogramAggregationToJSON(object: ExponentialHistogramAggregation): string {
-  switch (object) {
-    case ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_UNSPECIFIED:
-      return "EXPONENTIAL_HISTOGRAM_AGGREGATION_UNSPECIFIED";
-    case ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_QUANTILE:
-      return "EXPONENTIAL_HISTOGRAM_AGGREGATION_QUANTILE";
-    case ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_AVG:
-      return "EXPONENTIAL_HISTOGRAM_AGGREGATION_AVG";
-    case ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_MIN:
-      return "EXPONENTIAL_HISTOGRAM_AGGREGATION_MIN";
-    case ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_MAX:
-      return "EXPONENTIAL_HISTOGRAM_AGGREGATION_MAX";
-    case ExponentialHistogramAggregation.EXPONENTIAL_HISTOGRAM_AGGREGATION_COUNT:
-      return "EXPONENTIAL_HISTOGRAM_AGGREGATION_COUNT";
-    case ExponentialHistogramAggregation.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-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 enum WidgetType {
   WIDGET_TYPE_UNSPECIFIED = 0,
   /** WIDGET_TYPE_TIMESERIES - Bucketed series over the range. */
@@ -516,7 +232,11 @@ export interface StreamQueryRequest {
   /** Verified against the caller's identity before proxying. */
   organizationId: string;
   projectId: string;
-  query: MetricQuery | undefined;
+  /**
+   * PromQL expression. A bucketed time_interval range-queries it (timeseries);
+   * WHOLE_RANGE evaluates it instantly at the range end (stat/pie/table).
+   */
+  promql: string;
   timeRange:
     | TimeRange
     | undefined;
@@ -527,60 +247,6 @@ export interface StreamQueryRequest {
   timeInterval: AnalyticsTimeInterval;
 }
 
-/**
- * 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;
-  exponentialHistogram?:
-    | ExponentialHistogramQuerySpec
-    | 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;
-}
-
-export interface HistogramQuerySpec {
-  aggregation: HistogramAggregation;
-  /** Quantile level in (0,1); required iff aggregation == QUANTILE. */
-  quantile: number;
-}
-
-export interface ExponentialHistogramQuerySpec {
-  aggregation: ExponentialHistogramAggregation;
-  /** Quantile level in (0,1); required iff aggregation == QUANTILE. */
-  quantile: number;
-}
-
-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?:
@@ -665,6 +331,18 @@ export interface Dashboard {
   updatedAt: Date | undefined;
 }
 
+/**
+ * WidgetQuery is one query in a widget. Today the only query language is PromQL
+ * (the native `histogram_quantile(q, rate(m[w]))` and classic
+ * `histogram_quantile(q, sum by (le)(rate(m_bucket[w])))` histogram idioms are
+ * the same language — the metric store serves both series shapes). The oneof
+ * leaves room for other query types (a structured builder, log/trace queries)
+ * without reshaping the widget.
+ */
+export interface WidgetQuery {
+  promql?: string | undefined;
+}
+
 export interface Widget {
   /**
    * Client-generated, [A-Za-z0-9_-]{1,64}, unique within the dashboard — the
@@ -677,11 +355,13 @@ export interface Widget {
     | GridPos
     | undefined;
   /**
-   * Data queries. TIMESERIES 1-4 (one plotted series set per query), STAT and
-   * PIE exactly 1, TABLE 1-4 (one column per query), MARKDOWN none.
-   * STAT, PIE, and TABLE queries run with a single whole-range bucket.
+   * Queries. TIMESERIES 1-4 (one plotted series set per query, evaluated as a
+   * range query over the effective window), STAT and PIE exactly 1, TABLE 1-4
+   * (one column per query). MARKDOWN none. STAT/PIE/TABLE evaluate the query
+   * instantly at the range end (write range aggregation into the PromQL, e.g.
+   * sum(rate(m[1h]))).
    */
-  queries: MetricQuery[];
+  queries: WidgetQuery[];
   /** UNSPECIFIED = follow the view (stream override or dashboard default). */
   timeWindow: AnalyticsTimeWindow;
   /** UNSPECIFIED = server-derived from the effective range. TIMESERIES only. */
@@ -1212,689 +892,75 @@ export const StreamMetricAttributesRequest: MessageFns<StreamMetricAttributesReq
       metricName: isSet(object.metricName)
         ? globalThis.String(object.metricName)
         : isSet(object.metric_name)
-        ? globalThis.String(object.metric_name)
-        : "",
-    };
-  },
-
-  toJSON(message: StreamMetricAttributesRequest): 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;
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<StreamMetricAttributesRequest>, I>>(base?: I): StreamMetricAttributesRequest {
-    return StreamMetricAttributesRequest.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<StreamMetricAttributesRequest>, I>>(
-    object: I,
-  ): StreamMetricAttributesRequest {
-    const message = createBaseStreamMetricAttributesRequest();
-    message.organizationId = object.organizationId ?? "";
-    message.projectId = object.projectId ?? "";
-    message.metricName = object.metricName ?? "";
-    return message;
-  },
-};
-
-function createBaseMetricAttributeEnvelope(): MetricAttributeEnvelope {
-  return { snapshot: undefined, added: undefined };
-}
-
-export const MetricAttributeEnvelope: MessageFns<MetricAttributeEnvelope> = {
-  encode(message: MetricAttributeEnvelope, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.snapshot !== undefined) {
-      MetricAttributeSnapshot.encode(message.snapshot, writer.uint32(10).fork()).join();
-    }
-    if (message.added !== undefined) {
-      MetricAttribute.encode(message.added, writer.uint32(18).fork()).join();
-    }
-    return writer;
-  },
-
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricAttributeEnvelope {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricAttributeEnvelope();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-
-          message.snapshot = MetricAttributeSnapshot.decode(reader, reader.uint32());
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-
-          message.added = MetricAttribute.decode(reader, reader.uint32());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): MetricAttributeEnvelope {
-    return {
-      snapshot: isSet(object.snapshot) ? MetricAttributeSnapshot.fromJSON(object.snapshot) : undefined,
-      added: isSet(object.added) ? MetricAttribute.fromJSON(object.added) : undefined,
-    };
-  },
-
-  toJSON(message: MetricAttributeEnvelope): unknown {
-    const obj: any = {};
-    if (message.snapshot !== undefined) {
-      obj.snapshot = MetricAttributeSnapshot.toJSON(message.snapshot);
-    }
-    if (message.added !== undefined) {
-      obj.added = MetricAttribute.toJSON(message.added);
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<MetricAttributeEnvelope>, I>>(base?: I): MetricAttributeEnvelope {
-    return MetricAttributeEnvelope.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricAttributeEnvelope>, I>>(object: I): MetricAttributeEnvelope {
-    const message = createBaseMetricAttributeEnvelope();
-    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
-      ? MetricAttributeSnapshot.fromPartial(object.snapshot)
-      : undefined;
-    message.added = (object.added !== undefined && object.added !== null)
-      ? MetricAttribute.fromPartial(object.added)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseMetricAttributeSnapshot(): MetricAttributeSnapshot {
-  return { attributes: [] };
-}
-
-export const MetricAttributeSnapshot: MessageFns<MetricAttributeSnapshot> = {
-  encode(message: MetricAttributeSnapshot, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    for (const v of message.attributes) {
-      MetricAttribute.encode(v!, writer.uint32(10).fork()).join();
-    }
-    return writer;
-  },
-
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricAttributeSnapshot {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricAttributeSnapshot();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-
-          message.attributes.push(MetricAttribute.decode(reader, reader.uint32()));
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): MetricAttributeSnapshot {
-    return {
-      attributes: globalThis.Array.isArray(object?.attributes)
-        ? object.attributes.map((e: any) => MetricAttribute.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: MetricAttributeSnapshot): unknown {
-    const obj: any = {};
-    if (message.attributes?.length) {
-      obj.attributes = message.attributes.map((e) => MetricAttribute.toJSON(e));
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<MetricAttributeSnapshot>, I>>(base?: I): MetricAttributeSnapshot {
-    return MetricAttributeSnapshot.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricAttributeSnapshot>, I>>(object: I): MetricAttributeSnapshot {
-    const message = createBaseMetricAttributeSnapshot();
-    message.attributes = object.attributes?.map((e) => MetricAttribute.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseMetricAttribute(): MetricAttribute {
-  return { key: "", values: [] };
-}
-
-export const MetricAttribute: MessageFns<MetricAttribute> = {
-  encode(message: MetricAttribute, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.key !== "") {
-      writer.uint32(10).string(message.key);
-    }
-    for (const v of message.values) {
-      writer.uint32(18).string(v!);
-    }
-    return writer;
-  },
-
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricAttribute {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricAttribute();
-    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.values.push(reader.string());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): MetricAttribute {
-    return {
-      key: isSet(object.key) ? globalThis.String(object.key) : "",
-      values: globalThis.Array.isArray(object?.values) ? object.values.map((e: any) => globalThis.String(e)) : [],
-    };
-  },
-
-  toJSON(message: MetricAttribute): unknown {
-    const obj: any = {};
-    if (message.key !== "") {
-      obj.key = message.key;
-    }
-    if (message.values?.length) {
-      obj.values = message.values;
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<MetricAttribute>, I>>(base?: I): MetricAttribute {
-    return MetricAttribute.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricAttribute>, I>>(object: I): MetricAttribute {
-    const message = createBaseMetricAttribute();
-    message.key = object.key ?? "";
-    message.values = object.values?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseStreamQueryRequest(): StreamQueryRequest {
-  return { organizationId: "", projectId: "", query: undefined, timeRange: undefined, timeInterval: 0 };
-}
-
-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.query !== undefined) {
-      MetricQuery.encode(message.query, writer.uint32(26).fork()).join();
-    }
-    if (message.timeRange !== undefined) {
-      TimeRange.encode(message.timeRange, writer.uint32(34).fork()).join();
-    }
-    if (message.timeInterval !== 0) {
-      writer.uint32(40).int32(message.timeInterval);
-    }
-    return writer;
-  },
-
-  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 = createBaseStreamQueryRequest();
-    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.query = MetricQuery.decode(reader, reader.uint32());
-          continue;
-        }
-        case 4: {
-          if (tag !== 34) {
-            break;
-          }
-
-          message.timeRange = TimeRange.decode(reader, reader.uint32());
-          continue;
-        }
-        case 5: {
-          if (tag !== 40) {
-            break;
-          }
-
-          message.timeInterval = reader.int32() as any;
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): StreamQueryRequest {
-    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)
-        : "",
-      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)
-        ? analyticsTimeIntervalFromJSON(object.time_interval)
-        : 0,
-    };
-  },
-
-  toJSON(message: StreamQueryRequest): unknown {
-    const obj: any = {};
-    if (message.organizationId !== "") {
-      obj.organizationId = message.organizationId;
-    }
-    if (message.projectId !== "") {
-      obj.projectId = message.projectId;
-    }
-    if (message.query !== undefined) {
-      obj.query = MetricQuery.toJSON(message.query);
-    }
-    if (message.timeRange !== undefined) {
-      obj.timeRange = TimeRange.toJSON(message.timeRange);
-    }
-    if (message.timeInterval !== 0) {
-      obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<StreamQueryRequest>, I>>(base?: I): StreamQueryRequest {
-    return StreamQueryRequest.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<StreamQueryRequest>, I>>(object: I): StreamQueryRequest {
-    const message = createBaseStreamQueryRequest();
-    message.organizationId = object.organizationId ?? "";
-    message.projectId = object.projectId ?? "";
-    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 createBaseMetricQuery(): MetricQuery {
-  return {
-    metricName: "",
-    gauge: undefined,
-    sum: undefined,
-    histogram: undefined,
-    exponentialHistogram: undefined,
-    filters: [],
-    groupBy: [],
-    groupLimit: 0,
-  };
-}
-
-export const MetricQuery: MessageFns<MetricQuery> = {
-  encode(message: MetricQuery, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.metricName !== "") {
-      writer.uint32(10).string(message.metricName);
-    }
-    if (message.gauge !== undefined) {
-      GaugeQuerySpec.encode(message.gauge, writer.uint32(18).fork()).join();
-    }
-    if (message.sum !== undefined) {
-      SumQuerySpec.encode(message.sum, writer.uint32(26).fork()).join();
-    }
-    if (message.histogram !== undefined) {
-      HistogramQuerySpec.encode(message.histogram, writer.uint32(34).fork()).join();
-    }
-    if (message.exponentialHistogram !== undefined) {
-      ExponentialHistogramQuerySpec.encode(message.exponentialHistogram, writer.uint32(66).fork()).join();
-    }
-    for (const v of message.filters) {
-      AttributeFilter.encode(v!, writer.uint32(42).fork()).join();
-    }
-    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): MetricQuery {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricQuery();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-
-          message.metricName = reader.string();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-
-          message.gauge = GaugeQuerySpec.decode(reader, reader.uint32());
-          continue;
-        }
-        case 3: {
-          if (tag !== 26) {
-            break;
-          }
-
-          message.sum = SumQuerySpec.decode(reader, reader.uint32());
-          continue;
-        }
-        case 4: {
-          if (tag !== 34) {
-            break;
-          }
-
-          message.histogram = HistogramQuerySpec.decode(reader, reader.uint32());
-          continue;
-        }
-        case 8: {
-          if (tag !== 66) {
-            break;
-          }
-
-          message.exponentialHistogram = ExponentialHistogramQuerySpec.decode(reader, reader.uint32());
-          continue;
-        }
-        case 5: {
-          if (tag !== 42) {
-            break;
-          }
-
-          message.filters.push(AttributeFilter.decode(reader, reader.uint32()));
-          continue;
-        }
-        case 6: {
-          if (tag !== 50) {
-            break;
-          }
-
-          message.groupBy.push(reader.string());
-          continue;
-        }
-        case 7: {
-          if (tag !== 56) {
-            break;
-          }
-
-          message.groupLimit = reader.int32();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): MetricQuery {
-    return {
-      metricName: isSet(object.metricName)
-        ? globalThis.String(object.metricName)
-        : isSet(object.metric_name)
-        ? globalThis.String(object.metric_name)
-        : "",
-      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,
-      exponentialHistogram: isSet(object.exponentialHistogram)
-        ? ExponentialHistogramQuerySpec.fromJSON(object.exponentialHistogram)
-        : isSet(object.exponential_histogram)
-        ? ExponentialHistogramQuerySpec.fromJSON(object.exponential_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: MetricQuery): unknown {
-    const obj: any = {};
-    if (message.metricName !== "") {
-      obj.metricName = message.metricName;
-    }
-    if (message.gauge !== undefined) {
-      obj.gauge = GaugeQuerySpec.toJSON(message.gauge);
-    }
-    if (message.sum !== undefined) {
-      obj.sum = SumQuerySpec.toJSON(message.sum);
-    }
-    if (message.histogram !== undefined) {
-      obj.histogram = HistogramQuerySpec.toJSON(message.histogram);
-    }
-    if (message.exponentialHistogram !== undefined) {
-      obj.exponentialHistogram = ExponentialHistogramQuerySpec.toJSON(message.exponentialHistogram);
-    }
-    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<MetricQuery>, I>>(base?: I): MetricQuery {
-    return MetricQuery.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricQuery>, I>>(object: I): MetricQuery {
-    const message = createBaseMetricQuery();
-    message.metricName = object.metricName ?? "";
-    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.exponentialHistogram = (object.exponentialHistogram !== undefined && object.exponentialHistogram !== null)
-      ? ExponentialHistogramQuerySpec.fromPartial(object.exponentialHistogram)
-      : 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 createBaseGaugeQuerySpec(): GaugeQuerySpec {
-  return { aggregation: 0 };
-}
-
-export const GaugeQuerySpec: MessageFns<GaugeQuerySpec> = {
-  encode(message: GaugeQuerySpec, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.aggregation !== 0) {
-      writer.uint32(8).int32(message.aggregation);
-    }
-    return writer;
-  },
-
-  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 = createBaseGaugeQuerySpec();
-    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): GaugeQuerySpec {
-    return { aggregation: isSet(object.aggregation) ? gaugeAggregationFromJSON(object.aggregation) : 0 };
+        ? globalThis.String(object.metric_name)
+        : "",
+    };
   },
 
-  toJSON(message: GaugeQuerySpec): unknown {
+  toJSON(message: StreamMetricAttributesRequest): unknown {
     const obj: any = {};
-    if (message.aggregation !== 0) {
-      obj.aggregation = gaugeAggregationToJSON(message.aggregation);
+    if (message.organizationId !== "") {
+      obj.organizationId = message.organizationId;
+    }
+    if (message.projectId !== "") {
+      obj.projectId = message.projectId;
+    }
+    if (message.metricName !== "") {
+      obj.metricName = message.metricName;
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<GaugeQuerySpec>, I>>(base?: I): GaugeQuerySpec {
-    return GaugeQuerySpec.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<StreamMetricAttributesRequest>, I>>(base?: I): StreamMetricAttributesRequest {
+    return StreamMetricAttributesRequest.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<GaugeQuerySpec>, I>>(object: I): GaugeQuerySpec {
-    const message = createBaseGaugeQuerySpec();
-    message.aggregation = object.aggregation ?? 0;
+  fromPartial<I extends Exact<DeepPartial<StreamMetricAttributesRequest>, I>>(
+    object: I,
+  ): StreamMetricAttributesRequest {
+    const message = createBaseStreamMetricAttributesRequest();
+    message.organizationId = object.organizationId ?? "";
+    message.projectId = object.projectId ?? "";
+    message.metricName = object.metricName ?? "";
     return message;
   },
 };
 
-function createBaseSumQuerySpec(): SumQuerySpec {
-  return { aggregation: 0 };
+function createBaseMetricAttributeEnvelope(): MetricAttributeEnvelope {
+  return { snapshot: undefined, added: undefined };
 }
 
-export const SumQuerySpec: MessageFns<SumQuerySpec> = {
-  encode(message: SumQuerySpec, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.aggregation !== 0) {
-      writer.uint32(8).int32(message.aggregation);
+export const MetricAttributeEnvelope: MessageFns<MetricAttributeEnvelope> = {
+  encode(message: MetricAttributeEnvelope, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.snapshot !== undefined) {
+      MetricAttributeSnapshot.encode(message.snapshot, writer.uint32(10).fork()).join();
+    }
+    if (message.added !== undefined) {
+      MetricAttribute.encode(message.added, writer.uint32(18).fork()).join();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): SumQuerySpec {
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricAttributeEnvelope {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseSumQuerySpec();
+    const message = createBaseMetricAttributeEnvelope();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1: {
-          if (tag !== 8) {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.snapshot = MetricAttributeSnapshot.decode(reader, reader.uint32());
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
             break;
           }
 
-          message.aggregation = reader.int32() as any;
+          message.added = MetricAttribute.decode(reader, reader.uint32());
           continue;
         }
       }
@@ -1906,64 +972,64 @@ export const SumQuerySpec: MessageFns<SumQuerySpec> = {
     return message;
   },
 
-  fromJSON(object: any): SumQuerySpec {
-    return { aggregation: isSet(object.aggregation) ? sumAggregationFromJSON(object.aggregation) : 0 };
+  fromJSON(object: any): MetricAttributeEnvelope {
+    return {
+      snapshot: isSet(object.snapshot) ? MetricAttributeSnapshot.fromJSON(object.snapshot) : undefined,
+      added: isSet(object.added) ? MetricAttribute.fromJSON(object.added) : undefined,
+    };
   },
 
-  toJSON(message: SumQuerySpec): unknown {
+  toJSON(message: MetricAttributeEnvelope): unknown {
     const obj: any = {};
-    if (message.aggregation !== 0) {
-      obj.aggregation = sumAggregationToJSON(message.aggregation);
+    if (message.snapshot !== undefined) {
+      obj.snapshot = MetricAttributeSnapshot.toJSON(message.snapshot);
+    }
+    if (message.added !== undefined) {
+      obj.added = MetricAttribute.toJSON(message.added);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<SumQuerySpec>, I>>(base?: I): SumQuerySpec {
-    return SumQuerySpec.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<MetricAttributeEnvelope>, I>>(base?: I): MetricAttributeEnvelope {
+    return MetricAttributeEnvelope.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<SumQuerySpec>, I>>(object: I): SumQuerySpec {
-    const message = createBaseSumQuerySpec();
-    message.aggregation = object.aggregation ?? 0;
+  fromPartial<I extends Exact<DeepPartial<MetricAttributeEnvelope>, I>>(object: I): MetricAttributeEnvelope {
+    const message = createBaseMetricAttributeEnvelope();
+    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
+      ? MetricAttributeSnapshot.fromPartial(object.snapshot)
+      : undefined;
+    message.added = (object.added !== undefined && object.added !== null)
+      ? MetricAttribute.fromPartial(object.added)
+      : undefined;
     return message;
   },
 };
 
-function createBaseHistogramQuerySpec(): HistogramQuerySpec {
-  return { aggregation: 0, quantile: 0 };
+function createBaseMetricAttributeSnapshot(): MetricAttributeSnapshot {
+  return { attributes: [] };
 }
 
-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);
+export const MetricAttributeSnapshot: MessageFns<MetricAttributeSnapshot> = {
+  encode(message: MetricAttributeSnapshot, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    for (const v of message.attributes) {
+      MetricAttribute.encode(v!, writer.uint32(10).fork()).join();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): HistogramQuerySpec {
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricAttributeSnapshot {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseHistogramQuerySpec();
+    const message = createBaseMetricAttributeSnapshot();
     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) {
+          if (tag !== 10) {
             break;
           }
 
-          message.quantile = reader.double();
+          message.attributes.push(MetricAttribute.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -1975,71 +1041,68 @@ export const HistogramQuerySpec: MessageFns<HistogramQuerySpec> = {
     return message;
   },
 
-  fromJSON(object: any): HistogramQuerySpec {
+  fromJSON(object: any): MetricAttributeSnapshot {
     return {
-      aggregation: isSet(object.aggregation) ? histogramAggregationFromJSON(object.aggregation) : 0,
-      quantile: isSet(object.quantile) ? globalThis.Number(object.quantile) : 0,
+      attributes: globalThis.Array.isArray(object?.attributes)
+        ? object.attributes.map((e: any) => MetricAttribute.fromJSON(e))
+        : [],
     };
   },
 
-  toJSON(message: HistogramQuerySpec): unknown {
+  toJSON(message: MetricAttributeSnapshot): unknown {
     const obj: any = {};
-    if (message.aggregation !== 0) {
-      obj.aggregation = histogramAggregationToJSON(message.aggregation);
-    }
-    if (message.quantile !== 0) {
-      obj.quantile = message.quantile;
+    if (message.attributes?.length) {
+      obj.attributes = message.attributes.map((e) => MetricAttribute.toJSON(e));
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<HistogramQuerySpec>, I>>(base?: I): HistogramQuerySpec {
-    return HistogramQuerySpec.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<MetricAttributeSnapshot>, I>>(base?: I): MetricAttributeSnapshot {
+    return MetricAttributeSnapshot.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;
+  fromPartial<I extends Exact<DeepPartial<MetricAttributeSnapshot>, I>>(object: I): MetricAttributeSnapshot {
+    const message = createBaseMetricAttributeSnapshot();
+    message.attributes = object.attributes?.map((e) => MetricAttribute.fromPartial(e)) || [];
     return message;
   },
 };
 
-function createBaseExponentialHistogramQuerySpec(): ExponentialHistogramQuerySpec {
-  return { aggregation: 0, quantile: 0 };
+function createBaseMetricAttribute(): MetricAttribute {
+  return { key: "", values: [] };
 }
 
-export const ExponentialHistogramQuerySpec: MessageFns<ExponentialHistogramQuerySpec> = {
-  encode(message: ExponentialHistogramQuerySpec, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.aggregation !== 0) {
-      writer.uint32(8).int32(message.aggregation);
+export const MetricAttribute: MessageFns<MetricAttribute> = {
+  encode(message: MetricAttribute, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
     }
-    if (message.quantile !== 0) {
-      writer.uint32(17).double(message.quantile);
+    for (const v of message.values) {
+      writer.uint32(18).string(v!);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ExponentialHistogramQuerySpec {
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricAttribute {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseExponentialHistogramQuerySpec();
+    const message = createBaseMetricAttribute();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1: {
-          if (tag !== 8) {
+          if (tag !== 10) {
             break;
           }
 
-          message.aggregation = reader.int32() as any;
+          message.key = reader.string();
           continue;
         }
         case 2: {
-          if (tag !== 17) {
+          if (tag !== 18) {
             break;
           }
 
-          message.quantile = reader.double();
+          message.values.push(reader.string());
           continue;
         }
       }
@@ -2051,59 +1114,63 @@ export const ExponentialHistogramQuerySpec: MessageFns<ExponentialHistogramQuery
     return message;
   },
 
-  fromJSON(object: any): ExponentialHistogramQuerySpec {
+  fromJSON(object: any): MetricAttribute {
     return {
-      aggregation: isSet(object.aggregation) ? exponentialHistogramAggregationFromJSON(object.aggregation) : 0,
-      quantile: isSet(object.quantile) ? globalThis.Number(object.quantile) : 0,
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      values: globalThis.Array.isArray(object?.values) ? object.values.map((e: any) => globalThis.String(e)) : [],
     };
   },
 
-  toJSON(message: ExponentialHistogramQuerySpec): unknown {
+  toJSON(message: MetricAttribute): unknown {
     const obj: any = {};
-    if (message.aggregation !== 0) {
-      obj.aggregation = exponentialHistogramAggregationToJSON(message.aggregation);
+    if (message.key !== "") {
+      obj.key = message.key;
     }
-    if (message.quantile !== 0) {
-      obj.quantile = message.quantile;
+    if (message.values?.length) {
+      obj.values = message.values;
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<ExponentialHistogramQuerySpec>, I>>(base?: I): ExponentialHistogramQuerySpec {
-    return ExponentialHistogramQuerySpec.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<MetricAttribute>, I>>(base?: I): MetricAttribute {
+    return MetricAttribute.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<ExponentialHistogramQuerySpec>, I>>(
-    object: I,
-  ): ExponentialHistogramQuerySpec {
-    const message = createBaseExponentialHistogramQuerySpec();
-    message.aggregation = object.aggregation ?? 0;
-    message.quantile = object.quantile ?? 0;
+  fromPartial<I extends Exact<DeepPartial<MetricAttribute>, I>>(object: I): MetricAttribute {
+    const message = createBaseMetricAttribute();
+    message.key = object.key ?? "";
+    message.values = object.values?.map((e) => e) || [];
     return message;
   },
 };
 
-function createBaseAttributeFilter(): AttributeFilter {
-  return { key: "", op: 0, values: [] };
+function createBaseStreamQueryRequest(): StreamQueryRequest {
+  return { organizationId: "", projectId: "", promql: "", timeRange: undefined, timeInterval: 0 };
 }
 
-export const AttributeFilter: MessageFns<AttributeFilter> = {
-  encode(message: AttributeFilter, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.key !== "") {
-      writer.uint32(10).string(message.key);
+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.op !== 0) {
-      writer.uint32(16).int32(message.op);
+    if (message.promql !== "") {
+      writer.uint32(26).string(message.promql);
     }
-    for (const v of message.values) {
-      writer.uint32(26).string(v!);
+    if (message.timeRange !== undefined) {
+      TimeRange.encode(message.timeRange, writer.uint32(34).fork()).join();
+    }
+    if (message.timeInterval !== 0) {
+      writer.uint32(40).int32(message.timeInterval);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): AttributeFilter {
+  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 = createBaseAttributeFilter();
+    const message = createBaseStreamQueryRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -2112,15 +1179,15 @@ export const AttributeFilter: MessageFns<AttributeFilter> = {
             break;
           }
 
-          message.key = reader.string();
+          message.organizationId = reader.string();
           continue;
         }
         case 2: {
-          if (tag !== 16) {
+          if (tag !== 18) {
             break;
           }
 
-          message.op = reader.int32() as any;
+          message.projectId = reader.string();
           continue;
         }
         case 3: {
@@ -2128,7 +1195,23 @@ export const AttributeFilter: MessageFns<AttributeFilter> = {
             break;
           }
 
-          message.values.push(reader.string());
+          message.promql = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+
+          message.timeRange = TimeRange.decode(reader, reader.uint32());
+          continue;
+        }
+        case 5: {
+          if (tag !== 40) {
+            break;
+          }
+
+          message.timeInterval = reader.int32() as any;
           continue;
         }
       }
@@ -2140,36 +1223,64 @@ export const AttributeFilter: MessageFns<AttributeFilter> = {
     return message;
   },
 
-  fromJSON(object: any): AttributeFilter {
+  fromJSON(object: any): StreamQueryRequest {
     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)) : [],
+      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)
+        : "",
+      promql: isSet(object.promql) ? globalThis.String(object.promql) : "",
+      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)
+        ? analyticsTimeIntervalFromJSON(object.time_interval)
+        : 0,
     };
   },
 
-  toJSON(message: AttributeFilter): unknown {
+  toJSON(message: StreamQueryRequest): unknown {
     const obj: any = {};
-    if (message.key !== "") {
-      obj.key = message.key;
+    if (message.organizationId !== "") {
+      obj.organizationId = message.organizationId;
+    }
+    if (message.projectId !== "") {
+      obj.projectId = message.projectId;
     }
-    if (message.op !== 0) {
-      obj.op = attributeFilterOpToJSON(message.op);
+    if (message.promql !== "") {
+      obj.promql = message.promql;
     }
-    if (message.values?.length) {
-      obj.values = message.values;
+    if (message.timeRange !== undefined) {
+      obj.timeRange = TimeRange.toJSON(message.timeRange);
+    }
+    if (message.timeInterval !== 0) {
+      obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<AttributeFilter>, I>>(base?: I): AttributeFilter {
-    return AttributeFilter.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<AttributeFilter>, I>>(object: I): AttributeFilter {
-    const message = createBaseAttributeFilter();
-    message.key = object.key ?? "";
-    message.op = object.op ?? 0;
-    message.values = object.values?.map((e) => e) || [];
+  fromPartial<I extends Exact<DeepPartial<StreamQueryRequest>, I>>(object: I): StreamQueryRequest {
+    const message = createBaseStreamQueryRequest();
+    message.organizationId = object.organizationId ?? "";
+    message.projectId = object.projectId ?? "";
+    message.promql = object.promql ?? "";
+    message.timeRange = (object.timeRange !== undefined && object.timeRange !== null)
+      ? TimeRange.fromPartial(object.timeRange)
+      : undefined;
+    message.timeInterval = object.timeInterval ?? 0;
     return message;
   },
 };
@@ -3258,6 +2369,64 @@ export const Dashboard: MessageFns<Dashboard> = {
   },
 };
 
+function createBaseWidgetQuery(): WidgetQuery {
+  return { promql: undefined };
+}
+
+export const WidgetQuery: MessageFns<WidgetQuery> = {
+  encode(message: WidgetQuery, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.promql !== undefined) {
+      writer.uint32(10).string(message.promql);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): WidgetQuery {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseWidgetQuery();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.promql = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): WidgetQuery {
+    return { promql: isSet(object.promql) ? globalThis.String(object.promql) : undefined };
+  },
+
+  toJSON(message: WidgetQuery): unknown {
+    const obj: any = {};
+    if (message.promql !== undefined) {
+      obj.promql = message.promql;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<WidgetQuery>, I>>(base?: I): WidgetQuery {
+    return WidgetQuery.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<WidgetQuery>, I>>(object: I): WidgetQuery {
+    const message = createBaseWidgetQuery();
+    message.promql = object.promql ?? undefined;
+    return message;
+  },
+};
+
 function createBaseWidget(): Widget {
   return {
     id: "",
@@ -3287,7 +2456,7 @@ export const Widget: MessageFns<Widget> = {
       GridPos.encode(message.gridPos, writer.uint32(34).fork()).join();
     }
     for (const v of message.queries) {
-      MetricQuery.encode(v!, writer.uint32(42).fork()).join();
+      WidgetQuery.encode(v!, writer.uint32(42).fork()).join();
     }
     if (message.timeWindow !== 0) {
       writer.uint32(48).int32(message.timeWindow);
@@ -3348,7 +2517,7 @@ export const Widget: MessageFns<Widget> = {
             break;
           }
 
-          message.queries.push(MetricQuery.decode(reader, reader.uint32()));
+          message.queries.push(WidgetQuery.decode(reader, reader.uint32()));
           continue;
         }
         case 6: {
@@ -3402,7 +2571,7 @@ export const Widget: MessageFns<Widget> = {
         : isSet(object.grid_pos)
         ? GridPos.fromJSON(object.grid_pos)
         : undefined,
-      queries: globalThis.Array.isArray(object?.queries) ? object.queries.map((e: any) => MetricQuery.fromJSON(e)) : [],
+      queries: globalThis.Array.isArray(object?.queries) ? object.queries.map((e: any) => WidgetQuery.fromJSON(e)) : [],
       timeWindow: isSet(object.timeWindow)
         ? analyticsTimeWindowFromJSON(object.timeWindow)
         : isSet(object.time_window)
@@ -3437,7 +2606,7 @@ export const Widget: MessageFns<Widget> = {
       obj.gridPos = GridPos.toJSON(message.gridPos);
     }
     if (message.queries?.length) {
-      obj.queries = message.queries.map((e) => MetricQuery.toJSON(e));
+      obj.queries = message.queries.map((e) => WidgetQuery.toJSON(e));
     }
     if (message.timeWindow !== 0) {
       obj.timeWindow = analyticsTimeWindowToJSON(message.timeWindow);
@@ -3465,7 +2634,7 @@ export const Widget: MessageFns<Widget> = {
     message.gridPos = (object.gridPos !== undefined && object.gridPos !== null)
       ? GridPos.fromPartial(object.gridPos)
       : undefined;
-    message.queries = object.queries?.map((e) => MetricQuery.fromPartial(e)) || [];
+    message.queries = object.queries?.map((e) => WidgetQuery.fromPartial(e)) || [];
     message.timeWindow = object.timeWindow ?? 0;
     message.timeInterval = object.timeInterval ?? 0;
     message.timeseriesStyle = object.timeseriesStyle ?? 0;
@@ -5105,9 +4274,9 @@ export const WidgetQueryError: MessageFns<WidgetQueryError> = {
  * metric catalog, ad-hoc queries, and Postgres-backed dashboards that compose those
  * queries. Every streaming RPC emits a snapshot first, then live updates.
  *
- * StreamQuery executes one MetricQuery — the same message a dashboard widget
- * stores — so the metrics explorer, the widget editor preview, and a saved
- * dashboard all run through one query path.
+ * StreamQuery evaluates an ad-hoc PromQL expression — the same language saved
+ * dashboard widgets store — so the metrics explorer and the widget editor
+ * preview run through the same query path as the board.
  */
 export interface MetricGatewayService {
   StreamMetrics(request: StreamMetricsRequest, metadata?: Metadata): Observable<MetricCatalogEnvelope>;