@miradorlabs/web-grpc 1.3.0 → 2.0.0

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

@@ -10,7 +10,6 @@ import type { Metadata } from "@grpc/grpc-js";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 import { Timestamp } from "../../../../google/protobuf/timestamp";
-import { ResponseStatus } from "../../common/v1/status";
 import {
   AnalyticsTimeInterval,
   analyticsTimeIntervalFromJSON,
@@ -67,107 +66,189 @@ export function metricKindToJSON(object: MetricKind): string {
   }
 }
 
-export enum MetricAggregation {
-  METRIC_AGGREGATION_UNSPECIFIED = 0,
-  METRIC_AGGREGATION_SUM = 1,
-  METRIC_AGGREGATION_AVG = 2,
-  METRIC_AGGREGATION_MIN = 3,
-  METRIC_AGGREGATION_MAX = 4,
-  METRIC_AGGREGATION_COUNT = 5,
-  METRIC_AGGREGATION_LAST = 6,
-  METRIC_AGGREGATION_RATE = 7,
-  METRIC_AGGREGATION_P50 = 8,
-  METRIC_AGGREGATION_P90 = 9,
-  METRIC_AGGREGATION_P95 = 10,
-  METRIC_AGGREGATION_P99 = 11,
+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 metricAggregationFromJSON(object: any): MetricAggregation {
+export function gaugeAggregationFromJSON(object: any): GaugeAggregation {
   switch (object) {
     case 0:
-    case "METRIC_AGGREGATION_UNSPECIFIED":
-      return MetricAggregation.METRIC_AGGREGATION_UNSPECIFIED;
+    case "GAUGE_AGGREGATION_UNSPECIFIED":
+      return GaugeAggregation.GAUGE_AGGREGATION_UNSPECIFIED;
     case 1:
-    case "METRIC_AGGREGATION_SUM":
-      return MetricAggregation.METRIC_AGGREGATION_SUM;
+    case "GAUGE_AGGREGATION_LAST":
+      return GaugeAggregation.GAUGE_AGGREGATION_LAST;
     case 2:
-    case "METRIC_AGGREGATION_AVG":
-      return MetricAggregation.METRIC_AGGREGATION_AVG;
+    case "GAUGE_AGGREGATION_AVG":
+      return GaugeAggregation.GAUGE_AGGREGATION_AVG;
     case 3:
-    case "METRIC_AGGREGATION_MIN":
-      return MetricAggregation.METRIC_AGGREGATION_MIN;
+    case "GAUGE_AGGREGATION_MIN":
+      return GaugeAggregation.GAUGE_AGGREGATION_MIN;
     case 4:
-    case "METRIC_AGGREGATION_MAX":
-      return MetricAggregation.METRIC_AGGREGATION_MAX;
+    case "GAUGE_AGGREGATION_MAX":
+      return GaugeAggregation.GAUGE_AGGREGATION_MAX;
     case 5:
-    case "METRIC_AGGREGATION_COUNT":
-      return MetricAggregation.METRIC_AGGREGATION_COUNT;
+    case "GAUGE_AGGREGATION_SUM":
+      return GaugeAggregation.GAUGE_AGGREGATION_SUM;
     case 6:
-    case "METRIC_AGGREGATION_LAST":
-      return MetricAggregation.METRIC_AGGREGATION_LAST;
-    case 7:
-    case "METRIC_AGGREGATION_RATE":
-      return MetricAggregation.METRIC_AGGREGATION_RATE;
-    case 8:
-    case "METRIC_AGGREGATION_P50":
-      return MetricAggregation.METRIC_AGGREGATION_P50;
-    case 9:
-    case "METRIC_AGGREGATION_P90":
-      return MetricAggregation.METRIC_AGGREGATION_P90;
-    case 10:
-    case "METRIC_AGGREGATION_P95":
-      return MetricAggregation.METRIC_AGGREGATION_P95;
-    case 11:
-    case "METRIC_AGGREGATION_P99":
-      return MetricAggregation.METRIC_AGGREGATION_P99;
+    case "GAUGE_AGGREGATION_COUNT":
+      return GaugeAggregation.GAUGE_AGGREGATION_COUNT;
     case -1:
     case "UNRECOGNIZED":
     default:
-      return MetricAggregation.UNRECOGNIZED;
+      return GaugeAggregation.UNRECOGNIZED;
   }
 }
 
-export function metricAggregationToJSON(object: MetricAggregation): string {
+export function gaugeAggregationToJSON(object: GaugeAggregation): string {
   switch (object) {
-    case MetricAggregation.METRIC_AGGREGATION_UNSPECIFIED:
-      return "METRIC_AGGREGATION_UNSPECIFIED";
-    case MetricAggregation.METRIC_AGGREGATION_SUM:
-      return "METRIC_AGGREGATION_SUM";
-    case MetricAggregation.METRIC_AGGREGATION_AVG:
-      return "METRIC_AGGREGATION_AVG";
-    case MetricAggregation.METRIC_AGGREGATION_MIN:
-      return "METRIC_AGGREGATION_MIN";
-    case MetricAggregation.METRIC_AGGREGATION_MAX:
-      return "METRIC_AGGREGATION_MAX";
-    case MetricAggregation.METRIC_AGGREGATION_COUNT:
-      return "METRIC_AGGREGATION_COUNT";
-    case MetricAggregation.METRIC_AGGREGATION_LAST:
-      return "METRIC_AGGREGATION_LAST";
-    case MetricAggregation.METRIC_AGGREGATION_RATE:
-      return "METRIC_AGGREGATION_RATE";
-    case MetricAggregation.METRIC_AGGREGATION_P50:
-      return "METRIC_AGGREGATION_P50";
-    case MetricAggregation.METRIC_AGGREGATION_P90:
-      return "METRIC_AGGREGATION_P90";
-    case MetricAggregation.METRIC_AGGREGATION_P95:
-      return "METRIC_AGGREGATION_P95";
-    case MetricAggregation.METRIC_AGGREGATION_P99:
-      return "METRIC_AGGREGATION_P99";
-    case MetricAggregation.UNRECOGNIZED:
+    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 interface ListMetricsRequest {
-  projectId: string;
+export enum SumAggregation {
+  SUM_AGGREGATION_UNSPECIFIED = 0,
+  SUM_AGGREGATION_RATE = 1,
+  SUM_AGGREGATION_INCREASE = 2,
+  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 = 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 interface StreamMetricsRequest {
   /** Stamped by the gateway from the verified identity — never client-supplied. */
   organizationId: string;
+  projectId: string;
+}
+
+export interface MetricCatalogEnvelope {
+  snapshot?: MetricCatalogSnapshot | undefined;
+  added?: MetricInfo | undefined;
 }
 
-export interface ListMetricsResponse {
-  status: ResponseStatus | undefined;
+export interface MetricCatalogSnapshot {
   metrics: MetricInfo[];
 }
 
@@ -177,15 +258,19 @@ export interface MetricInfo {
   kind: MetricKind;
 }
 
-export interface ListMetricAttributesRequest {
-  projectId: string;
-  metricName: string;
+export interface StreamMetricAttributesRequest {
   /** Stamped by the gateway from the verified identity — never client-supplied. */
   organizationId: string;
+  projectId: string;
+  metricName: string;
+}
+
+export interface MetricAttributeEnvelope {
+  snapshot?: MetricAttributeSnapshot | undefined;
+  added?: MetricAttribute | undefined;
 }
 
-export interface ListMetricAttributesResponse {
-  status: ResponseStatus | undefined;
+export interface MetricAttributeSnapshot {
   attributes: MetricAttribute[];
 }
 
@@ -194,43 +279,36 @@ export interface MetricAttribute {
   values: string[];
 }
 
-export interface MetricQuery {
+export interface GaugeQueryRequest {
+  /** Stamped by the gateway from the verified identity — never client-supplied. */
+  organizationId: string;
   projectId: string;
   metricName: string;
-  filter:
-    | MetricFilter
-    | undefined;
-  /** Group keys: "service.name" or datapoint attribute keys; at most 2. */
-  groupBy: string[];
-  aggregation: MetricAggregation;
-  /** Must satisfy: 10 <= (time_window / time_interval) <= 600 */
+  aggregation: GaugeAggregation;
   timeWindow: AnalyticsTimeWindow;
   timeInterval: AnalyticsTimeInterval;
-  /** Stamped by the gateway from the verified identity — never client-supplied. */
-  organizationId: string;
-}
-
-export interface MetricFilter {
-  serviceNames: string[];
-  attributeEquals: { [key: string]: string };
 }
 
-export interface MetricFilter_AttributeEqualsEntry {
-  key: string;
-  value: string;
-}
-
-export interface QueryMetricsRequest {
-  query: MetricQuery | undefined;
-}
-
-export interface QueryMetricsResponse {
-  status: ResponseStatus | undefined;
-  snapshot: MetricAnalyticsSnapshot | undefined;
+export interface SumQueryRequest {
+  /** Stamped by the gateway from the verified identity — never client-supplied. */
+  organizationId: string;
+  projectId: string;
+  metricName: string;
+  aggregation: SumAggregation;
+  timeWindow: AnalyticsTimeWindow;
+  timeInterval: AnalyticsTimeInterval;
 }
 
-export interface StreamMetricAnalyticsRequest {
-  query: MetricQuery | undefined;
+export interface HistogramQueryRequest {
+  /** Stamped by the gateway from the verified identity — never client-supplied. */
+  organizationId: string;
+  projectId: string;
+  metricName: string;
+  aggregation: HistogramAggregation;
+  /** Quantile level in (0,1); required iff aggregation == QUANTILE. */
+  quantile: number;
+  timeWindow: AnalyticsTimeWindow;
+  timeInterval: AnalyticsTimeInterval;
 }
 
 export interface MetricAnalyticsEnvelope {
@@ -248,50 +326,38 @@ export interface MetricAnalyticsSnapshot {
 }
 
 export interface MetricSeries {
-  groupKey: { [key: string]: string };
   buckets: MetricBucket[];
 }
 
-export interface MetricSeries_GroupKeyEntry {
-  key: string;
-  value: string;
-}
-
 export interface MetricBucket {
   bucketStart: Date | undefined;
   value: number;
 }
 
 export interface MetricSeriesBucketUpdate {
-  groupKey: { [key: string]: string };
   bucket: MetricBucket | undefined;
   generatedAt: Date | undefined;
 }
 
-export interface MetricSeriesBucketUpdate_GroupKeyEntry {
-  key: string;
-  value: string;
-}
-
-function createBaseListMetricsRequest(): ListMetricsRequest {
-  return { projectId: "", organizationId: "" };
+function createBaseStreamMetricsRequest(): StreamMetricsRequest {
+  return { organizationId: "", projectId: "" };
 }
 
-export const ListMetricsRequest: MessageFns<ListMetricsRequest> = {
-  encode(message: ListMetricsRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.projectId !== "") {
-      writer.uint32(10).string(message.projectId);
-    }
+export const StreamMetricsRequest: MessageFns<StreamMetricsRequest> = {
+  encode(message: StreamMetricsRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
     if (message.organizationId !== "") {
-      writer.uint32(18).string(message.organizationId);
+      writer.uint32(10).string(message.organizationId);
+    }
+    if (message.projectId !== "") {
+      writer.uint32(18).string(message.projectId);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ListMetricsRequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): StreamMetricsRequest {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseListMetricsRequest();
+    const message = createBaseStreamMetricsRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -300,7 +366,7 @@ export const ListMetricsRequest: MessageFns<ListMetricsRequest> = {
             break;
           }
 
-          message.projectId = reader.string();
+          message.organizationId = reader.string();
           continue;
         }
         case 2: {
@@ -308,7 +374,7 @@ export const ListMetricsRequest: MessageFns<ListMetricsRequest> = {
             break;
           }
 
-          message.organizationId = reader.string();
+          message.projectId = reader.string();
           continue;
         }
       }
@@ -320,62 +386,62 @@ export const ListMetricsRequest: MessageFns<ListMetricsRequest> = {
     return message;
   },
 
-  fromJSON(object: any): ListMetricsRequest {
+  fromJSON(object: any): StreamMetricsRequest {
     return {
-      projectId: isSet(object.projectId)
-        ? globalThis.String(object.projectId)
-        : isSet(object.project_id)
-        ? globalThis.String(object.project_id)
-        : "",
       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)
+        : "",
     };
   },
 
-  toJSON(message: ListMetricsRequest): unknown {
+  toJSON(message: StreamMetricsRequest): unknown {
     const obj: any = {};
-    if (message.projectId !== "") {
-      obj.projectId = message.projectId;
-    }
     if (message.organizationId !== "") {
       obj.organizationId = message.organizationId;
     }
+    if (message.projectId !== "") {
+      obj.projectId = message.projectId;
+    }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<ListMetricsRequest>, I>>(base?: I): ListMetricsRequest {
-    return ListMetricsRequest.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<StreamMetricsRequest>, I>>(base?: I): StreamMetricsRequest {
+    return StreamMetricsRequest.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<ListMetricsRequest>, I>>(object: I): ListMetricsRequest {
-    const message = createBaseListMetricsRequest();
-    message.projectId = object.projectId ?? "";
+  fromPartial<I extends Exact<DeepPartial<StreamMetricsRequest>, I>>(object: I): StreamMetricsRequest {
+    const message = createBaseStreamMetricsRequest();
     message.organizationId = object.organizationId ?? "";
+    message.projectId = object.projectId ?? "";
     return message;
   },
 };
 
-function createBaseListMetricsResponse(): ListMetricsResponse {
-  return { status: undefined, metrics: [] };
+function createBaseMetricCatalogEnvelope(): MetricCatalogEnvelope {
+  return { snapshot: undefined, added: undefined };
 }
 
-export const ListMetricsResponse: MessageFns<ListMetricsResponse> = {
-  encode(message: ListMetricsResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.status !== undefined) {
-      ResponseStatus.encode(message.status, writer.uint32(10).fork()).join();
+export const MetricCatalogEnvelope: MessageFns<MetricCatalogEnvelope> = {
+  encode(message: MetricCatalogEnvelope, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.snapshot !== undefined) {
+      MetricCatalogSnapshot.encode(message.snapshot, writer.uint32(10).fork()).join();
     }
-    for (const v of message.metrics) {
-      MetricInfo.encode(v!, writer.uint32(18).fork()).join();
+    if (message.added !== undefined) {
+      MetricInfo.encode(message.added, writer.uint32(18).fork()).join();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ListMetricsResponse {
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricCatalogEnvelope {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseListMetricsResponse();
+    const message = createBaseMetricCatalogEnvelope();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -384,7 +450,7 @@ export const ListMetricsResponse: MessageFns<ListMetricsResponse> = {
             break;
           }
 
-          message.status = ResponseStatus.decode(reader, reader.uint32());
+          message.snapshot = MetricCatalogSnapshot.decode(reader, reader.uint32());
           continue;
         }
         case 2: {
@@ -392,6 +458,75 @@ export const ListMetricsResponse: MessageFns<ListMetricsResponse> = {
             break;
           }
 
+          message.added = MetricInfo.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): MetricCatalogEnvelope {
+    return {
+      snapshot: isSet(object.snapshot) ? MetricCatalogSnapshot.fromJSON(object.snapshot) : undefined,
+      added: isSet(object.added) ? MetricInfo.fromJSON(object.added) : undefined,
+    };
+  },
+
+  toJSON(message: MetricCatalogEnvelope): unknown {
+    const obj: any = {};
+    if (message.snapshot !== undefined) {
+      obj.snapshot = MetricCatalogSnapshot.toJSON(message.snapshot);
+    }
+    if (message.added !== undefined) {
+      obj.added = MetricInfo.toJSON(message.added);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<MetricCatalogEnvelope>, I>>(base?: I): MetricCatalogEnvelope {
+    return MetricCatalogEnvelope.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<MetricCatalogEnvelope>, I>>(object: I): MetricCatalogEnvelope {
+    const message = createBaseMetricCatalogEnvelope();
+    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
+      ? MetricCatalogSnapshot.fromPartial(object.snapshot)
+      : undefined;
+    message.added = (object.added !== undefined && object.added !== null)
+      ? MetricInfo.fromPartial(object.added)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseMetricCatalogSnapshot(): MetricCatalogSnapshot {
+  return { metrics: [] };
+}
+
+export const MetricCatalogSnapshot: MessageFns<MetricCatalogSnapshot> = {
+  encode(message: MetricCatalogSnapshot, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    for (const v of message.metrics) {
+      MetricInfo.encode(v!, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): MetricCatalogSnapshot {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseMetricCatalogSnapshot();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
           message.metrics.push(MetricInfo.decode(reader, reader.uint32()));
           continue;
         }
@@ -404,32 +539,25 @@ export const ListMetricsResponse: MessageFns<ListMetricsResponse> = {
     return message;
   },
 
-  fromJSON(object: any): ListMetricsResponse {
+  fromJSON(object: any): MetricCatalogSnapshot {
     return {
-      status: isSet(object.status) ? ResponseStatus.fromJSON(object.status) : undefined,
       metrics: globalThis.Array.isArray(object?.metrics) ? object.metrics.map((e: any) => MetricInfo.fromJSON(e)) : [],
     };
   },
 
-  toJSON(message: ListMetricsResponse): unknown {
+  toJSON(message: MetricCatalogSnapshot): unknown {
     const obj: any = {};
-    if (message.status !== undefined) {
-      obj.status = ResponseStatus.toJSON(message.status);
-    }
     if (message.metrics?.length) {
       obj.metrics = message.metrics.map((e) => MetricInfo.toJSON(e));
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<ListMetricsResponse>, I>>(base?: I): ListMetricsResponse {
-    return ListMetricsResponse.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<MetricCatalogSnapshot>, I>>(base?: I): MetricCatalogSnapshot {
+    return MetricCatalogSnapshot.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<ListMetricsResponse>, I>>(object: I): ListMetricsResponse {
-    const message = createBaseListMetricsResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? ResponseStatus.fromPartial(object.status)
-      : undefined;
+  fromPartial<I extends Exact<DeepPartial<MetricCatalogSnapshot>, I>>(object: I): MetricCatalogSnapshot {
+    const message = createBaseMetricCatalogSnapshot();
     message.metrics = object.metrics?.map((e) => MetricInfo.fromPartial(e)) || [];
     return message;
   },
@@ -527,28 +655,28 @@ export const MetricInfo: MessageFns<MetricInfo> = {
   },
 };
 
-function createBaseListMetricAttributesRequest(): ListMetricAttributesRequest {
-  return { projectId: "", metricName: "", organizationId: "" };
+function createBaseStreamMetricAttributesRequest(): StreamMetricAttributesRequest {
+  return { organizationId: "", projectId: "", metricName: "" };
 }
 
-export const ListMetricAttributesRequest: MessageFns<ListMetricAttributesRequest> = {
-  encode(message: ListMetricAttributesRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const StreamMetricAttributesRequest: MessageFns<StreamMetricAttributesRequest> = {
+  encode(message: StreamMetricAttributesRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.organizationId !== "") {
+      writer.uint32(10).string(message.organizationId);
+    }
     if (message.projectId !== "") {
-      writer.uint32(10).string(message.projectId);
+      writer.uint32(18).string(message.projectId);
     }
     if (message.metricName !== "") {
-      writer.uint32(18).string(message.metricName);
-    }
-    if (message.organizationId !== "") {
-      writer.uint32(26).string(message.organizationId);
+      writer.uint32(26).string(message.metricName);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ListMetricAttributesRequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): StreamMetricAttributesRequest {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseListMetricAttributesRequest();
+    const message = createBaseStreamMetricAttributesRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -557,7 +685,7 @@ export const ListMetricAttributesRequest: MessageFns<ListMetricAttributesRequest
             break;
           }
 
-          message.projectId = reader.string();
+          message.organizationId = reader.string();
           continue;
         }
         case 2: {
@@ -565,7 +693,7 @@ export const ListMetricAttributesRequest: MessageFns<ListMetricAttributesRequest
             break;
           }
 
-          message.metricName = reader.string();
+          message.projectId = reader.string();
           continue;
         }
         case 3: {
@@ -573,7 +701,7 @@ export const ListMetricAttributesRequest: MessageFns<ListMetricAttributesRequest
             break;
           }
 
-          message.organizationId = reader.string();
+          message.metricName = reader.string();
           continue;
         }
       }
@@ -585,8 +713,13 @@ export const ListMetricAttributesRequest: MessageFns<ListMetricAttributesRequest
     return message;
   },
 
-  fromJSON(object: any): ListMetricAttributesRequest {
+  fromJSON(object: any): StreamMetricAttributesRequest {
     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)
@@ -597,59 +730,56 @@ export const ListMetricAttributesRequest: MessageFns<ListMetricAttributesRequest
         : isSet(object.metric_name)
         ? globalThis.String(object.metric_name)
         : "",
-      organizationId: isSet(object.organizationId)
-        ? globalThis.String(object.organizationId)
-        : isSet(object.organization_id)
-        ? globalThis.String(object.organization_id)
-        : "",
     };
   },
 
-  toJSON(message: ListMetricAttributesRequest): unknown {
+  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;
     }
-    if (message.organizationId !== "") {
-      obj.organizationId = message.organizationId;
-    }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<ListMetricAttributesRequest>, I>>(base?: I): ListMetricAttributesRequest {
-    return ListMetricAttributesRequest.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<ListMetricAttributesRequest>, I>>(object: I): ListMetricAttributesRequest {
-    const message = createBaseListMetricAttributesRequest();
+  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 ?? "";
-    message.organizationId = object.organizationId ?? "";
     return message;
   },
 };
 
-function createBaseListMetricAttributesResponse(): ListMetricAttributesResponse {
-  return { status: undefined, attributes: [] };
+function createBaseMetricAttributeEnvelope(): MetricAttributeEnvelope {
+  return { snapshot: undefined, added: undefined };
 }
 
-export const ListMetricAttributesResponse: MessageFns<ListMetricAttributesResponse> = {
-  encode(message: ListMetricAttributesResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.status !== undefined) {
-      ResponseStatus.encode(message.status, writer.uint32(10).fork()).join();
+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();
     }
-    for (const v of message.attributes) {
-      MetricAttribute.encode(v!, writer.uint32(18).fork()).join();
+    if (message.added !== undefined) {
+      MetricAttribute.encode(message.added, writer.uint32(18).fork()).join();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ListMetricAttributesResponse {
+  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 = createBaseListMetricAttributesResponse();
+    const message = createBaseMetricAttributeEnvelope();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -658,7 +788,7 @@ export const ListMetricAttributesResponse: MessageFns<ListMetricAttributesRespon
             break;
           }
 
-          message.status = ResponseStatus.decode(reader, reader.uint32());
+          message.snapshot = MetricAttributeSnapshot.decode(reader, reader.uint32());
           continue;
         }
         case 2: {
@@ -666,6 +796,75 @@ export const ListMetricAttributesResponse: MessageFns<ListMetricAttributesRespon
             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;
         }
@@ -678,34 +877,27 @@ export const ListMetricAttributesResponse: MessageFns<ListMetricAttributesRespon
     return message;
   },
 
-  fromJSON(object: any): ListMetricAttributesResponse {
+  fromJSON(object: any): MetricAttributeSnapshot {
     return {
-      status: isSet(object.status) ? ResponseStatus.fromJSON(object.status) : undefined,
       attributes: globalThis.Array.isArray(object?.attributes)
         ? object.attributes.map((e: any) => MetricAttribute.fromJSON(e))
         : [],
     };
   },
 
-  toJSON(message: ListMetricAttributesResponse): unknown {
+  toJSON(message: MetricAttributeSnapshot): unknown {
     const obj: any = {};
-    if (message.status !== undefined) {
-      obj.status = ResponseStatus.toJSON(message.status);
-    }
     if (message.attributes?.length) {
       obj.attributes = message.attributes.map((e) => MetricAttribute.toJSON(e));
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<ListMetricAttributesResponse>, I>>(base?: I): ListMetricAttributesResponse {
-    return ListMetricAttributesResponse.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<ListMetricAttributesResponse>, I>>(object: I): ListMetricAttributesResponse {
-    const message = createBaseListMetricAttributesResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? ResponseStatus.fromPartial(object.status)
-      : undefined;
+  fromPartial<I extends Exact<DeepPartial<MetricAttributeSnapshot>, I>>(object: I): MetricAttributeSnapshot {
+    const message = createBaseMetricAttributeSnapshot();
     message.attributes = object.attributes?.map((e) => MetricAttribute.fromPartial(e)) || [];
     return message;
   },
@@ -787,52 +979,37 @@ export const MetricAttribute: MessageFns<MetricAttribute> = {
   },
 };
 
-function createBaseMetricQuery(): MetricQuery {
-  return {
-    projectId: "",
-    metricName: "",
-    filter: undefined,
-    groupBy: [],
-    aggregation: 0,
-    timeWindow: 0,
-    timeInterval: 0,
-    organizationId: "",
-  };
+function createBaseGaugeQueryRequest(): GaugeQueryRequest {
+  return { organizationId: "", projectId: "", metricName: "", aggregation: 0, timeWindow: 0, timeInterval: 0 };
 }
 
-export const MetricQuery: MessageFns<MetricQuery> = {
-  encode(message: MetricQuery, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const GaugeQueryRequest: MessageFns<GaugeQueryRequest> = {
+  encode(message: GaugeQueryRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.organizationId !== "") {
+      writer.uint32(10).string(message.organizationId);
+    }
     if (message.projectId !== "") {
-      writer.uint32(10).string(message.projectId);
+      writer.uint32(18).string(message.projectId);
     }
     if (message.metricName !== "") {
-      writer.uint32(18).string(message.metricName);
-    }
-    if (message.filter !== undefined) {
-      MetricFilter.encode(message.filter, writer.uint32(26).fork()).join();
-    }
-    for (const v of message.groupBy) {
-      writer.uint32(34).string(v!);
+      writer.uint32(26).string(message.metricName);
     }
     if (message.aggregation !== 0) {
-      writer.uint32(40).int32(message.aggregation);
+      writer.uint32(32).int32(message.aggregation);
     }
     if (message.timeWindow !== 0) {
-      writer.uint32(48).int32(message.timeWindow);
+      writer.uint32(40).int32(message.timeWindow);
     }
     if (message.timeInterval !== 0) {
-      writer.uint32(56).int32(message.timeInterval);
-    }
-    if (message.organizationId !== "") {
-      writer.uint32(66).string(message.organizationId);
+      writer.uint32(48).int32(message.timeInterval);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricQuery {
+  decode(input: BinaryReader | Uint8Array, length?: number): GaugeQueryRequest {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricQuery();
+    const message = createBaseGaugeQueryRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -841,7 +1018,7 @@ export const MetricQuery: MessageFns<MetricQuery> = {
             break;
           }
 
-          message.projectId = reader.string();
+          message.organizationId = reader.string();
           continue;
         }
         case 2: {
@@ -849,7 +1026,7 @@ export const MetricQuery: MessageFns<MetricQuery> = {
             break;
           }
 
-          message.metricName = reader.string();
+          message.projectId = reader.string();
           continue;
         }
         case 3: {
@@ -857,15 +1034,15 @@ export const MetricQuery: MessageFns<MetricQuery> = {
             break;
           }
 
-          message.filter = MetricFilter.decode(reader, reader.uint32());
+          message.metricName = reader.string();
           continue;
         }
         case 4: {
-          if (tag !== 34) {
+          if (tag !== 32) {
             break;
           }
 
-          message.groupBy.push(reader.string());
+          message.aggregation = reader.int32() as any;
           continue;
         }
         case 5: {
@@ -873,7 +1050,7 @@ export const MetricQuery: MessageFns<MetricQuery> = {
             break;
           }
 
-          message.aggregation = reader.int32() as any;
+          message.timeWindow = reader.int32() as any;
           continue;
         }
         case 6: {
@@ -881,25 +1058,9 @@ export const MetricQuery: MessageFns<MetricQuery> = {
             break;
           }
 
-          message.timeWindow = reader.int32() as any;
-          continue;
-        }
-        case 7: {
-          if (tag !== 56) {
-            break;
-          }
-
           message.timeInterval = reader.int32() as any;
           continue;
         }
-        case 8: {
-          if (tag !== 66) {
-            break;
-          }
-
-          message.organizationId = reader.string();
-          continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -909,8 +1070,13 @@ export const MetricQuery: MessageFns<MetricQuery> = {
     return message;
   },
 
-  fromJSON(object: any): MetricQuery {
+  fromJSON(object: any): GaugeQueryRequest {
     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)
@@ -921,13 +1087,7 @@ export const MetricQuery: MessageFns<MetricQuery> = {
         : isSet(object.metric_name)
         ? globalThis.String(object.metric_name)
         : "",
-      filter: isSet(object.filter) ? MetricFilter.fromJSON(object.filter) : undefined,
-      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))
-        : [],
-      aggregation: isSet(object.aggregation) ? metricAggregationFromJSON(object.aggregation) : 0,
+      aggregation: isSet(object.aggregation) ? gaugeAggregationFromJSON(object.aggregation) : 0,
       timeWindow: isSet(object.timeWindow)
         ? analyticsTimeWindowFromJSON(object.timeWindow)
         : isSet(object.time_window)
@@ -938,30 +1098,22 @@ export const MetricQuery: MessageFns<MetricQuery> = {
         : isSet(object.time_interval)
         ? analyticsTimeIntervalFromJSON(object.time_interval)
         : 0,
-      organizationId: isSet(object.organizationId)
-        ? globalThis.String(object.organizationId)
-        : isSet(object.organization_id)
-        ? globalThis.String(object.organization_id)
-        : "",
     };
   },
 
-  toJSON(message: MetricQuery): unknown {
+  toJSON(message: GaugeQueryRequest): 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.filter !== undefined) {
-      obj.filter = MetricFilter.toJSON(message.filter);
-    }
-    if (message.groupBy?.length) {
-      obj.groupBy = message.groupBy;
-    }
     if (message.aggregation !== 0) {
-      obj.aggregation = metricAggregationToJSON(message.aggregation);
+      obj.aggregation = gaugeAggregationToJSON(message.aggregation);
     }
     if (message.timeWindow !== 0) {
       obj.timeWindow = analyticsTimeWindowToJSON(message.timeWindow);
@@ -969,50 +1121,55 @@ export const MetricQuery: MessageFns<MetricQuery> = {
     if (message.timeInterval !== 0) {
       obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
     }
-    if (message.organizationId !== "") {
-      obj.organizationId = message.organizationId;
-    }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<MetricQuery>, I>>(base?: I): MetricQuery {
-    return MetricQuery.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<GaugeQueryRequest>, I>>(base?: I): GaugeQueryRequest {
+    return GaugeQueryRequest.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<MetricQuery>, I>>(object: I): MetricQuery {
-    const message = createBaseMetricQuery();
+  fromPartial<I extends Exact<DeepPartial<GaugeQueryRequest>, I>>(object: I): GaugeQueryRequest {
+    const message = createBaseGaugeQueryRequest();
+    message.organizationId = object.organizationId ?? "";
     message.projectId = object.projectId ?? "";
     message.metricName = object.metricName ?? "";
-    message.filter = (object.filter !== undefined && object.filter !== null)
-      ? MetricFilter.fromPartial(object.filter)
-      : undefined;
-    message.groupBy = object.groupBy?.map((e) => e) || [];
     message.aggregation = object.aggregation ?? 0;
     message.timeWindow = object.timeWindow ?? 0;
     message.timeInterval = object.timeInterval ?? 0;
-    message.organizationId = object.organizationId ?? "";
     return message;
   },
 };
 
-function createBaseMetricFilter(): MetricFilter {
-  return { serviceNames: [], attributeEquals: {} };
+function createBaseSumQueryRequest(): SumQueryRequest {
+  return { organizationId: "", projectId: "", metricName: "", aggregation: 0, timeWindow: 0, timeInterval: 0 };
 }
 
-export const MetricFilter: MessageFns<MetricFilter> = {
-  encode(message: MetricFilter, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    for (const v of message.serviceNames) {
-      writer.uint32(10).string(v!);
+export const SumQueryRequest: MessageFns<SumQueryRequest> = {
+  encode(message: SumQueryRequest, 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.timeWindow !== 0) {
+      writer.uint32(40).int32(message.timeWindow);
+    }
+    if (message.timeInterval !== 0) {
+      writer.uint32(48).int32(message.timeInterval);
     }
-    globalThis.Object.entries(message.attributeEquals).forEach(([key, value]: [string, string]) => {
-      MetricFilter_AttributeEqualsEntry.encode({ key: key as any, value }, writer.uint32(18).fork()).join();
-    });
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricFilter {
+  decode(input: BinaryReader | Uint8Array, length?: number): SumQueryRequest {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricFilter();
+    const message = createBaseSumQueryRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1021,7 +1178,7 @@ export const MetricFilter: MessageFns<MetricFilter> = {
             break;
           }
 
-          message.serviceNames.push(reader.string());
+          message.organizationId = reader.string();
           continue;
         }
         case 2: {
@@ -1029,120 +1186,39 @@ export const MetricFilter: MessageFns<MetricFilter> = {
             break;
           }
 
-          const entry2 = MetricFilter_AttributeEqualsEntry.decode(reader, reader.uint32());
-          if (entry2.value !== undefined) {
-            message.attributeEquals[entry2.key] = entry2.value;
-          }
+          message.projectId = reader.string();
           continue;
         }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): MetricFilter {
-    return {
-      serviceNames: globalThis.Array.isArray(object?.serviceNames)
-        ? object.serviceNames.map((e: any) => globalThis.String(e))
-        : globalThis.Array.isArray(object?.service_names)
-        ? object.service_names.map((e: any) => globalThis.String(e))
-        : [],
-      attributeEquals: isObject(object.attributeEquals)
-        ? (globalThis.Object.entries(object.attributeEquals) as [string, any][]).reduce(
-          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
-            acc[key] = globalThis.String(value);
-            return acc;
-          },
-          {},
-        )
-        : isObject(object.attribute_equals)
-        ? (globalThis.Object.entries(object.attribute_equals) as [string, any][]).reduce(
-          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
-            acc[key] = globalThis.String(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-    };
-  },
-
-  toJSON(message: MetricFilter): unknown {
-    const obj: any = {};
-    if (message.serviceNames?.length) {
-      obj.serviceNames = message.serviceNames;
-    }
-    if (message.attributeEquals) {
-      const entries = globalThis.Object.entries(message.attributeEquals) as [string, string][];
-      if (entries.length > 0) {
-        obj.attributeEquals = {};
-        entries.forEach(([k, v]) => {
-          obj.attributeEquals[k] = v;
-        });
-      }
-    }
-    return obj;
-  },
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
 
-  create<I extends Exact<DeepPartial<MetricFilter>, I>>(base?: I): MetricFilter {
-    return MetricFilter.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricFilter>, I>>(object: I): MetricFilter {
-    const message = createBaseMetricFilter();
-    message.serviceNames = object.serviceNames?.map((e) => e) || [];
-    message.attributeEquals = (globalThis.Object.entries(object.attributeEquals ?? {}) as [string, string][]).reduce(
-      (acc: { [key: string]: string }, [key, value]: [string, string]) => {
-        if (value !== undefined) {
-          acc[key] = globalThis.String(value);
+          message.metricName = reader.string();
+          continue;
         }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseMetricFilter_AttributeEqualsEntry(): MetricFilter_AttributeEqualsEntry {
-  return { key: "", value: "" };
-}
-
-export const MetricFilter_AttributeEqualsEntry: MessageFns<MetricFilter_AttributeEqualsEntry> = {
-  encode(message: MetricFilter_AttributeEqualsEntry, 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;
-  },
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
 
-  decode(input: BinaryReader | Uint8Array, length?: number): MetricFilter_AttributeEqualsEntry {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricFilter_AttributeEqualsEntry();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
+          message.aggregation = reader.int32() as any;
+          continue;
+        }
+        case 5: {
+          if (tag !== 40) {
             break;
           }
 
-          message.key = reader.string();
+          message.timeWindow = reader.int32() as any;
           continue;
         }
-        case 2: {
-          if (tag !== 18) {
+        case 6: {
+          if (tag !== 48) {
             break;
           }
 
-          message.value = reader.string();
+          message.timeInterval = reader.int32() as any;
           continue;
         }
       }
@@ -1154,55 +1230,117 @@ export const MetricFilter_AttributeEqualsEntry: MessageFns<MetricFilter_Attribut
     return message;
   },
 
-  fromJSON(object: any): MetricFilter_AttributeEqualsEntry {
+  fromJSON(object: any): SumQueryRequest {
     return {
-      key: isSet(object.key) ? globalThis.String(object.key) : "",
-      value: isSet(object.value) ? globalThis.String(object.value) : "",
+      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)
+        : 0,
     };
   },
 
-  toJSON(message: MetricFilter_AttributeEqualsEntry): unknown {
+  toJSON(message: SumQueryRequest): unknown {
     const obj: any = {};
-    if (message.key !== "") {
-      obj.key = message.key;
+    if (message.organizationId !== "") {
+      obj.organizationId = message.organizationId;
     }
-    if (message.value !== "") {
-      obj.value = message.value;
+    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.timeWindow !== 0) {
+      obj.timeWindow = analyticsTimeWindowToJSON(message.timeWindow);
+    }
+    if (message.timeInterval !== 0) {
+      obj.timeInterval = analyticsTimeIntervalToJSON(message.timeInterval);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<MetricFilter_AttributeEqualsEntry>, I>>(
-    base?: I,
-  ): MetricFilter_AttributeEqualsEntry {
-    return MetricFilter_AttributeEqualsEntry.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<SumQueryRequest>, I>>(base?: I): SumQueryRequest {
+    return SumQueryRequest.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<MetricFilter_AttributeEqualsEntry>, I>>(
-    object: I,
-  ): MetricFilter_AttributeEqualsEntry {
-    const message = createBaseMetricFilter_AttributeEqualsEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
+  fromPartial<I extends Exact<DeepPartial<SumQueryRequest>, I>>(object: I): SumQueryRequest {
+    const message = createBaseSumQueryRequest();
+    message.organizationId = object.organizationId ?? "";
+    message.projectId = object.projectId ?? "";
+    message.metricName = object.metricName ?? "";
+    message.aggregation = object.aggregation ?? 0;
+    message.timeWindow = object.timeWindow ?? 0;
+    message.timeInterval = object.timeInterval ?? 0;
     return message;
   },
 };
 
-function createBaseQueryMetricsRequest(): QueryMetricsRequest {
-  return { query: undefined };
+function createBaseHistogramQueryRequest(): HistogramQueryRequest {
+  return {
+    organizationId: "",
+    projectId: "",
+    metricName: "",
+    aggregation: 0,
+    quantile: 0,
+    timeWindow: 0,
+    timeInterval: 0,
+  };
 }
 
-export const QueryMetricsRequest: MessageFns<QueryMetricsRequest> = {
-  encode(message: QueryMetricsRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.query !== undefined) {
-      MetricQuery.encode(message.query, writer.uint32(10).fork()).join();
+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);
+    }
+    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);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): QueryMetricsRequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): HistogramQueryRequest {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseQueryMetricsRequest();
+    const message = createBaseHistogramQueryRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1211,78 +1349,55 @@ export const QueryMetricsRequest: MessageFns<QueryMetricsRequest> = {
             break;
           }
 
-          message.query = MetricQuery.decode(reader, reader.uint32());
+          message.organizationId = reader.string();
           continue;
         }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): QueryMetricsRequest {
-    return { query: isSet(object.query) ? MetricQuery.fromJSON(object.query) : undefined };
-  },
-
-  toJSON(message: QueryMetricsRequest): unknown {
-    const obj: any = {};
-    if (message.query !== undefined) {
-      obj.query = MetricQuery.toJSON(message.query);
-    }
-    return obj;
-  },
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
 
-  create<I extends Exact<DeepPartial<QueryMetricsRequest>, I>>(base?: I): QueryMetricsRequest {
-    return QueryMetricsRequest.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<QueryMetricsRequest>, I>>(object: I): QueryMetricsRequest {
-    const message = createBaseQueryMetricsRequest();
-    message.query = (object.query !== undefined && object.query !== null)
-      ? MetricQuery.fromPartial(object.query)
-      : undefined;
-    return message;
-  },
-};
+          message.projectId = reader.string();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
 
-function createBaseQueryMetricsResponse(): QueryMetricsResponse {
-  return { status: undefined, snapshot: undefined };
-}
+          message.metricName = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
 
-export const QueryMetricsResponse: MessageFns<QueryMetricsResponse> = {
-  encode(message: QueryMetricsResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.status !== undefined) {
-      ResponseStatus.encode(message.status, writer.uint32(10).fork()).join();
-    }
-    if (message.snapshot !== undefined) {
-      MetricAnalyticsSnapshot.encode(message.snapshot, writer.uint32(18).fork()).join();
-    }
-    return writer;
-  },
+          message.aggregation = reader.int32() as any;
+          continue;
+        }
+        case 5: {
+          if (tag !== 41) {
+            break;
+          }
 
-  decode(input: BinaryReader | Uint8Array, length?: number): QueryMetricsResponse {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseQueryMetricsResponse();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
+          message.quantile = reader.double();
+          continue;
+        }
+        case 6: {
+          if (tag !== 48) {
             break;
           }
 
-          message.status = ResponseStatus.decode(reader, reader.uint32());
+          message.timeWindow = reader.int32() as any;
           continue;
         }
-        case 2: {
-          if (tag !== 18) {
+        case 7: {
+          if (tag !== 56) {
             break;
           }
 
-          message.snapshot = MetricAnalyticsSnapshot.decode(reader, reader.uint32());
+          message.timeInterval = reader.int32() as any;
           continue;
         }
       }
@@ -1294,95 +1409,76 @@ export const QueryMetricsResponse: MessageFns<QueryMetricsResponse> = {
     return message;
   },
 
-  fromJSON(object: any): QueryMetricsResponse {
+  fromJSON(object: any): HistogramQueryRequest {
     return {
-      status: isSet(object.status) ? ResponseStatus.fromJSON(object.status) : undefined,
-      snapshot: isSet(object.snapshot) ? MetricAnalyticsSnapshot.fromJSON(object.snapshot) : undefined,
+      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,
     };
   },
 
-  toJSON(message: QueryMetricsResponse): unknown {
+  toJSON(message: HistogramQueryRequest): unknown {
     const obj: any = {};
-    if (message.status !== undefined) {
-      obj.status = ResponseStatus.toJSON(message.status);
+    if (message.organizationId !== "") {
+      obj.organizationId = message.organizationId;
     }
-    if (message.snapshot !== undefined) {
-      obj.snapshot = MetricAnalyticsSnapshot.toJSON(message.snapshot);
+    if (message.projectId !== "") {
+      obj.projectId = message.projectId;
     }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<QueryMetricsResponse>, I>>(base?: I): QueryMetricsResponse {
-    return QueryMetricsResponse.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<QueryMetricsResponse>, I>>(object: I): QueryMetricsResponse {
-    const message = createBaseQueryMetricsResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? ResponseStatus.fromPartial(object.status)
-      : undefined;
-    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
-      ? MetricAnalyticsSnapshot.fromPartial(object.snapshot)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseStreamMetricAnalyticsRequest(): StreamMetricAnalyticsRequest {
-  return { query: undefined };
-}
-
-export const StreamMetricAnalyticsRequest: MessageFns<StreamMetricAnalyticsRequest> = {
-  encode(message: StreamMetricAnalyticsRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.query !== undefined) {
-      MetricQuery.encode(message.query, writer.uint32(10).fork()).join();
+    if (message.metricName !== "") {
+      obj.metricName = message.metricName;
     }
-    return writer;
-  },
-
-  decode(input: BinaryReader | Uint8Array, length?: number): StreamMetricAnalyticsRequest {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseStreamMetricAnalyticsRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-
-          message.query = MetricQuery.decode(reader, reader.uint32());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
+    if (message.aggregation !== 0) {
+      obj.aggregation = histogramAggregationToJSON(message.aggregation);
     }
-    return message;
-  },
-
-  fromJSON(object: any): StreamMetricAnalyticsRequest {
-    return { query: isSet(object.query) ? MetricQuery.fromJSON(object.query) : undefined };
-  },
-
-  toJSON(message: StreamMetricAnalyticsRequest): unknown {
-    const obj: any = {};
-    if (message.query !== undefined) {
-      obj.query = MetricQuery.toJSON(message.query);
+    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);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<StreamMetricAnalyticsRequest>, I>>(base?: I): StreamMetricAnalyticsRequest {
-    return StreamMetricAnalyticsRequest.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<HistogramQueryRequest>, I>>(base?: I): HistogramQueryRequest {
+    return HistogramQueryRequest.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<StreamMetricAnalyticsRequest>, I>>(object: I): StreamMetricAnalyticsRequest {
-    const message = createBaseStreamMetricAnalyticsRequest();
-    message.query = (object.query !== undefined && object.query !== null)
-      ? MetricQuery.fromPartial(object.query)
-      : undefined;
+  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 ?? "";
+    message.aggregation = object.aggregation ?? 0;
+    message.quantile = object.quantile ?? 0;
+    message.timeWindow = object.timeWindow ?? 0;
+    message.timeInterval = object.timeInterval ?? 0;
     return message;
   },
 };
@@ -1635,16 +1731,13 @@ export const MetricAnalyticsSnapshot: MessageFns<MetricAnalyticsSnapshot> = {
 };
 
 function createBaseMetricSeries(): MetricSeries {
-  return { groupKey: {}, buckets: [] };
+  return { buckets: [] };
 }
 
 export const MetricSeries: MessageFns<MetricSeries> = {
   encode(message: MetricSeries, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    globalThis.Object.entries(message.groupKey).forEach(([key, value]: [string, string]) => {
-      MetricSeries_GroupKeyEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join();
-    });
     for (const v of message.buckets) {
-      MetricBucket.encode(v!, writer.uint32(18).fork()).join();
+      MetricBucket.encode(v!, writer.uint32(10).fork()).join();
     }
     return writer;
   },
@@ -1661,17 +1754,6 @@ export const MetricSeries: MessageFns<MetricSeries> = {
             break;
           }
 
-          const entry1 = MetricSeries_GroupKeyEntry.decode(reader, reader.uint32());
-          if (entry1.value !== undefined) {
-            message.groupKey[entry1.key] = entry1.value;
-          }
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-
           message.buckets.push(MetricBucket.decode(reader, reader.uint32()));
           continue;
         }
@@ -1686,23 +1768,6 @@ export const MetricSeries: MessageFns<MetricSeries> = {
 
   fromJSON(object: any): MetricSeries {
     return {
-      groupKey: isObject(object.groupKey)
-        ? (globalThis.Object.entries(object.groupKey) as [string, any][]).reduce(
-          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
-            acc[key] = globalThis.String(value);
-            return acc;
-          },
-          {},
-        )
-        : isObject(object.group_key)
-        ? (globalThis.Object.entries(object.group_key) 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))
         : [],
@@ -1711,15 +1776,6 @@ export const MetricSeries: MessageFns<MetricSeries> = {
 
   toJSON(message: MetricSeries): unknown {
     const obj: any = {};
-    if (message.groupKey) {
-      const entries = globalThis.Object.entries(message.groupKey) as [string, string][];
-      if (entries.length > 0) {
-        obj.groupKey = {};
-        entries.forEach(([k, v]) => {
-          obj.groupKey[k] = v;
-        });
-      }
-    }
     if (message.buckets?.length) {
       obj.buckets = message.buckets.map((e) => MetricBucket.toJSON(e));
     }
@@ -1731,96 +1787,11 @@ export const MetricSeries: MessageFns<MetricSeries> = {
   },
   fromPartial<I extends Exact<DeepPartial<MetricSeries>, I>>(object: I): MetricSeries {
     const message = createBaseMetricSeries();
-    message.groupKey = (globalThis.Object.entries(object.groupKey ?? {}) 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_GroupKeyEntry(): MetricSeries_GroupKeyEntry {
-  return { key: "", value: "" };
-}
-
-export const MetricSeries_GroupKeyEntry: MessageFns<MetricSeries_GroupKeyEntry> = {
-  encode(message: MetricSeries_GroupKeyEntry, 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_GroupKeyEntry {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricSeries_GroupKeyEntry();
-    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_GroupKeyEntry {
-    return {
-      key: isSet(object.key) ? globalThis.String(object.key) : "",
-      value: isSet(object.value) ? globalThis.String(object.value) : "",
-    };
-  },
-
-  toJSON(message: MetricSeries_GroupKeyEntry): 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_GroupKeyEntry>, I>>(base?: I): MetricSeries_GroupKeyEntry {
-    return MetricSeries_GroupKeyEntry.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricSeries_GroupKeyEntry>, I>>(object: I): MetricSeries_GroupKeyEntry {
-    const message = createBaseMetricSeries_GroupKeyEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
 function createBaseMetricBucket(): MetricBucket {
   return { bucketStart: undefined, value: 0 };
 }
@@ -1902,19 +1873,16 @@ export const MetricBucket: MessageFns<MetricBucket> = {
 };
 
 function createBaseMetricSeriesBucketUpdate(): MetricSeriesBucketUpdate {
-  return { groupKey: {}, bucket: undefined, generatedAt: undefined };
+  return { bucket: undefined, generatedAt: undefined };
 }
 
 export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
   encode(message: MetricSeriesBucketUpdate, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    globalThis.Object.entries(message.groupKey).forEach(([key, value]: [string, string]) => {
-      MetricSeriesBucketUpdate_GroupKeyEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join();
-    });
     if (message.bucket !== undefined) {
-      MetricBucket.encode(message.bucket, writer.uint32(18).fork()).join();
+      MetricBucket.encode(message.bucket, writer.uint32(10).fork()).join();
     }
     if (message.generatedAt !== undefined) {
-      Timestamp.encode(toTimestamp(message.generatedAt), writer.uint32(26).fork()).join();
+      Timestamp.encode(toTimestamp(message.generatedAt), writer.uint32(18).fork()).join();
     }
     return writer;
   },
@@ -1931,10 +1899,7 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
             break;
           }
 
-          const entry1 = MetricSeriesBucketUpdate_GroupKeyEntry.decode(reader, reader.uint32());
-          if (entry1.value !== undefined) {
-            message.groupKey[entry1.key] = entry1.value;
-          }
+          message.bucket = MetricBucket.decode(reader, reader.uint32());
           continue;
         }
         case 2: {
@@ -1942,14 +1907,6 @@ 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;
         }
@@ -1964,23 +1921,6 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
 
   fromJSON(object: any): MetricSeriesBucketUpdate {
     return {
-      groupKey: isObject(object.groupKey)
-        ? (globalThis.Object.entries(object.groupKey) as [string, any][]).reduce(
-          (acc: { [key: string]: string }, [key, value]: [string, any]) => {
-            acc[key] = globalThis.String(value);
-            return acc;
-          },
-          {},
-        )
-        : isObject(object.group_key)
-        ? (globalThis.Object.entries(object.group_key) 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)
@@ -1992,15 +1932,6 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
 
   toJSON(message: MetricSeriesBucketUpdate): unknown {
     const obj: any = {};
-    if (message.groupKey) {
-      const entries = globalThis.Object.entries(message.groupKey) as [string, string][];
-      if (entries.length > 0) {
-        obj.groupKey = {};
-        entries.forEach(([k, v]) => {
-          obj.groupKey[k] = v;
-        });
-      }
-    }
     if (message.bucket !== undefined) {
       obj.bucket = MetricBucket.toJSON(message.bucket);
     }
@@ -2015,15 +1946,6 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
   },
   fromPartial<I extends Exact<DeepPartial<MetricSeriesBucketUpdate>, I>>(object: I): MetricSeriesBucketUpdate {
     const message = createBaseMetricSeriesBucketUpdate();
-    message.groupKey = (globalThis.Object.entries(object.groupKey ?? {}) 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;
@@ -2032,101 +1954,20 @@ export const MetricSeriesBucketUpdate: MessageFns<MetricSeriesBucketUpdate> = {
   },
 };
 
-function createBaseMetricSeriesBucketUpdate_GroupKeyEntry(): MetricSeriesBucketUpdate_GroupKeyEntry {
-  return { key: "", value: "" };
-}
-
-export const MetricSeriesBucketUpdate_GroupKeyEntry: MessageFns<MetricSeriesBucketUpdate_GroupKeyEntry> = {
-  encode(message: MetricSeriesBucketUpdate_GroupKeyEntry, 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): MetricSeriesBucketUpdate_GroupKeyEntry {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseMetricSeriesBucketUpdate_GroupKeyEntry();
-    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): MetricSeriesBucketUpdate_GroupKeyEntry {
-    return {
-      key: isSet(object.key) ? globalThis.String(object.key) : "",
-      value: isSet(object.value) ? globalThis.String(object.value) : "",
-    };
-  },
-
-  toJSON(message: MetricSeriesBucketUpdate_GroupKeyEntry): 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<MetricSeriesBucketUpdate_GroupKeyEntry>, I>>(
-    base?: I,
-  ): MetricSeriesBucketUpdate_GroupKeyEntry {
-    return MetricSeriesBucketUpdate_GroupKeyEntry.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<MetricSeriesBucketUpdate_GroupKeyEntry>, I>>(
-    object: I,
-  ): MetricSeriesBucketUpdate_GroupKeyEntry {
-    const message = createBaseMetricSeriesBucketUpdate_GroupKeyEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
 /**
  * TelemetryGatewayService is the web surface of telemetry.api.v1 — the types
- * are domain-isolated copies converted in gateways/internal/convert.
+ * are domain-isolated copies converted in gateways/internal/convert. Every RPC
+ * is a server stream (snapshot first, then live updates), split by metric kind.
  */
 export interface TelemetryGatewayService {
-  ListMetrics(request: ListMetricsRequest, metadata?: Metadata): Promise<ListMetricsResponse>;
-  ListMetricAttributes(
-    request: ListMetricAttributesRequest,
+  StreamMetrics(request: StreamMetricsRequest, metadata?: Metadata): Observable<MetricCatalogEnvelope>;
+  StreamMetricAttributes(
+    request: StreamMetricAttributesRequest,
     metadata?: Metadata,
-  ): Promise<ListMetricAttributesResponse>;
-  QueryMetrics(request: QueryMetricsRequest, metadata?: Metadata): Promise<QueryMetricsResponse>;
-  StreamMetricAnalytics(
-    request: StreamMetricAnalyticsRequest,
-    metadata?: Metadata,
-  ): Observable<MetricAnalyticsEnvelope>;
+  ): Observable<MetricAttributeEnvelope>;
+  StreamGaugeAnalytics(request: GaugeQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope>;
+  StreamSumAnalytics(request: SumQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope>;
+  StreamHistogramAnalytics(request: HistogramQueryRequest, metadata?: Metadata): Observable<MetricAnalyticsEnvelope>;
 }
 
 export const TelemetryGatewayServiceServiceName = "gateway.web.v1.TelemetryGatewayService";
@@ -2136,38 +1977,42 @@ export class TelemetryGatewayServiceClientImpl implements TelemetryGatewayServic
   constructor(rpc: Rpc, opts?: { service?: string }) {
     this.service = opts?.service || TelemetryGatewayServiceServiceName;
     this.rpc = rpc;
-    this.ListMetrics = this.ListMetrics.bind(this);
-    this.ListMetricAttributes = this.ListMetricAttributes.bind(this);
-    this.QueryMetrics = this.QueryMetrics.bind(this);
-    this.StreamMetricAnalytics = this.StreamMetricAnalytics.bind(this);
+    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);
   }
-  ListMetrics(request: ListMetricsRequest, metadata?: Metadata): Promise<ListMetricsResponse> {
-    const data = ListMetricsRequest.encode(request).finish();
-    const promise = this.rpc.request(this.service, "ListMetrics", data, metadata);
-    return promise.then((data) => ListMetricsResponse.decode(new BinaryReader(data)));
+  StreamMetrics(request: StreamMetricsRequest, metadata?: Metadata): Observable<MetricCatalogEnvelope> {
+    const data = StreamMetricsRequest.encode(request).finish();
+    const result = this.rpc.serverStreamingRequest(this.service, "StreamMetrics", data, metadata);
+    return result.pipe(map((data) => MetricCatalogEnvelope.decode(new BinaryReader(data))));
   }
 
-  ListMetricAttributes(
-    request: ListMetricAttributesRequest,
+  StreamMetricAttributes(
+    request: StreamMetricAttributesRequest,
     metadata?: Metadata,
-  ): Promise<ListMetricAttributesResponse> {
-    const data = ListMetricAttributesRequest.encode(request).finish();
-    const promise = this.rpc.request(this.service, "ListMetricAttributes", data, metadata);
-    return promise.then((data) => ListMetricAttributesResponse.decode(new BinaryReader(data)));
+  ): Observable<MetricAttributeEnvelope> {
+    const data = StreamMetricAttributesRequest.encode(request).finish();
+    const result = this.rpc.serverStreamingRequest(this.service, "StreamMetricAttributes", data, metadata);
+    return result.pipe(map((data) => MetricAttributeEnvelope.decode(new BinaryReader(data))));
   }
 
-  QueryMetrics(request: QueryMetricsRequest, metadata?: Metadata): Promise<QueryMetricsResponse> {
-    const data = QueryMetricsRequest.encode(request).finish();
-    const promise = this.rpc.request(this.service, "QueryMetrics", data, metadata);
-    return promise.then((data) => QueryMetricsResponse.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))));
   }
 
-  StreamMetricAnalytics(
-    request: StreamMetricAnalyticsRequest,
-    metadata?: Metadata,
-  ): Observable<MetricAnalyticsEnvelope> {
-    const data = StreamMetricAnalyticsRequest.encode(request).finish();
-    const result = this.rpc.serverStreamingRequest(this.service, "StreamMetricAnalytics", data, metadata);
+  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))));
   }
 }
@@ -2239,10 +2084,6 @@ 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;
 }