npm - @miradorlabs/web-grpc - Versions diffs - 1.3.0 → 2.1.0 - Mend

@miradorlabs/web-grpc 1.3.0 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/google/protobuf/timestamp.ts +1 -1
package/package.json +1 -1
package/proto/gateway/common/v1/status.ts +8 -1
package/proto/gateway/common/v1/status_pb.js +2 -1
package/proto/gateway/common/v1/types.ts +1 -1
package/proto/gateway/web/v1/account_gateway.ts +1 -1
package/proto/gateway/web/v1/automation_gateway.ts +1 -1
package/proto/gateway/web/v1/chain_gateway.ts +1 -1
package/proto/gateway/web/v1/dashboard_gateway.ts +2519 -0
package/proto/gateway/web/v1/dashboard_gateway_grpc_pb.js +220 -0
package/proto/gateway/web/v1/dashboard_gateway_pb.js +4792 -0
package/proto/gateway/web/v1/market_gateway.ts +1 -1
package/proto/gateway/web/v1/metric_gateway.ts +2723 -0
package/proto/gateway/web/v1/metric_gateway_grpc_pb.js +122 -0
package/proto/gateway/web/v1/{telemetry_gateway_pb.js → metric_gateway_pb.js} +2129 -908
package/proto/gateway/web/v1/oauth_gateway.ts +1 -1
package/proto/gateway/web/v1/plan_gateway.ts +1 -1
package/proto/gateway/web/v1/stream_gateway.ts +1 -1
package/proto/gateway/web/v1/trace_gateway.ts +8 -1
package/proto/gateway/web/v1/trace_gateway_pb.js +2 -1
package/proto/gateway/web/v1/telemetry_gateway.ts +0 -2257
package/proto/gateway/web/v1/telemetry_gateway_grpc_pb.js +0 -148

package/proto/gateway/web/v1/{telemetry_gateway_pb.js → metric_gateway_pb.js} RENAMED Viewed

@@ -1,4 +1,4 @@
-// source: proto/gateway/web/v1/telemetry_gateway.proto
+// source: proto/gateway/web/v1/metric_gateway.proto
 /**
  * @fileoverview
  * @enhanceable
@@ -23,29 +23,39 @@ var global =
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 goog.object.extend(proto, google_protobuf_timestamp_pb);
-var proto_gateway_common_v1_status_pb = require('../../../../proto/gateway/common/v1/status_pb.js');
-goog.object.extend(proto, proto_gateway_common_v1_status_pb);
 var proto_gateway_web_v1_trace_gateway_pb = require('../../../../proto/gateway/web/v1/trace_gateway_pb.js');
 goog.object.extend(proto, proto_gateway_web_v1_trace_gateway_pb);
-goog.exportSymbol('proto.gateway.web.v1.ListMetricAttributesRequest', null, global);
-goog.exportSymbol('proto.gateway.web.v1.ListMetricAttributesResponse', null, global);
-goog.exportSymbol('proto.gateway.web.v1.ListMetricsRequest', null, global);
-goog.exportSymbol('proto.gateway.web.v1.ListMetricsResponse', null, global);
-goog.exportSymbol('proto.gateway.web.v1.MetricAggregation', null, global);
-goog.exportSymbol('proto.gateway.web.v1.MetricAnalyticsEnvelope', null, global);
-goog.exportSymbol('proto.gateway.web.v1.MetricAnalyticsEnvelope.EventCase', null, global);
-goog.exportSymbol('proto.gateway.web.v1.MetricAnalyticsSnapshot', null, global);
+goog.exportSymbol('proto.gateway.web.v1.AbsoluteTimeRange', null, global);
+goog.exportSymbol('proto.gateway.web.v1.AttributeFilter', null, global);
+goog.exportSymbol('proto.gateway.web.v1.AttributeFilterOp', null, global);
+goog.exportSymbol('proto.gateway.web.v1.GaugeAggregation', null, global);
+goog.exportSymbol('proto.gateway.web.v1.GaugeQuerySpec', null, global);
+goog.exportSymbol('proto.gateway.web.v1.HistogramAggregation', null, global);
+goog.exportSymbol('proto.gateway.web.v1.HistogramQuerySpec', null, global);
 goog.exportSymbol('proto.gateway.web.v1.MetricAttribute', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricAttributeEnvelope', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricAttributeEnvelope.EventCase', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricAttributeSnapshot', null, global);
 goog.exportSymbol('proto.gateway.web.v1.MetricBucket', null, global);
-goog.exportSymbol('proto.gateway.web.v1.MetricFilter', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricCatalogEnvelope', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricCatalogEnvelope.EventCase', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricCatalogSnapshot', null, global);
 goog.exportSymbol('proto.gateway.web.v1.MetricInfo', null, global);
 goog.exportSymbol('proto.gateway.web.v1.MetricKind', null, global);
 goog.exportSymbol('proto.gateway.web.v1.MetricQuery', null, global);
+goog.exportSymbol('proto.gateway.web.v1.MetricQuery.KindCase', null, global);
 goog.exportSymbol('proto.gateway.web.v1.MetricSeries', null, global);
-goog.exportSymbol('proto.gateway.web.v1.MetricSeriesBucketUpdate', null, global);
-goog.exportSymbol('proto.gateway.web.v1.QueryMetricsRequest', null, global);
-goog.exportSymbol('proto.gateway.web.v1.QueryMetricsResponse', null, global);
-goog.exportSymbol('proto.gateway.web.v1.StreamMetricAnalyticsRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.QueryDataEnvelope', null, global);
+goog.exportSymbol('proto.gateway.web.v1.QueryDataEnvelope.EventCase', null, global);
+goog.exportSymbol('proto.gateway.web.v1.QuerySeriesUpdate', null, global);
+goog.exportSymbol('proto.gateway.web.v1.QuerySnapshot', null, global);
+goog.exportSymbol('proto.gateway.web.v1.StreamMetricAttributesRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.StreamMetricsRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.StreamQueryRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.SumAggregation', null, global);
+goog.exportSymbol('proto.gateway.web.v1.SumQuerySpec', null, global);
+goog.exportSymbol('proto.gateway.web.v1.TimeRange', null, global);
+goog.exportSymbol('proto.gateway.web.v1.TimeRange.RangeCase', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -56,16 +66,16 @@ goog.exportSymbol('proto.gateway.web.v1.StreamMetricAnalyticsRequest', null, glo
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.ListMetricsRequest = function(opt_data) {
+proto.gateway.web.v1.StreamMetricsRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.ListMetricsRequest, jspb.Message);
+goog.inherits(proto.gateway.web.v1.StreamMetricsRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.ListMetricsRequest.displayName = 'proto.gateway.web.v1.ListMetricsRequest';
+  proto.gateway.web.v1.StreamMetricsRequest.displayName = 'proto.gateway.web.v1.StreamMetricsRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -77,16 +87,37 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.ListMetricsResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.ListMetricsResponse.repeatedFields_, null);
+proto.gateway.web.v1.MetricCatalogEnvelope = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.gateway.web.v1.MetricCatalogEnvelope.oneofGroups_);
 };
-goog.inherits(proto.gateway.web.v1.ListMetricsResponse, jspb.Message);
+goog.inherits(proto.gateway.web.v1.MetricCatalogEnvelope, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.ListMetricsResponse.displayName = 'proto.gateway.web.v1.ListMetricsResponse';
+  proto.gateway.web.v1.MetricCatalogEnvelope.displayName = 'proto.gateway.web.v1.MetricCatalogEnvelope';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricCatalogSnapshot.repeatedFields_, null);
+};
+goog.inherits(proto.gateway.web.v1.MetricCatalogSnapshot, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.gateway.web.v1.MetricCatalogSnapshot.displayName = 'proto.gateway.web.v1.MetricCatalogSnapshot';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -119,16 +150,37 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.ListMetricAttributesRequest = function(opt_data) {
+proto.gateway.web.v1.StreamMetricAttributesRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.ListMetricAttributesRequest, jspb.Message);
+goog.inherits(proto.gateway.web.v1.StreamMetricAttributesRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.gateway.web.v1.StreamMetricAttributesRequest.displayName = 'proto.gateway.web.v1.StreamMetricAttributesRequest';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.gateway.web.v1.MetricAttributeEnvelope = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_);
+};
+goog.inherits(proto.gateway.web.v1.MetricAttributeEnvelope, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.ListMetricAttributesRequest.displayName = 'proto.gateway.web.v1.ListMetricAttributesRequest';
+  proto.gateway.web.v1.MetricAttributeEnvelope.displayName = 'proto.gateway.web.v1.MetricAttributeEnvelope';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -140,16 +192,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.ListMetricAttributesResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.ListMetricAttributesResponse.repeatedFields_, null);
+proto.gateway.web.v1.MetricAttributeSnapshot = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricAttributeSnapshot.repeatedFields_, null);
 };
-goog.inherits(proto.gateway.web.v1.ListMetricAttributesResponse, jspb.Message);
+goog.inherits(proto.gateway.web.v1.MetricAttributeSnapshot, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.ListMetricAttributesResponse.displayName = 'proto.gateway.web.v1.ListMetricAttributesResponse';
+  proto.gateway.web.v1.MetricAttributeSnapshot.displayName = 'proto.gateway.web.v1.MetricAttributeSnapshot';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -172,6 +224,27 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.gateway.web.v1.MetricAttribute.displayName = 'proto.gateway.web.v1.MetricAttribute';
 }
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.gateway.web.v1.StreamQueryRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.gateway.web.v1.StreamQueryRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.gateway.web.v1.StreamQueryRequest.displayName = 'proto.gateway.web.v1.StreamQueryRequest';
+}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -183,7 +256,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.gateway.web.v1.MetricQuery = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricQuery.repeatedFields_, null);
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricQuery.repeatedFields_, proto.gateway.web.v1.MetricQuery.oneofGroups_);
 };
 goog.inherits(proto.gateway.web.v1.MetricQuery, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -203,16 +276,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricFilter = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricFilter.repeatedFields_, null);
+proto.gateway.web.v1.GaugeQuerySpec = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.MetricFilter, jspb.Message);
+goog.inherits(proto.gateway.web.v1.GaugeQuerySpec, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricFilter.displayName = 'proto.gateway.web.v1.MetricFilter';
+  proto.gateway.web.v1.GaugeQuerySpec.displayName = 'proto.gateway.web.v1.GaugeQuerySpec';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -224,16 +297,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.QueryMetricsRequest = function(opt_data) {
+proto.gateway.web.v1.SumQuerySpec = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.QueryMetricsRequest, jspb.Message);
+goog.inherits(proto.gateway.web.v1.SumQuerySpec, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.QueryMetricsRequest.displayName = 'proto.gateway.web.v1.QueryMetricsRequest';
+  proto.gateway.web.v1.SumQuerySpec.displayName = 'proto.gateway.web.v1.SumQuerySpec';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -245,16 +318,58 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.QueryMetricsResponse = function(opt_data) {
+proto.gateway.web.v1.HistogramQuerySpec = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.QueryMetricsResponse, jspb.Message);
+goog.inherits(proto.gateway.web.v1.HistogramQuerySpec, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.gateway.web.v1.HistogramQuerySpec.displayName = 'proto.gateway.web.v1.HistogramQuerySpec';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.gateway.web.v1.AttributeFilter = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.AttributeFilter.repeatedFields_, null);
+};
+goog.inherits(proto.gateway.web.v1.AttributeFilter, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.gateway.web.v1.AttributeFilter.displayName = 'proto.gateway.web.v1.AttributeFilter';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.gateway.web.v1.TimeRange = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.gateway.web.v1.TimeRange.oneofGroups_);
+};
+goog.inherits(proto.gateway.web.v1.TimeRange, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.QueryMetricsResponse.displayName = 'proto.gateway.web.v1.QueryMetricsResponse';
+  proto.gateway.web.v1.TimeRange.displayName = 'proto.gateway.web.v1.TimeRange';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -266,16 +381,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest = function(opt_data) {
+proto.gateway.web.v1.AbsoluteTimeRange = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.StreamMetricAnalyticsRequest, jspb.Message);
+goog.inherits(proto.gateway.web.v1.AbsoluteTimeRange, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.StreamMetricAnalyticsRequest.displayName = 'proto.gateway.web.v1.StreamMetricAnalyticsRequest';
+  proto.gateway.web.v1.AbsoluteTimeRange.displayName = 'proto.gateway.web.v1.AbsoluteTimeRange';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -287,16 +402,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.gateway.web.v1.MetricAnalyticsEnvelope.oneofGroups_);
+proto.gateway.web.v1.QueryDataEnvelope = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.gateway.web.v1.QueryDataEnvelope.oneofGroups_);
 };
-goog.inherits(proto.gateway.web.v1.MetricAnalyticsEnvelope, jspb.Message);
+goog.inherits(proto.gateway.web.v1.QueryDataEnvelope, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricAnalyticsEnvelope.displayName = 'proto.gateway.web.v1.MetricAnalyticsEnvelope';
+  proto.gateway.web.v1.QueryDataEnvelope.displayName = 'proto.gateway.web.v1.QueryDataEnvelope';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -308,16 +423,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricAnalyticsSnapshot.repeatedFields_, null);
+proto.gateway.web.v1.QuerySnapshot = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.QuerySnapshot.repeatedFields_, null);
 };
-goog.inherits(proto.gateway.web.v1.MetricAnalyticsSnapshot, jspb.Message);
+goog.inherits(proto.gateway.web.v1.QuerySnapshot, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricAnalyticsSnapshot.displayName = 'proto.gateway.web.v1.MetricAnalyticsSnapshot';
+  proto.gateway.web.v1.QuerySnapshot.displayName = 'proto.gateway.web.v1.QuerySnapshot';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -371,16 +486,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate = function(opt_data) {
+proto.gateway.web.v1.QuerySeriesUpdate = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.MetricSeriesBucketUpdate, jspb.Message);
+goog.inherits(proto.gateway.web.v1.QuerySeriesUpdate, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricSeriesBucketUpdate.displayName = 'proto.gateway.web.v1.MetricSeriesBucketUpdate';
+  proto.gateway.web.v1.QuerySeriesUpdate.displayName = 'proto.gateway.web.v1.QuerySeriesUpdate';
 }
@@ -398,8 +513,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.ListMetricsRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.ListMetricsRequest.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.StreamMetricsRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.StreamMetricsRequest.toObject(opt_includeInstance, this);
 };
@@ -408,14 +523,14 @@ proto.gateway.web.v1.ListMetricsRequest.prototype.toObject = function(opt_includ
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.ListMetricsRequest} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.StreamMetricsRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricsRequest.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.StreamMetricsRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-projectId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-organizationId: jspb.Message.getFieldWithDefault(msg, 2, "")
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
   if (includeInstance) {
@@ -429,23 +544,23 @@ organizationId: jspb.Message.getFieldWithDefault(msg, 2, "")
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.ListMetricsRequest}
+ * @return {!proto.gateway.web.v1.StreamMetricsRequest}
  */
-proto.gateway.web.v1.ListMetricsRequest.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.StreamMetricsRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.ListMetricsRequest;
-  return proto.gateway.web.v1.ListMetricsRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.StreamMetricsRequest;
+  return proto.gateway.web.v1.StreamMetricsRequest.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.ListMetricsRequest} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.StreamMetricsRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.ListMetricsRequest}
+ * @return {!proto.gateway.web.v1.StreamMetricsRequest}
  */
-proto.gateway.web.v1.ListMetricsRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.StreamMetricsRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -454,11 +569,11 @@ proto.gateway.web.v1.ListMetricsRequest.deserializeBinaryFromReader = function(m
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setProjectId(value);
+      msg.setOrganizationId(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setOrganizationId(value);
+      msg.setProjectId(value);
       break;
     default:
       reader.skipField();
@@ -473,9 +588,9 @@ proto.gateway.web.v1.ListMetricsRequest.deserializeBinaryFromReader = function(m
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.ListMetricsRequest.prototype.serializeBinary = function() {
+proto.gateway.web.v1.StreamMetricsRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.ListMetricsRequest.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.StreamMetricsRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -483,20 +598,20 @@ proto.gateway.web.v1.ListMetricsRequest.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.ListMetricsRequest} message
+ * @param {!proto.gateway.web.v1.StreamMetricsRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricsRequest.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.StreamMetricsRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getProjectId();
+  f = message.getOrganizationId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getOrganizationId();
+  f = message.getProjectId();
   if (f.length > 0) {
     writer.writeString(
       2,
@@ -507,48 +622,67 @@ proto.gateway.web.v1.ListMetricsRequest.serializeBinaryToWriter = function(messa
 /**
- * optional string project_id = 1;
+ * optional string organization_id = 1;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricsRequest.prototype.getProjectId = function() {
+proto.gateway.web.v1.StreamMetricsRequest.prototype.getOrganizationId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.ListMetricsRequest} returns this
+ * @return {!proto.gateway.web.v1.StreamMetricsRequest} returns this
  */
-proto.gateway.web.v1.ListMetricsRequest.prototype.setProjectId = function(value) {
+proto.gateway.web.v1.StreamMetricsRequest.prototype.setOrganizationId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * optional string organization_id = 2;
+ * optional string project_id = 2;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricsRequest.prototype.getOrganizationId = function() {
+proto.gateway.web.v1.StreamMetricsRequest.prototype.getProjectId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.ListMetricsRequest} returns this
+ * @return {!proto.gateway.web.v1.StreamMetricsRequest} returns this
  */
-proto.gateway.web.v1.ListMetricsRequest.prototype.setOrganizationId = function(value) {
+proto.gateway.web.v1.StreamMetricsRequest.prototype.setProjectId = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
+ * Oneof group definitions for this message. Each group defines the field
+ * numbers belonging to that group. When of these fields' value is set, all
+ * other fields in the group are cleared. During deserialization, if multiple
+ * fields are encountered for a group, only the last value seen will be kept.
+ * @private {!Array<!Array<number>>}
  * @const
  */
-proto.gateway.web.v1.ListMetricsResponse.repeatedFields_ = [2];
+proto.gateway.web.v1.MetricCatalogEnvelope.oneofGroups_ = [[1,2]];
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.MetricCatalogEnvelope.EventCase = {
+  EVENT_NOT_SET: 0,
+  SNAPSHOT: 1,
+  ADDED: 2
+};
+/**
+ * @return {proto.gateway.web.v1.MetricCatalogEnvelope.EventCase}
+ */
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.getEventCase = function() {
+  return /** @type {proto.gateway.web.v1.MetricCatalogEnvelope.EventCase} */(jspb.Message.computeOneofCase(this, proto.gateway.web.v1.MetricCatalogEnvelope.oneofGroups_[0]));
+};
@@ -565,8 +699,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.ListMetricsResponse.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricCatalogEnvelope.toObject(opt_includeInstance, this);
 };
@@ -575,15 +709,14 @@ proto.gateway.web.v1.ListMetricsResponse.prototype.toObject = function(opt_inclu
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.ListMetricsResponse} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.MetricCatalogEnvelope} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricsResponse.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.MetricCatalogEnvelope.toObject = function(includeInstance, msg) {
   var f, obj = {
-status: (f = msg.getStatus()) && proto_gateway_common_v1_status_pb.ResponseStatus.toObject(includeInstance, f),
-metricsList: jspb.Message.toObjectList(msg.getMetricsList(),
-    proto.gateway.web.v1.MetricInfo.toObject, includeInstance)
+snapshot: (f = msg.getSnapshot()) && proto.gateway.web.v1.MetricCatalogSnapshot.toObject(includeInstance, f),
+added: (f = msg.getAdded()) && proto.gateway.web.v1.MetricInfo.toObject(includeInstance, f)
   };
   if (includeInstance) {
@@ -597,23 +730,23 @@ metricsList: jspb.Message.toObjectList(msg.getMetricsList(),
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.ListMetricsResponse}
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope}
  */
-proto.gateway.web.v1.ListMetricsResponse.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricCatalogEnvelope.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.ListMetricsResponse;
-  return proto.gateway.web.v1.ListMetricsResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.MetricCatalogEnvelope;
+  return proto.gateway.web.v1.MetricCatalogEnvelope.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.ListMetricsResponse} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.MetricCatalogEnvelope} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.ListMetricsResponse}
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope}
  */
-proto.gateway.web.v1.ListMetricsResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricCatalogEnvelope.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -621,14 +754,14 @@ proto.gateway.web.v1.ListMetricsResponse.deserializeBinaryFromReader = function(
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto_gateway_common_v1_status_pb.ResponseStatus;
-      reader.readMessage(value,proto_gateway_common_v1_status_pb.ResponseStatus.deserializeBinaryFromReader);
-      msg.setStatus(value);
+      var value = new proto.gateway.web.v1.MetricCatalogSnapshot;
+      reader.readMessage(value,proto.gateway.web.v1.MetricCatalogSnapshot.deserializeBinaryFromReader);
+      msg.setSnapshot(value);
       break;
     case 2:
       var value = new proto.gateway.web.v1.MetricInfo;
       reader.readMessage(value,proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader);
-      msg.addMetrics(value);
+      msg.setAdded(value);
       break;
     default:
       reader.skipField();
@@ -643,9 +776,9 @@ proto.gateway.web.v1.ListMetricsResponse.deserializeBinaryFromReader = function(
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.serializeBinary = function() {
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.ListMetricsResponse.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.MetricCatalogEnvelope.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -653,23 +786,23 @@ proto.gateway.web.v1.ListMetricsResponse.prototype.serializeBinary = function()
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.ListMetricsResponse} message
+ * @param {!proto.gateway.web.v1.MetricCatalogEnvelope} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricsResponse.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.MetricCatalogEnvelope.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getStatus();
+  f = message.getSnapshot();
   if (f != null) {
     writer.writeMessage(
       1,
       f,
-      proto_gateway_common_v1_status_pb.ResponseStatus.serializeBinaryToWriter
+      proto.gateway.web.v1.MetricCatalogSnapshot.serializeBinaryToWriter
     );
   }
-  f = message.getMetricsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
+  f = message.getAdded();
+  if (f != null) {
+    writer.writeMessage(
       2,
       f,
       proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter
@@ -679,30 +812,30 @@ proto.gateway.web.v1.ListMetricsResponse.serializeBinaryToWriter = function(mess
 /**
- * optional gateway.common.v1.ResponseStatus status = 1;
- * @return {?proto.gateway.common.v1.ResponseStatus}
+ * optional MetricCatalogSnapshot snapshot = 1;
+ * @return {?proto.gateway.web.v1.MetricCatalogSnapshot}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.getStatus = function() {
-  return /** @type{?proto.gateway.common.v1.ResponseStatus} */ (
-    jspb.Message.getWrapperField(this, proto_gateway_common_v1_status_pb.ResponseStatus, 1));
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.getSnapshot = function() {
+  return /** @type{?proto.gateway.web.v1.MetricCatalogSnapshot} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricCatalogSnapshot, 1));
 };
 /**
- * @param {?proto.gateway.common.v1.ResponseStatus|undefined} value
- * @return {!proto.gateway.web.v1.ListMetricsResponse} returns this
+ * @param {?proto.gateway.web.v1.MetricCatalogSnapshot|undefined} value
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope} returns this
 */
-proto.gateway.web.v1.ListMetricsResponse.prototype.setStatus = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.setSnapshot = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1, proto.gateway.web.v1.MetricCatalogEnvelope.oneofGroups_[0], value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.ListMetricsResponse} returns this
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope} returns this
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.clearStatus = function() {
-  return this.setStatus(undefined);
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.clearSnapshot = function() {
+  return this.setSnapshot(undefined);
 };
@@ -710,50 +843,56 @@ proto.gateway.web.v1.ListMetricsResponse.prototype.clearStatus = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.hasStatus = function() {
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.hasSnapshot = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 /**
- * repeated MetricInfo metrics = 2;
- * @return {!Array<!proto.gateway.web.v1.MetricInfo>}
+ * optional MetricInfo added = 2;
+ * @return {?proto.gateway.web.v1.MetricInfo}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.getMetricsList = function() {
-  return /** @type{!Array<!proto.gateway.web.v1.MetricInfo>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricInfo, 2));
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.getAdded = function() {
+  return /** @type{?proto.gateway.web.v1.MetricInfo} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricInfo, 2));
 };
 /**
- * @param {!Array<!proto.gateway.web.v1.MetricInfo>} value
- * @return {!proto.gateway.web.v1.ListMetricsResponse} returns this
+ * @param {?proto.gateway.web.v1.MetricInfo|undefined} value
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope} returns this
 */
-proto.gateway.web.v1.ListMetricsResponse.prototype.setMetricsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 2, value);
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.setAdded = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.MetricCatalogEnvelope.oneofGroups_[0], value);
 };
 /**
- * @param {!proto.gateway.web.v1.MetricInfo=} opt_value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricInfo}
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope} returns this
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.addMetrics = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.gateway.web.v1.MetricInfo, opt_index);
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.clearAdded = function() {
+  return this.setAdded(undefined);
 };
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.ListMetricsResponse} returns this
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.clearMetricsList = function() {
-  return this.setMetricsList([]);
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.hasAdded = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot.repeatedFields_ = [1];
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -769,8 +908,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricInfo.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricInfo.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricCatalogSnapshot.toObject(opt_includeInstance, this);
 };
@@ -779,15 +918,14 @@ proto.gateway.web.v1.MetricInfo.prototype.toObject = function(opt_includeInstanc
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricInfo} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.MetricCatalogSnapshot} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricInfo.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.MetricCatalogSnapshot.toObject = function(includeInstance, msg) {
   var f, obj = {
-name: jspb.Message.getFieldWithDefault(msg, 1, ""),
-unit: jspb.Message.getFieldWithDefault(msg, 2, ""),
-kind: jspb.Message.getFieldWithDefault(msg, 3, 0)
+metricsList: jspb.Message.toObjectList(msg.getMetricsList(),
+    proto.gateway.web.v1.MetricInfo.toObject, includeInstance)
   };
   if (includeInstance) {
@@ -801,23 +939,23 @@ kind: jspb.Message.getFieldWithDefault(msg, 3, 0)
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricInfo}
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot}
  */
-proto.gateway.web.v1.MetricInfo.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricCatalogSnapshot.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricInfo;
-  return proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.MetricCatalogSnapshot;
+  return proto.gateway.web.v1.MetricCatalogSnapshot.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricInfo} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.MetricCatalogSnapshot} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricInfo}
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot}
  */
-proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricCatalogSnapshot.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -825,16 +963,9 @@ proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader = function(msg, read
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setUnit(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.gateway.web.v1.MetricKind} */ (reader.readEnum());
-      msg.setKind(value);
+      var value = new proto.gateway.web.v1.MetricInfo;
+      reader.readMessage(value,proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader);
+      msg.addMetrics(value);
       break;
     default:
       reader.skipField();
@@ -849,9 +980,9 @@ proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader = function(msg, read
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricInfo.prototype.serializeBinary = function() {
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.MetricCatalogSnapshot.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -859,87 +990,58 @@ proto.gateway.web.v1.MetricInfo.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricInfo} message
+ * @param {!proto.gateway.web.v1.MetricCatalogSnapshot} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.MetricCatalogSnapshot.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getName();
+  f = message.getMetricsList();
   if (f.length > 0) {
-    writer.writeString(
+    writer.writeRepeatedMessage(
       1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
+      f,
+      proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter
     );
   }
 };
 /**
- * optional string name = 1;
- * @return {string}
- */
-proto.gateway.web.v1.MetricInfo.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-/**
- * @param {string} value
- * @return {!proto.gateway.web.v1.MetricInfo} returns this
- */
-proto.gateway.web.v1.MetricInfo.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-/**
- * optional string unit = 2;
- * @return {string}
+ * repeated MetricInfo metrics = 1;
+ * @return {!Array<!proto.gateway.web.v1.MetricInfo>}
  */
-proto.gateway.web.v1.MetricInfo.prototype.getUnit = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.getMetricsList = function() {
+  return /** @type{!Array<!proto.gateway.web.v1.MetricInfo>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricInfo, 1));
 };
 /**
- * @param {string} value
- * @return {!proto.gateway.web.v1.MetricInfo} returns this
- */
-proto.gateway.web.v1.MetricInfo.prototype.setUnit = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
+ * @param {!Array<!proto.gateway.web.v1.MetricInfo>} value
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot} returns this
+*/
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.setMetricsList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
 /**
- * optional MetricKind kind = 3;
- * @return {!proto.gateway.web.v1.MetricKind}
+ * @param {!proto.gateway.web.v1.MetricInfo=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.gateway.web.v1.MetricInfo}
  */
-proto.gateway.web.v1.MetricInfo.prototype.getKind = function() {
-  return /** @type {!proto.gateway.web.v1.MetricKind} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.addMetrics = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.gateway.web.v1.MetricInfo, opt_index);
 };
 /**
- * @param {!proto.gateway.web.v1.MetricKind} value
- * @return {!proto.gateway.web.v1.MetricInfo} returns this
+ * Clears the list making it empty but non-null.
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot} returns this
  */
-proto.gateway.web.v1.MetricInfo.prototype.setKind = function(value) {
-  return jspb.Message.setProto3EnumField(this, 3, value);
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.clearMetricsList = function() {
+  return this.setMetricsList([]);
 };
@@ -959,8 +1061,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.ListMetricAttributesRequest.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.MetricInfo.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricInfo.toObject(opt_includeInstance, this);
 };
@@ -969,15 +1071,15 @@ proto.gateway.web.v1.ListMetricAttributesRequest.prototype.toObject = function(o
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.ListMetricAttributesRequest} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.MetricInfo} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.MetricInfo.toObject = function(includeInstance, msg) {
   var f, obj = {
-projectId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-metricName: jspb.Message.getFieldWithDefault(msg, 2, ""),
-organizationId: jspb.Message.getFieldWithDefault(msg, 3, "")
+name: jspb.Message.getFieldWithDefault(msg, 1, ""),
+unit: jspb.Message.getFieldWithDefault(msg, 2, ""),
+kind: jspb.Message.getFieldWithDefault(msg, 3, 0)
   };
   if (includeInstance) {
@@ -991,23 +1093,23 @@ organizationId: jspb.Message.getFieldWithDefault(msg, 3, "")
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.ListMetricAttributesRequest}
+ * @return {!proto.gateway.web.v1.MetricInfo}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricInfo.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.ListMetricAttributesRequest;
-  return proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.MetricInfo;
+  return proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.ListMetricAttributesRequest} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.MetricInfo} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.ListMetricAttributesRequest}
+ * @return {!proto.gateway.web.v1.MetricInfo}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1016,15 +1118,15 @@ proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinaryFromReader = f
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setProjectId(value);
+      msg.setName(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setMetricName(value);
+      msg.setUnit(value);
       break;
     case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setOrganizationId(value);
+      var value = /** @type {!proto.gateway.web.v1.MetricKind} */ (reader.readEnum());
+      msg.setKind(value);
       break;
     default:
       reader.skipField();
@@ -1039,9 +1141,9 @@ proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinaryFromReader = f
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.serializeBinary = function() {
+proto.gateway.web.v1.MetricInfo.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.ListMetricAttributesRequest.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -1049,29 +1151,29 @@ proto.gateway.web.v1.ListMetricAttributesRequest.prototype.serializeBinary = fun
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.ListMetricAttributesRequest} message
+ * @param {!proto.gateway.web.v1.MetricInfo} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getProjectId();
+  f = message.getName();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getMetricName();
+  f = message.getUnit();
   if (f.length > 0) {
     writer.writeString(
       2,
       f
     );
   }
-  f = message.getOrganizationId();
-  if (f.length > 0) {
-    writer.writeString(
+  f = message.getKind();
+  if (f !== 0.0) {
+    writer.writeEnum(
       3,
       f
     );
@@ -1080,67 +1182,60 @@ proto.gateway.web.v1.ListMetricAttributesRequest.serializeBinaryToWriter = funct
 /**
- * optional string project_id = 1;
+ * optional string name = 1;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.getProjectId = function() {
+proto.gateway.web.v1.MetricInfo.prototype.getName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesRequest} returns this
+ * @return {!proto.gateway.web.v1.MetricInfo} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.setProjectId = function(value) {
+proto.gateway.web.v1.MetricInfo.prototype.setName = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * optional string metric_name = 2;
+ * optional string unit = 2;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.getMetricName = function() {
+proto.gateway.web.v1.MetricInfo.prototype.getUnit = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesRequest} returns this
+ * @return {!proto.gateway.web.v1.MetricInfo} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.setMetricName = function(value) {
+proto.gateway.web.v1.MetricInfo.prototype.setUnit = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * optional string organization_id = 3;
- * @return {string}
+ * optional MetricKind kind = 3;
+ * @return {!proto.gateway.web.v1.MetricKind}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.getOrganizationId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+proto.gateway.web.v1.MetricInfo.prototype.getKind = function() {
+  return /** @type {!proto.gateway.web.v1.MetricKind} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 /**
- * @param {string} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesRequest} returns this
+ * @param {!proto.gateway.web.v1.MetricKind} value
+ * @return {!proto.gateway.web.v1.MetricInfo} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.setOrganizationId = function(value) {
-  return jspb.Message.setProto3StringField(this, 3, value);
+proto.gateway.web.v1.MetricInfo.prototype.setKind = function(value) {
+  return jspb.Message.setProto3EnumField(this, 3, value);
 };
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.gateway.web.v1.ListMetricAttributesResponse.repeatedFields_ = [2];
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1156,8 +1251,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.ListMetricAttributesResponse.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.StreamMetricAttributesRequest.toObject(opt_includeInstance, this);
 };
@@ -1166,15 +1261,15 @@ proto.gateway.web.v1.ListMetricAttributesResponse.prototype.toObject = function(
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.ListMetricAttributesResponse} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.StreamMetricAttributesRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-status: (f = msg.getStatus()) && proto_gateway_common_v1_status_pb.ResponseStatus.toObject(includeInstance, f),
-attributesList: jspb.Message.toObjectList(msg.getAttributesList(),
-    proto.gateway.web.v1.MetricAttribute.toObject, includeInstance)
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+metricName: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
   if (includeInstance) {
@@ -1188,23 +1283,23 @@ attributesList: jspb.Message.toObjectList(msg.getAttributesList(),
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse}
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.ListMetricAttributesResponse;
-  return proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.StreamMetricAttributesRequest;
+  return proto.gateway.web.v1.StreamMetricAttributesRequest.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.ListMetricAttributesResponse} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.StreamMetricAttributesRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse}
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1212,14 +1307,16 @@ proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinaryFromReader =
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto_gateway_common_v1_status_pb.ResponseStatus;
-      reader.readMessage(value,proto_gateway_common_v1_status_pb.ResponseStatus.deserializeBinaryFromReader);
-      msg.setStatus(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setOrganizationId(value);
       break;
     case 2:
-      var value = new proto.gateway.web.v1.MetricAttribute;
-      reader.readMessage(value,proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader);
-      msg.addAttributes(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setProjectId(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMetricName(value);
       break;
     default:
       reader.skipField();
@@ -1234,9 +1331,9 @@ proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinaryFromReader =
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.serializeBinary = function() {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.ListMetricAttributesResponse.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.StreamMetricAttributesRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -1244,113 +1341,116 @@ proto.gateway.web.v1.ListMetricAttributesResponse.prototype.serializeBinary = fu
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.ListMetricAttributesResponse} message
+ * @param {!proto.gateway.web.v1.StreamMetricAttributesRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getOrganizationId();
+  if (f.length > 0) {
+    writer.writeString(
       1,
-      f,
-      proto_gateway_common_v1_status_pb.ResponseStatus.serializeBinaryToWriter
+      f
     );
   }
-  f = message.getAttributesList();
+  f = message.getProjectId();
   if (f.length > 0) {
-    writer.writeRepeatedMessage(
+    writer.writeString(
       2,
-      f,
-      proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter
+      f
+    );
+  }
+  f = message.getMetricName();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
     );
   }
 };
 /**
- * optional gateway.common.v1.ResponseStatus status = 1;
- * @return {?proto.gateway.common.v1.ResponseStatus}
+ * optional string organization_id = 1;
+ * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.getStatus = function() {
-  return /** @type{?proto.gateway.common.v1.ResponseStatus} */ (
-    jspb.Message.getWrapperField(this, proto_gateway_common_v1_status_pb.ResponseStatus, 1));
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.getOrganizationId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
- * @param {?proto.gateway.common.v1.ResponseStatus|undefined} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
-*/
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.setStatus = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest} returns this
+ */
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.setOrganizationId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
+ * optional string project_id = 2;
+ * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.clearStatus = function() {
-  return this.setStatus(undefined);
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.getProjectId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 1) != null;
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.setProjectId = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * repeated MetricAttribute attributes = 2;
- * @return {!Array<!proto.gateway.web.v1.MetricAttribute>}
+ * optional string metric_name = 3;
+ * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.getAttributesList = function() {
-  return /** @type{!Array<!proto.gateway.web.v1.MetricAttribute>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricAttribute, 2));
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.getMetricName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 /**
- * @param {!Array<!proto.gateway.web.v1.MetricAttribute>} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
-*/
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.setAttributesList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 2, value);
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest} returns this
+ */
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.setMetricName = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
 };
 /**
- * @param {!proto.gateway.web.v1.MetricAttribute=} opt_value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricAttribute}
+ * Oneof group definitions for this message. Each group defines the field
+ * numbers belonging to that group. When of these fields' value is set, all
+ * other fields in the group are cleared. During deserialization, if multiple
+ * fields are encountered for a group, only the last value seen will be kept.
+ * @private {!Array<!Array<number>>}
+ * @const
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.addAttributes = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.gateway.web.v1.MetricAttribute, opt_index);
-};
+proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_ = [[1,2]];
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
+ * @enum {number}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.clearAttributesList = function() {
-  return this.setAttributesList([]);
+proto.gateway.web.v1.MetricAttributeEnvelope.EventCase = {
+  EVENT_NOT_SET: 0,
+  SNAPSHOT: 1,
+  ADDED: 2
 };
 /**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
+ * @return {proto.gateway.web.v1.MetricAttributeEnvelope.EventCase}
  */
-proto.gateway.web.v1.MetricAttribute.repeatedFields_ = [2];
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.getEventCase = function() {
+  return /** @type {proto.gateway.web.v1.MetricAttributeEnvelope.EventCase} */(jspb.Message.computeOneofCase(this, proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_[0]));
+};
@@ -1367,8 +1467,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricAttribute.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricAttribute.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricAttributeEnvelope.toObject(opt_includeInstance, this);
 };
@@ -1377,14 +1477,14 @@ proto.gateway.web.v1.MetricAttribute.prototype.toObject = function(opt_includeIn
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricAttribute} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.MetricAttributeEnvelope} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricAttribute.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.MetricAttributeEnvelope.toObject = function(includeInstance, msg) {
   var f, obj = {
-key: jspb.Message.getFieldWithDefault(msg, 1, ""),
-valuesList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? undefined : f
+snapshot: (f = msg.getSnapshot()) && proto.gateway.web.v1.MetricAttributeSnapshot.toObject(includeInstance, f),
+added: (f = msg.getAdded()) && proto.gateway.web.v1.MetricAttribute.toObject(includeInstance, f)
   };
   if (includeInstance) {
@@ -1398,23 +1498,23 @@ valuesList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? undefined : f
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricAttribute}
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope}
  */
-proto.gateway.web.v1.MetricAttribute.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricAttributeEnvelope.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricAttribute;
-  return proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.MetricAttributeEnvelope;
+  return proto.gateway.web.v1.MetricAttributeEnvelope.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricAttribute} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.MetricAttributeEnvelope} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricAttribute}
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope}
  */
-proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricAttributeEnvelope.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1422,12 +1522,14 @@ proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader = function(msg,
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setKey(value);
+      var value = new proto.gateway.web.v1.MetricAttributeSnapshot;
+      reader.readMessage(value,proto.gateway.web.v1.MetricAttributeSnapshot.deserializeBinaryFromReader);
+      msg.setSnapshot(value);
       break;
     case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addValues(value);
+      var value = new proto.gateway.web.v1.MetricAttribute;
+      reader.readMessage(value,proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader);
+      msg.setAdded(value);
       break;
     default:
       reader.skipField();
@@ -1442,9 +1544,9 @@ proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader = function(msg,
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricAttribute.prototype.serializeBinary = function() {
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.MetricAttributeEnvelope.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -1452,81 +1554,102 @@ proto.gateway.web.v1.MetricAttribute.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricAttribute} message
+ * @param {!proto.gateway.web.v1.MetricAttributeEnvelope} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.MetricAttributeEnvelope.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getKey();
-  if (f.length > 0) {
-    writer.writeString(
+  f = message.getSnapshot();
+  if (f != null) {
+    writer.writeMessage(
       1,
-      f
+      f,
+      proto.gateway.web.v1.MetricAttributeSnapshot.serializeBinaryToWriter
     );
   }
-  f = message.getValuesList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
+  f = message.getAdded();
+  if (f != null) {
+    writer.writeMessage(
       2,
-      f
+      f,
+      proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter
     );
   }
 };
 /**
- * optional string key = 1;
- * @return {string}
+ * optional MetricAttributeSnapshot snapshot = 1;
+ * @return {?proto.gateway.web.v1.MetricAttributeSnapshot}
  */
-proto.gateway.web.v1.MetricAttribute.prototype.getKey = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.getSnapshot = function() {
+  return /** @type{?proto.gateway.web.v1.MetricAttributeSnapshot} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricAttributeSnapshot, 1));
 };
 /**
- * @param {string} value
- * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ * @param {?proto.gateway.web.v1.MetricAttributeSnapshot|undefined} value
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
+*/
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.setSnapshot = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1, proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_[0], value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
  */
-proto.gateway.web.v1.MetricAttribute.prototype.setKey = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.clearSnapshot = function() {
+  return this.setSnapshot(undefined);
 };
 /**
- * repeated string values = 2;
- * @return {!Array<string>}
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.gateway.web.v1.MetricAttribute.prototype.getValuesList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 2));
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.hasSnapshot = function() {
+  return jspb.Message.getField(this, 1) != null;
 };
 /**
- * @param {!Array<string>} value
- * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ * optional MetricAttribute added = 2;
+ * @return {?proto.gateway.web.v1.MetricAttribute}
  */
-proto.gateway.web.v1.MetricAttribute.prototype.setValuesList = function(value) {
-  return jspb.Message.setField(this, 2, value || []);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.getAdded = function() {
+  return /** @type{?proto.gateway.web.v1.MetricAttribute} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricAttribute, 2));
 };
 /**
- * @param {string} value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ * @param {?proto.gateway.web.v1.MetricAttribute|undefined} value
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
+*/
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.setAdded = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_[0], value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
  */
-proto.gateway.web.v1.MetricAttribute.prototype.addValues = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 2, value, opt_index);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.clearAdded = function() {
+  return this.setAdded(undefined);
 };
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.gateway.web.v1.MetricAttribute.prototype.clearValuesList = function() {
-  return this.setValuesList([]);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.hasAdded = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
@@ -1536,7 +1659,7 @@ proto.gateway.web.v1.MetricAttribute.prototype.clearValuesList = function() {
  * @private {!Array<number>}
  * @const
  */
-proto.gateway.web.v1.MetricQuery.repeatedFields_ = [4];
+proto.gateway.web.v1.MetricAttributeSnapshot.repeatedFields_ = [1];
@@ -1553,8 +1676,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricQuery.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricQuery.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.MetricAttributeSnapshot.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricAttributeSnapshot.toObject(opt_includeInstance, this);
 };
@@ -1563,20 +1686,14 @@ proto.gateway.web.v1.MetricQuery.prototype.toObject = function(opt_includeInstan
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricQuery} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.MetricAttributeSnapshot} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricQuery.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.MetricAttributeSnapshot.toObject = function(includeInstance, msg) {
   var f, obj = {
-projectId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-metricName: jspb.Message.getFieldWithDefault(msg, 2, ""),
-filter: (f = msg.getFilter()) && proto.gateway.web.v1.MetricFilter.toObject(includeInstance, f),
-groupByList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f,
-aggregation: jspb.Message.getFieldWithDefault(msg, 5, 0),
-timeWindow: jspb.Message.getFieldWithDefault(msg, 6, 0),
-timeInterval: jspb.Message.getFieldWithDefault(msg, 7, 0),
-organizationId: jspb.Message.getFieldWithDefault(msg, 8, "")
+attributesList: jspb.Message.toObjectList(msg.getAttributesList(),
+    proto.gateway.web.v1.MetricAttribute.toObject, includeInstance)
   };
   if (includeInstance) {
@@ -1590,23 +1707,23 @@ organizationId: jspb.Message.getFieldWithDefault(msg, 8, "")
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricQuery}
+ * @return {!proto.gateway.web.v1.MetricAttributeSnapshot}
  */
-proto.gateway.web.v1.MetricQuery.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricAttributeSnapshot.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricQuery;
-  return proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.MetricAttributeSnapshot;
+  return proto.gateway.web.v1.MetricAttributeSnapshot.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricQuery} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.MetricAttributeSnapshot} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricQuery}
+ * @return {!proto.gateway.web.v1.MetricAttributeSnapshot}
  */
-proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricAttributeSnapshot.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1614,38 +1731,708 @@ proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader = function(msg, rea
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setProjectId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setMetricName(value);
-      break;
-    case 3:
-      var value = new proto.gateway.web.v1.MetricFilter;
-      reader.readMessage(value,proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader);
-      msg.setFilter(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addGroupBy(value);
-      break;
-    case 5:
-      var value = /** @type {!proto.gateway.web.v1.MetricAggregation} */ (reader.readEnum());
-      msg.setAggregation(value);
-      break;
-    case 6:
-      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (reader.readEnum());
-      msg.setTimeWindow(value);
+      var value = new proto.gateway.web.v1.MetricAttribute;
+      reader.readMessage(value,proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader);
+      msg.addAttributes(value);
       break;
-    case 7:
-      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (reader.readEnum());
-      msg.setTimeInterval(value);
+    default:
+      reader.skipField();
       break;
-    case 8:
-      var value = /** @type {string} */ (reader.readString());
+    }
+  }
+  return msg;
+};
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.gateway.web.v1.MetricAttributeSnapshot.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.gateway.web.v1.MetricAttributeSnapshot.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.gateway.web.v1.MetricAttributeSnapshot} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.MetricAttributeSnapshot.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getAttributesList();
+  if (f.length > 0) {
+    writer.writeRepeatedMessage(
+      1,
+      f,
+      proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter
+    );
+  }
+};
+/**
+ * repeated MetricAttribute attributes = 1;
+ * @return {!Array<!proto.gateway.web.v1.MetricAttribute>}
+ */
+proto.gateway.web.v1.MetricAttributeSnapshot.prototype.getAttributesList = function() {
+  return /** @type{!Array<!proto.gateway.web.v1.MetricAttribute>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricAttribute, 1));
+};
+/**
+ * @param {!Array<!proto.gateway.web.v1.MetricAttribute>} value
+ * @return {!proto.gateway.web.v1.MetricAttributeSnapshot} returns this
+*/
+proto.gateway.web.v1.MetricAttributeSnapshot.prototype.setAttributesList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
+};
+/**
+ * @param {!proto.gateway.web.v1.MetricAttribute=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.gateway.web.v1.MetricAttribute}
+ */
+proto.gateway.web.v1.MetricAttributeSnapshot.prototype.addAttributes = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.gateway.web.v1.MetricAttribute, opt_index);
+};
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.gateway.web.v1.MetricAttributeSnapshot} returns this
+ */
+proto.gateway.web.v1.MetricAttributeSnapshot.prototype.clearAttributesList = function() {
+  return this.setAttributesList([]);
+};
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.gateway.web.v1.MetricAttribute.repeatedFields_ = [2];
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricAttribute.toObject(opt_includeInstance, this);
+};
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.gateway.web.v1.MetricAttribute} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.MetricAttribute.toObject = function(includeInstance, msg) {
+  var f, obj = {
+key: jspb.Message.getFieldWithDefault(msg, 1, ""),
+valuesList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? undefined : f
+  };
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.gateway.web.v1.MetricAttribute}
+ */
+proto.gateway.web.v1.MetricAttribute.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.gateway.web.v1.MetricAttribute;
+  return proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader(msg, reader);
+};
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.gateway.web.v1.MetricAttribute} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.gateway.web.v1.MetricAttribute}
+ */
+proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setKey(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addValues(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.gateway.web.v1.MetricAttribute} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getKey();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getValuesList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      2,
+      f
+    );
+  }
+};
+/**
+ * optional string key = 1;
+ * @return {string}
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.getKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+/**
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.setKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+/**
+ * repeated string values = 2;
+ * @return {!Array<string>}
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.getValuesList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 2));
+};
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.setValuesList = function(value) {
+  return jspb.Message.setField(this, 2, value || []);
+};
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.addValues = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 2, value, opt_index);
+};
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.gateway.web.v1.MetricAttribute} returns this
+ */
+proto.gateway.web.v1.MetricAttribute.prototype.clearValuesList = function() {
+  return this.setValuesList([]);
+};
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.StreamQueryRequest.toObject(opt_includeInstance, this);
+};
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.gateway.web.v1.StreamQueryRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.StreamQueryRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(includeInstance, f),
+timeRange: (f = msg.getTimeRange()) && proto.gateway.web.v1.TimeRange.toObject(includeInstance, f),
+timeInterval: jspb.Message.getFieldWithDefault(msg, 5, 0)
+  };
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.gateway.web.v1.StreamQueryRequest}
+ */
+proto.gateway.web.v1.StreamQueryRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.gateway.web.v1.StreamQueryRequest;
+  return proto.gateway.web.v1.StreamQueryRequest.deserializeBinaryFromReader(msg, reader);
+};
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.gateway.web.v1.StreamQueryRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.gateway.web.v1.StreamQueryRequest}
+ */
+proto.gateway.web.v1.StreamQueryRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
       msg.setOrganizationId(value);
       break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setProjectId(value);
+      break;
+    case 3:
+      var value = new proto.gateway.web.v1.MetricQuery;
+      reader.readMessage(value,proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader);
+      msg.setQuery(value);
+      break;
+    case 4:
+      var value = new proto.gateway.web.v1.TimeRange;
+      reader.readMessage(value,proto.gateway.web.v1.TimeRange.deserializeBinaryFromReader);
+      msg.setTimeRange(value);
+      break;
+    case 5:
+      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (reader.readEnum());
+      msg.setTimeInterval(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.gateway.web.v1.StreamQueryRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.gateway.web.v1.StreamQueryRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.StreamQueryRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getOrganizationId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getProjectId();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getQuery();
+  if (f != null) {
+    writer.writeMessage(
+      3,
+      f,
+      proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter
+    );
+  }
+  f = message.getTimeRange();
+  if (f != null) {
+    writer.writeMessage(
+      4,
+      f,
+      proto.gateway.web.v1.TimeRange.serializeBinaryToWriter
+    );
+  }
+  f = message.getTimeInterval();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      5,
+      f
+    );
+  }
+};
+/**
+ * optional string organization_id = 1;
+ * @return {string}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.getOrganizationId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+/**
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.setOrganizationId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+/**
+ * optional string project_id = 2;
+ * @return {string}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.getProjectId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+/**
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.setProjectId = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+/**
+ * optional MetricQuery query = 3;
+ * @return {?proto.gateway.web.v1.MetricQuery}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.getQuery = function() {
+  return /** @type{?proto.gateway.web.v1.MetricQuery} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricQuery, 3));
+};
+/**
+ * @param {?proto.gateway.web.v1.MetricQuery|undefined} value
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+*/
+proto.gateway.web.v1.StreamQueryRequest.prototype.setQuery = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.clearQuery = function() {
+  return this.setQuery(undefined);
+};
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.hasQuery = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+/**
+ * optional TimeRange time_range = 4;
+ * @return {?proto.gateway.web.v1.TimeRange}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.getTimeRange = function() {
+  return /** @type{?proto.gateway.web.v1.TimeRange} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.TimeRange, 4));
+};
+/**
+ * @param {?proto.gateway.web.v1.TimeRange|undefined} value
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+*/
+proto.gateway.web.v1.StreamQueryRequest.prototype.setTimeRange = function(value) {
+  return jspb.Message.setWrapperField(this, 4, value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.clearTimeRange = function() {
+  return this.setTimeRange(undefined);
+};
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.hasTimeRange = function() {
+  return jspb.Message.getField(this, 4) != null;
+};
+/**
+ * optional AnalyticsTimeInterval time_interval = 5;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeInterval}
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.getTimeInterval = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+/**
+ * @param {!proto.gateway.web.v1.AnalyticsTimeInterval} value
+ * @return {!proto.gateway.web.v1.StreamQueryRequest} returns this
+ */
+proto.gateway.web.v1.StreamQueryRequest.prototype.setTimeInterval = function(value) {
+  return jspb.Message.setProto3EnumField(this, 5, value);
+};
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.gateway.web.v1.MetricQuery.repeatedFields_ = [5,6];
+/**
+ * Oneof group definitions for this message. Each group defines the field
+ * numbers belonging to that group. When of these fields' value is set, all
+ * other fields in the group are cleared. During deserialization, if multiple
+ * fields are encountered for a group, only the last value seen will be kept.
+ * @private {!Array<!Array<number>>}
+ * @const
+ */
+proto.gateway.web.v1.MetricQuery.oneofGroups_ = [[2,3,4]];
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.MetricQuery.KindCase = {
+  KIND_NOT_SET: 0,
+  GAUGE: 2,
+  SUM: 3,
+  HISTOGRAM: 4
+};
+/**
+ * @return {proto.gateway.web.v1.MetricQuery.KindCase}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.getKindCase = function() {
+  return /** @type {proto.gateway.web.v1.MetricQuery.KindCase} */(jspb.Message.computeOneofCase(this, proto.gateway.web.v1.MetricQuery.oneofGroups_[0]));
+};
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricQuery.toObject(opt_includeInstance, this);
+};
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.gateway.web.v1.MetricQuery} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.MetricQuery.toObject = function(includeInstance, msg) {
+  var f, obj = {
+metricName: jspb.Message.getFieldWithDefault(msg, 1, ""),
+gauge: (f = msg.getGauge()) && proto.gateway.web.v1.GaugeQuerySpec.toObject(includeInstance, f),
+sum: (f = msg.getSum()) && proto.gateway.web.v1.SumQuerySpec.toObject(includeInstance, f),
+histogram: (f = msg.getHistogram()) && proto.gateway.web.v1.HistogramQuerySpec.toObject(includeInstance, f),
+filtersList: jspb.Message.toObjectList(msg.getFiltersList(),
+    proto.gateway.web.v1.AttributeFilter.toObject, includeInstance),
+groupByList: (f = jspb.Message.getRepeatedField(msg, 6)) == null ? undefined : f,
+groupLimit: jspb.Message.getFieldWithDefault(msg, 7, 0)
+  };
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.gateway.web.v1.MetricQuery}
+ */
+proto.gateway.web.v1.MetricQuery.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.gateway.web.v1.MetricQuery;
+  return proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader(msg, reader);
+};
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.gateway.web.v1.MetricQuery} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.gateway.web.v1.MetricQuery}
+ */
+proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMetricName(value);
+      break;
+    case 2:
+      var value = new proto.gateway.web.v1.GaugeQuerySpec;
+      reader.readMessage(value,proto.gateway.web.v1.GaugeQuerySpec.deserializeBinaryFromReader);
+      msg.setGauge(value);
+      break;
+    case 3:
+      var value = new proto.gateway.web.v1.SumQuerySpec;
+      reader.readMessage(value,proto.gateway.web.v1.SumQuerySpec.deserializeBinaryFromReader);
+      msg.setSum(value);
+      break;
+    case 4:
+      var value = new proto.gateway.web.v1.HistogramQuerySpec;
+      reader.readMessage(value,proto.gateway.web.v1.HistogramQuerySpec.deserializeBinaryFromReader);
+      msg.setHistogram(value);
+      break;
+    case 5:
+      var value = new proto.gateway.web.v1.AttributeFilter;
+      reader.readMessage(value,proto.gateway.web.v1.AttributeFilter.deserializeBinaryFromReader);
+      msg.addFilters(value);
+      break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addGroupBy(value);
+      break;
+    case 7:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setGroupLimit(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1675,71 +2462,67 @@ proto.gateway.web.v1.MetricQuery.prototype.serializeBinary = function() {
  */
 proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getProjectId();
+  f = message.getMetricName();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getMetricName();
-  if (f.length > 0) {
-    writer.writeString(
+  f = message.getGauge();
+  if (f != null) {
+    writer.writeMessage(
       2,
-      f
+      f,
+      proto.gateway.web.v1.GaugeQuerySpec.serializeBinaryToWriter
     );
   }
-  f = message.getFilter();
+  f = message.getSum();
   if (f != null) {
     writer.writeMessage(
       3,
       f,
-      proto.gateway.web.v1.MetricFilter.serializeBinaryToWriter
+      proto.gateway.web.v1.SumQuerySpec.serializeBinaryToWriter
     );
   }
-  f = message.getGroupByList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
+  f = message.getHistogram();
+  if (f != null) {
+    writer.writeMessage(
       4,
-      f
+      f,
+      proto.gateway.web.v1.HistogramQuerySpec.serializeBinaryToWriter
     );
   }
-  f = message.getAggregation();
-  if (f !== 0.0) {
-    writer.writeEnum(
+  f = message.getFiltersList();
+  if (f.length > 0) {
+    writer.writeRepeatedMessage(
       5,
-      f
+      f,
+      proto.gateway.web.v1.AttributeFilter.serializeBinaryToWriter
     );
   }
-  f = message.getTimeWindow();
-  if (f !== 0.0) {
-    writer.writeEnum(
+  f = message.getGroupByList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
       6,
       f
     );
   }
-  f = message.getTimeInterval();
-  if (f !== 0.0) {
-    writer.writeEnum(
+  f = message.getGroupLimit();
+  if (f !== 0) {
+    writer.writeInt32(
       7,
       f
     );
   }
-  f = message.getOrganizationId();
-  if (f.length > 0) {
-    writer.writeString(
-      8,
-      f
-    );
-  }
 };
 /**
- * optional string project_id = 1;
+ * optional string metric_name = 1;
  * @return {string}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getProjectId = function() {
+proto.gateway.web.v1.MetricQuery.prototype.getMetricName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
@@ -1748,45 +2531,64 @@ proto.gateway.web.v1.MetricQuery.prototype.getProjectId = function() {
  * @param {string} value
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setProjectId = function(value) {
+proto.gateway.web.v1.MetricQuery.prototype.setMetricName = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * optional string metric_name = 2;
- * @return {string}
+ * optional GaugeQuerySpec gauge = 2;
+ * @return {?proto.gateway.web.v1.GaugeQuerySpec}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getMetricName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+proto.gateway.web.v1.MetricQuery.prototype.getGauge = function() {
+  return /** @type{?proto.gateway.web.v1.GaugeQuerySpec} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.GaugeQuerySpec, 2));
 };
 /**
- * @param {string} value
+ * @param {?proto.gateway.web.v1.GaugeQuerySpec|undefined} value
+ * @return {!proto.gateway.web.v1.MetricQuery} returns this
+*/
+proto.gateway.web.v1.MetricQuery.prototype.setGauge = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.MetricQuery.oneofGroups_[0], value);
+};
+/**
+ * Clears the message field making it undefined.
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setMetricName = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
+proto.gateway.web.v1.MetricQuery.prototype.clearGauge = function() {
+  return this.setGauge(undefined);
+};
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.hasGauge = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
 /**
- * optional MetricFilter filter = 3;
- * @return {?proto.gateway.web.v1.MetricFilter}
+ * optional SumQuerySpec sum = 3;
+ * @return {?proto.gateway.web.v1.SumQuerySpec}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getFilter = function() {
-  return /** @type{?proto.gateway.web.v1.MetricFilter} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricFilter, 3));
+proto.gateway.web.v1.MetricQuery.prototype.getSum = function() {
+  return /** @type{?proto.gateway.web.v1.SumQuerySpec} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.SumQuerySpec, 3));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricFilter|undefined} value
+ * @param {?proto.gateway.web.v1.SumQuerySpec|undefined} value
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
 */
-proto.gateway.web.v1.MetricQuery.prototype.setFilter = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
+proto.gateway.web.v1.MetricQuery.prototype.setSum = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 3, proto.gateway.web.v1.MetricQuery.oneofGroups_[0], value);
 };
@@ -1794,8 +2596,8 @@ proto.gateway.web.v1.MetricQuery.prototype.setFilter = function(value) {
  * Clears the message field making it undefined.
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.clearFilter = function() {
-  return this.setFilter(undefined);
+proto.gateway.web.v1.MetricQuery.prototype.clearSum = function() {
+  return this.setSum(undefined);
 };
@@ -1803,17 +2605,92 @@ proto.gateway.web.v1.MetricQuery.prototype.clearFilter = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricQuery.prototype.hasFilter = function() {
+proto.gateway.web.v1.MetricQuery.prototype.hasSum = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 /**
- * repeated string group_by = 4;
+ * optional HistogramQuerySpec histogram = 4;
+ * @return {?proto.gateway.web.v1.HistogramQuerySpec}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.getHistogram = function() {
+  return /** @type{?proto.gateway.web.v1.HistogramQuerySpec} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.HistogramQuerySpec, 4));
+};
+/**
+ * @param {?proto.gateway.web.v1.HistogramQuerySpec|undefined} value
+ * @return {!proto.gateway.web.v1.MetricQuery} returns this
+*/
+proto.gateway.web.v1.MetricQuery.prototype.setHistogram = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 4, proto.gateway.web.v1.MetricQuery.oneofGroups_[0], value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ */
+proto.gateway.web.v1.MetricQuery.prototype.clearHistogram = function() {
+  return this.setHistogram(undefined);
+};
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.hasHistogram = function() {
+  return jspb.Message.getField(this, 4) != null;
+};
+/**
+ * repeated AttributeFilter filters = 5;
+ * @return {!Array<!proto.gateway.web.v1.AttributeFilter>}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.getFiltersList = function() {
+  return /** @type{!Array<!proto.gateway.web.v1.AttributeFilter>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.AttributeFilter, 5));
+};
+/**
+ * @param {!Array<!proto.gateway.web.v1.AttributeFilter>} value
+ * @return {!proto.gateway.web.v1.MetricQuery} returns this
+*/
+proto.gateway.web.v1.MetricQuery.prototype.setFiltersList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 5, value);
+};
+/**
+ * @param {!proto.gateway.web.v1.AttributeFilter=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.gateway.web.v1.AttributeFilter}
+ */
+proto.gateway.web.v1.MetricQuery.prototype.addFilters = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 5, opt_value, proto.gateway.web.v1.AttributeFilter, opt_index);
+};
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ */
+proto.gateway.web.v1.MetricQuery.prototype.clearFiltersList = function() {
+  return this.setFiltersList([]);
+};
+/**
+ * repeated string group_by = 6;
  * @return {!Array<string>}
  */
 proto.gateway.web.v1.MetricQuery.prototype.getGroupByList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 4));
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 6));
 };
@@ -1822,7 +2699,7 @@ proto.gateway.web.v1.MetricQuery.prototype.getGroupByList = function() {
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
  */
 proto.gateway.web.v1.MetricQuery.prototype.setGroupByList = function(value) {
-  return jspb.Message.setField(this, 4, value || []);
+  return jspb.Message.setField(this, 6, value || []);
 };
@@ -1832,7 +2709,7 @@ proto.gateway.web.v1.MetricQuery.prototype.setGroupByList = function(value) {
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
  */
 proto.gateway.web.v1.MetricQuery.prototype.addGroupBy = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 4, value, opt_index);
+  return jspb.Message.addToRepeatedField(this, 6, value, opt_index);
 };
@@ -1846,85 +2723,284 @@ proto.gateway.web.v1.MetricQuery.prototype.clearGroupByList = function() {
 /**
- * optional MetricAggregation aggregation = 5;
- * @return {!proto.gateway.web.v1.MetricAggregation}
+ * optional int32 group_limit = 7;
+ * @return {number}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getAggregation = function() {
-  return /** @type {!proto.gateway.web.v1.MetricAggregation} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+proto.gateway.web.v1.MetricQuery.prototype.getGroupLimit = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
 };
 /**
- * @param {!proto.gateway.web.v1.MetricAggregation} value
+ * @param {number} value
  * @return {!proto.gateway.web.v1.MetricQuery} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setAggregation = function(value) {
-  return jspb.Message.setProto3EnumField(this, 5, value);
+proto.gateway.web.v1.MetricQuery.prototype.setGroupLimit = function(value) {
+  return jspb.Message.setProto3IntField(this, 7, value);
 };
+if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
- * optional AnalyticsTimeWindow time_window = 6;
- * @return {!proto.gateway.web.v1.AnalyticsTimeWindow}
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getTimeWindow = function() {
-  return /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+proto.gateway.web.v1.GaugeQuerySpec.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.GaugeQuerySpec.toObject(opt_includeInstance, this);
 };
 /**
- * @param {!proto.gateway.web.v1.AnalyticsTimeWindow} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.gateway.web.v1.GaugeQuerySpec} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.GaugeQuerySpec.toObject = function(includeInstance, msg) {
+  var f, obj = {
+aggregation: jspb.Message.getFieldWithDefault(msg, 1, 0)
+  };
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.gateway.web.v1.GaugeQuerySpec}
+ */
+proto.gateway.web.v1.GaugeQuerySpec.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.gateway.web.v1.GaugeQuerySpec;
+  return proto.gateway.web.v1.GaugeQuerySpec.deserializeBinaryFromReader(msg, reader);
+};
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.gateway.web.v1.GaugeQuerySpec} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.gateway.web.v1.GaugeQuerySpec}
+ */
+proto.gateway.web.v1.GaugeQuerySpec.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {!proto.gateway.web.v1.GaugeAggregation} */ (reader.readEnum());
+      msg.setAggregation(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.gateway.web.v1.GaugeQuerySpec.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.gateway.web.v1.GaugeQuerySpec.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.gateway.web.v1.GaugeQuerySpec} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.GaugeQuerySpec.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getAggregation();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      1,
+      f
+    );
+  }
+};
+/**
+ * optional GaugeAggregation aggregation = 1;
+ * @return {!proto.gateway.web.v1.GaugeAggregation}
+ */
+proto.gateway.web.v1.GaugeQuerySpec.prototype.getAggregation = function() {
+  return /** @type {!proto.gateway.web.v1.GaugeAggregation} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+};
+/**
+ * @param {!proto.gateway.web.v1.GaugeAggregation} value
+ * @return {!proto.gateway.web.v1.GaugeQuerySpec} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setTimeWindow = function(value) {
-  return jspb.Message.setProto3EnumField(this, 6, value);
+proto.gateway.web.v1.GaugeQuerySpec.prototype.setAggregation = function(value) {
+  return jspb.Message.setProto3EnumField(this, 1, value);
+};
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.gateway.web.v1.SumQuerySpec.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.SumQuerySpec.toObject(opt_includeInstance, this);
+};
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.gateway.web.v1.SumQuerySpec} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.SumQuerySpec.toObject = function(includeInstance, msg) {
+  var f, obj = {
+aggregation: jspb.Message.getFieldWithDefault(msg, 1, 0)
+  };
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.gateway.web.v1.SumQuerySpec}
+ */
+proto.gateway.web.v1.SumQuerySpec.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.gateway.web.v1.SumQuerySpec;
+  return proto.gateway.web.v1.SumQuerySpec.deserializeBinaryFromReader(msg, reader);
+};
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.gateway.web.v1.SumQuerySpec} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.gateway.web.v1.SumQuerySpec}
+ */
+proto.gateway.web.v1.SumQuerySpec.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {!proto.gateway.web.v1.SumAggregation} */ (reader.readEnum());
+      msg.setAggregation(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
 };
 /**
- * optional AnalyticsTimeInterval time_interval = 7;
- * @return {!proto.gateway.web.v1.AnalyticsTimeInterval}
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getTimeInterval = function() {
-  return /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
+proto.gateway.web.v1.SumQuerySpec.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.gateway.web.v1.SumQuerySpec.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
 };
 /**
- * @param {!proto.gateway.web.v1.AnalyticsTimeInterval} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.gateway.web.v1.SumQuerySpec} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricQuery.prototype.setTimeInterval = function(value) {
-  return jspb.Message.setProto3EnumField(this, 7, value);
+proto.gateway.web.v1.SumQuerySpec.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getAggregation();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      1,
+      f
+    );
+  }
 };
 /**
- * optional string organization_id = 8;
- * @return {string}
+ * optional SumAggregation aggregation = 1;
+ * @return {!proto.gateway.web.v1.SumAggregation}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getOrganizationId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
+proto.gateway.web.v1.SumQuerySpec.prototype.getAggregation = function() {
+  return /** @type {!proto.gateway.web.v1.SumAggregation} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 /**
- * @param {string} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * @param {!proto.gateway.web.v1.SumAggregation} value
+ * @return {!proto.gateway.web.v1.SumQuerySpec} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setOrganizationId = function(value) {
-  return jspb.Message.setProto3StringField(this, 8, value);
+proto.gateway.web.v1.SumQuerySpec.prototype.setAggregation = function(value) {
+  return jspb.Message.setProto3EnumField(this, 1, value);
 };
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.gateway.web.v1.MetricFilter.repeatedFields_ = [1];
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1940,8 +3016,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricFilter.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricFilter.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.HistogramQuerySpec.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.HistogramQuerySpec.toObject(opt_includeInstance, this);
 };
@@ -1950,14 +3026,14 @@ proto.gateway.web.v1.MetricFilter.prototype.toObject = function(opt_includeInsta
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricFilter} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.HistogramQuerySpec} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricFilter.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.HistogramQuerySpec.toObject = function(includeInstance, msg) {
   var f, obj = {
-serviceNamesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f,
-attributeEqualsMap: (f = msg.getAttributeEqualsMap()) ? f.toObject(includeInstance, undefined) : []
+aggregation: jspb.Message.getFieldWithDefault(msg, 1, 0),
+quantile: jspb.Message.getFloatingPointFieldWithDefault(msg, 2, 0.0)
   };
   if (includeInstance) {
@@ -1971,23 +3047,23 @@ attributeEqualsMap: (f = msg.getAttributeEqualsMap()) ? f.toObject(includeInstan
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricFilter}
+ * @return {!proto.gateway.web.v1.HistogramQuerySpec}
  */
-proto.gateway.web.v1.MetricFilter.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.HistogramQuerySpec.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricFilter;
-  return proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.HistogramQuerySpec;
+  return proto.gateway.web.v1.HistogramQuerySpec.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricFilter} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.HistogramQuerySpec} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricFilter}
+ * @return {!proto.gateway.web.v1.HistogramQuerySpec}
  */
-proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.HistogramQuerySpec.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1995,14 +3071,12 @@ proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader = function(msg, re
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addServiceNames(value);
+      var value = /** @type {!proto.gateway.web.v1.HistogramAggregation} */ (reader.readEnum());
+      msg.setAggregation(value);
       break;
     case 2:
-      var value = msg.getAttributeEqualsMap();
-      reader.readMessage(value, function(message, reader) {
-        jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
-         });
+      var value = /** @type {number} */ (reader.readDouble());
+      msg.setQuantile(value);
       break;
     default:
       reader.skipField();
@@ -2017,9 +3091,9 @@ proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader = function(msg, re
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricFilter.prototype.serializeBinary = function() {
+proto.gateway.web.v1.HistogramQuerySpec.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricFilter.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.HistogramQuerySpec.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2027,86 +3101,72 @@ proto.gateway.web.v1.MetricFilter.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricFilter} message
+ * @param {!proto.gateway.web.v1.HistogramQuerySpec} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricFilter.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.HistogramQuerySpec.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getServiceNamesList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
+  f = message.getAggregation();
+  if (f !== 0.0) {
+    writer.writeEnum(
       1,
       f
     );
   }
-  f = message.getAttributeEqualsMap(true);
-  if (f && f.getLength() > 0) {
-    f.serializeBinary(2, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
+  f = message.getQuantile();
+  if (f !== 0.0) {
+    writer.writeDouble(
+      2,
+      f
+    );
   }
 };
 /**
- * repeated string service_names = 1;
- * @return {!Array<string>}
+ * optional HistogramAggregation aggregation = 1;
+ * @return {!proto.gateway.web.v1.HistogramAggregation}
  */
-proto.gateway.web.v1.MetricFilter.prototype.getServiceNamesList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 1));
+proto.gateway.web.v1.HistogramQuerySpec.prototype.getAggregation = function() {
+  return /** @type {!proto.gateway.web.v1.HistogramAggregation} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 /**
- * @param {!Array<string>} value
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
+ * @param {!proto.gateway.web.v1.HistogramAggregation} value
+ * @return {!proto.gateway.web.v1.HistogramQuerySpec} returns this
  */
-proto.gateway.web.v1.MetricFilter.prototype.setServiceNamesList = function(value) {
-  return jspb.Message.setField(this, 1, value || []);
+proto.gateway.web.v1.HistogramQuerySpec.prototype.setAggregation = function(value) {
+  return jspb.Message.setProto3EnumField(this, 1, value);
 };
 /**
- * @param {string} value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
+ * optional double quantile = 2;
+ * @return {number}
  */
-proto.gateway.web.v1.MetricFilter.prototype.addServiceNames = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
+proto.gateway.web.v1.HistogramQuerySpec.prototype.getQuantile = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 2, 0.0));
 };
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
+ * @param {number} value
+ * @return {!proto.gateway.web.v1.HistogramQuerySpec} returns this
  */
-proto.gateway.web.v1.MetricFilter.prototype.clearServiceNamesList = function() {
-  return this.setServiceNamesList([]);
+proto.gateway.web.v1.HistogramQuerySpec.prototype.setQuantile = function(value) {
+  return jspb.Message.setProto3FloatField(this, 2, value);
 };
-/**
- * map<string, string> attribute_equals = 2;
- * @param {boolean=} opt_noLazyCreate Do not create the map if
- * empty, instead returning `undefined`
- * @return {!jspb.Map<string,string>}
- */
-proto.gateway.web.v1.MetricFilter.prototype.getAttributeEqualsMap = function(opt_noLazyCreate) {
-  return /** @type {!jspb.Map<string,string>} */ (
-      jspb.Message.getMapField(this, 2, opt_noLazyCreate,
-      null));
-};
 /**
- * Clears values from the map. The map will be non-null.
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
  */
-proto.gateway.web.v1.MetricFilter.prototype.clearAttributeEqualsMap = function() {
-  this.getAttributeEqualsMap().clear();
-  return this;
-};
+proto.gateway.web.v1.AttributeFilter.repeatedFields_ = [3];
@@ -2123,8 +3183,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.QueryMetricsRequest.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.AttributeFilter.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.AttributeFilter.toObject(opt_includeInstance, this);
 };
@@ -2133,13 +3193,15 @@ proto.gateway.web.v1.QueryMetricsRequest.prototype.toObject = function(opt_inclu
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.QueryMetricsRequest} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.AttributeFilter} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.QueryMetricsRequest.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.AttributeFilter.toObject = function(includeInstance, msg) {
   var f, obj = {
-query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(includeInstance, f)
+key: jspb.Message.getFieldWithDefault(msg, 1, ""),
+op: jspb.Message.getFieldWithDefault(msg, 2, 0),
+valuesList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f
   };
   if (includeInstance) {
@@ -2153,23 +3215,23 @@ query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(include
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.QueryMetricsRequest}
+ * @return {!proto.gateway.web.v1.AttributeFilter}
  */
-proto.gateway.web.v1.QueryMetricsRequest.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.AttributeFilter.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.QueryMetricsRequest;
-  return proto.gateway.web.v1.QueryMetricsRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.AttributeFilter;
+  return proto.gateway.web.v1.AttributeFilter.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.QueryMetricsRequest} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.AttributeFilter} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.QueryMetricsRequest}
+ * @return {!proto.gateway.web.v1.AttributeFilter}
  */
-proto.gateway.web.v1.QueryMetricsRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.AttributeFilter.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2177,9 +3239,16 @@ proto.gateway.web.v1.QueryMetricsRequest.deserializeBinaryFromReader = function(
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto.gateway.web.v1.MetricQuery;
-      reader.readMessage(value,proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader);
-      msg.setQuery(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setKey(value);
+      break;
+    case 2:
+      var value = /** @type {!proto.gateway.web.v1.AttributeFilterOp} */ (reader.readEnum());
+      msg.setOp(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addValues(value);
       break;
     default:
       reader.skipField();
@@ -2194,9 +3263,9 @@ proto.gateway.web.v1.QueryMetricsRequest.deserializeBinaryFromReader = function(
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.serializeBinary = function() {
+proto.gateway.web.v1.AttributeFilter.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.QueryMetricsRequest.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.AttributeFilter.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2204,61 +3273,136 @@ proto.gateway.web.v1.QueryMetricsRequest.prototype.serializeBinary = function()
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.QueryMetricsRequest} message
+ * @param {!proto.gateway.web.v1.AttributeFilter} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.QueryMetricsRequest.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.AttributeFilter.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getQuery();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getKey();
+  if (f.length > 0) {
+    writer.writeString(
       1,
-      f,
-      proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter
+      f
+    );
+  }
+  f = message.getOp();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      2,
+      f
+    );
+  }
+  f = message.getValuesList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      3,
+      f
     );
   }
 };
 /**
- * optional MetricQuery query = 1;
- * @return {?proto.gateway.web.v1.MetricQuery}
+ * optional string key = 1;
+ * @return {string}
  */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.getQuery = function() {
-  return /** @type{?proto.gateway.web.v1.MetricQuery} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricQuery, 1));
+proto.gateway.web.v1.AttributeFilter.prototype.getKey = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricQuery|undefined} value
- * @return {!proto.gateway.web.v1.QueryMetricsRequest} returns this
-*/
-proto.gateway.web.v1.QueryMetricsRequest.prototype.setQuery = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.AttributeFilter} returns this
+ */
+proto.gateway.web.v1.AttributeFilter.prototype.setKey = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.QueryMetricsRequest} returns this
+ * optional AttributeFilterOp op = 2;
+ * @return {!proto.gateway.web.v1.AttributeFilterOp}
  */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.clearQuery = function() {
-  return this.setQuery(undefined);
+proto.gateway.web.v1.AttributeFilter.prototype.getOp = function() {
+  return /** @type {!proto.gateway.web.v1.AttributeFilterOp} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {!proto.gateway.web.v1.AttributeFilterOp} value
+ * @return {!proto.gateway.web.v1.AttributeFilter} returns this
  */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.hasQuery = function() {
-  return jspb.Message.getField(this, 1) != null;
+proto.gateway.web.v1.AttributeFilter.prototype.setOp = function(value) {
+  return jspb.Message.setProto3EnumField(this, 2, value);
+};
+/**
+ * repeated string values = 3;
+ * @return {!Array<string>}
+ */
+proto.gateway.web.v1.AttributeFilter.prototype.getValuesList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 3));
+};
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.gateway.web.v1.AttributeFilter} returns this
+ */
+proto.gateway.web.v1.AttributeFilter.prototype.setValuesList = function(value) {
+  return jspb.Message.setField(this, 3, value || []);
+};
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.gateway.web.v1.AttributeFilter} returns this
+ */
+proto.gateway.web.v1.AttributeFilter.prototype.addValues = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 3, value, opt_index);
+};
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.gateway.web.v1.AttributeFilter} returns this
+ */
+proto.gateway.web.v1.AttributeFilter.prototype.clearValuesList = function() {
+  return this.setValuesList([]);
 };
+/**
+ * Oneof group definitions for this message. Each group defines the field
+ * numbers belonging to that group. When of these fields' value is set, all
+ * other fields in the group are cleared. During deserialization, if multiple
+ * fields are encountered for a group, only the last value seen will be kept.
+ * @private {!Array<!Array<number>>}
+ * @const
+ */
+proto.gateway.web.v1.TimeRange.oneofGroups_ = [[1,2]];
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.TimeRange.RangeCase = {
+  RANGE_NOT_SET: 0,
+  WINDOW: 1,
+  ABSOLUTE: 2
+};
+/**
+ * @return {proto.gateway.web.v1.TimeRange.RangeCase}
+ */
+proto.gateway.web.v1.TimeRange.prototype.getRangeCase = function() {
+  return /** @type {proto.gateway.web.v1.TimeRange.RangeCase} */(jspb.Message.computeOneofCase(this, proto.gateway.web.v1.TimeRange.oneofGroups_[0]));
+};
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -2274,8 +3418,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.QueryMetricsResponse.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.TimeRange.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.TimeRange.toObject(opt_includeInstance, this);
 };
@@ -2284,14 +3428,14 @@ proto.gateway.web.v1.QueryMetricsResponse.prototype.toObject = function(opt_incl
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.QueryMetricsResponse} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.TimeRange} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.QueryMetricsResponse.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.TimeRange.toObject = function(includeInstance, msg) {
   var f, obj = {
-status: (f = msg.getStatus()) && proto_gateway_common_v1_status_pb.ResponseStatus.toObject(includeInstance, f),
-snapshot: (f = msg.getSnapshot()) && proto.gateway.web.v1.MetricAnalyticsSnapshot.toObject(includeInstance, f)
+window: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+absolute: (f = msg.getAbsolute()) && proto.gateway.web.v1.AbsoluteTimeRange.toObject(includeInstance, f)
   };
   if (includeInstance) {
@@ -2305,23 +3449,23 @@ snapshot: (f = msg.getSnapshot()) && proto.gateway.web.v1.MetricAnalyticsSnapsho
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse}
+ * @return {!proto.gateway.web.v1.TimeRange}
  */
-proto.gateway.web.v1.QueryMetricsResponse.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.TimeRange.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.QueryMetricsResponse;
-  return proto.gateway.web.v1.QueryMetricsResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.TimeRange;
+  return proto.gateway.web.v1.TimeRange.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.QueryMetricsResponse} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.TimeRange} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse}
+ * @return {!proto.gateway.web.v1.TimeRange}
  */
-proto.gateway.web.v1.QueryMetricsResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.TimeRange.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2329,14 +3473,13 @@ proto.gateway.web.v1.QueryMetricsResponse.deserializeBinaryFromReader = function
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto_gateway_common_v1_status_pb.ResponseStatus;
-      reader.readMessage(value,proto_gateway_common_v1_status_pb.ResponseStatus.deserializeBinaryFromReader);
-      msg.setStatus(value);
+      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (reader.readEnum());
+      msg.setWindow(value);
       break;
     case 2:
-      var value = new proto.gateway.web.v1.MetricAnalyticsSnapshot;
-      reader.readMessage(value,proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader);
-      msg.setSnapshot(value);
+      var value = new proto.gateway.web.v1.AbsoluteTimeRange;
+      reader.readMessage(value,proto.gateway.web.v1.AbsoluteTimeRange.deserializeBinaryFromReader);
+      msg.setAbsolute(value);
       break;
     default:
       reader.skipField();
@@ -2351,9 +3494,9 @@ proto.gateway.web.v1.QueryMetricsResponse.deserializeBinaryFromReader = function
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.serializeBinary = function() {
+proto.gateway.web.v1.TimeRange.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.QueryMetricsResponse.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.TimeRange.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2361,56 +3504,54 @@ proto.gateway.web.v1.QueryMetricsResponse.prototype.serializeBinary = function()
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.QueryMetricsResponse} message
+ * @param {!proto.gateway.web.v1.TimeRange} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.QueryMetricsResponse.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.TimeRange.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getStatus();
+  f = /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getField(message, 1));
   if (f != null) {
-    writer.writeMessage(
+    writer.writeEnum(
       1,
-      f,
-      proto_gateway_common_v1_status_pb.ResponseStatus.serializeBinaryToWriter
+      f
     );
   }
-  f = message.getSnapshot();
+  f = message.getAbsolute();
   if (f != null) {
     writer.writeMessage(
       2,
       f,
-      proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter
+      proto.gateway.web.v1.AbsoluteTimeRange.serializeBinaryToWriter
     );
   }
 };
 /**
- * optional gateway.common.v1.ResponseStatus status = 1;
- * @return {?proto.gateway.common.v1.ResponseStatus}
+ * optional AnalyticsTimeWindow window = 1;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeWindow}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.getStatus = function() {
-  return /** @type{?proto.gateway.common.v1.ResponseStatus} */ (
-    jspb.Message.getWrapperField(this, proto_gateway_common_v1_status_pb.ResponseStatus, 1));
+proto.gateway.web.v1.TimeRange.prototype.getWindow = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 /**
- * @param {?proto.gateway.common.v1.ResponseStatus|undefined} value
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
-*/
-proto.gateway.web.v1.QueryMetricsResponse.prototype.setStatus = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+ * @param {!proto.gateway.web.v1.AnalyticsTimeWindow} value
+ * @return {!proto.gateway.web.v1.TimeRange} returns this
+ */
+proto.gateway.web.v1.TimeRange.prototype.setWindow = function(value) {
+  return jspb.Message.setOneofField(this, 1, proto.gateway.web.v1.TimeRange.oneofGroups_[0], value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
+ * Clears the field making it undefined.
+ * @return {!proto.gateway.web.v1.TimeRange} returns this
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.clearStatus = function() {
-  return this.setStatus(undefined);
+proto.gateway.web.v1.TimeRange.prototype.clearWindow = function() {
+  return jspb.Message.setOneofField(this, 1, proto.gateway.web.v1.TimeRange.oneofGroups_[0], undefined);
 };
@@ -2418,36 +3559,36 @@ proto.gateway.web.v1.QueryMetricsResponse.prototype.clearStatus = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.hasStatus = function() {
+proto.gateway.web.v1.TimeRange.prototype.hasWindow = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 /**
- * optional MetricAnalyticsSnapshot snapshot = 2;
- * @return {?proto.gateway.web.v1.MetricAnalyticsSnapshot}
+ * optional AbsoluteTimeRange absolute = 2;
+ * @return {?proto.gateway.web.v1.AbsoluteTimeRange}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.getSnapshot = function() {
-  return /** @type{?proto.gateway.web.v1.MetricAnalyticsSnapshot} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricAnalyticsSnapshot, 2));
+proto.gateway.web.v1.TimeRange.prototype.getAbsolute = function() {
+  return /** @type{?proto.gateway.web.v1.AbsoluteTimeRange} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.AbsoluteTimeRange, 2));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricAnalyticsSnapshot|undefined} value
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
+ * @param {?proto.gateway.web.v1.AbsoluteTimeRange|undefined} value
+ * @return {!proto.gateway.web.v1.TimeRange} returns this
 */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.setSnapshot = function(value) {
-  return jspb.Message.setWrapperField(this, 2, value);
+proto.gateway.web.v1.TimeRange.prototype.setAbsolute = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.TimeRange.oneofGroups_[0], value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
+ * @return {!proto.gateway.web.v1.TimeRange} returns this
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.clearSnapshot = function() {
-  return this.setSnapshot(undefined);
+proto.gateway.web.v1.TimeRange.prototype.clearAbsolute = function() {
+  return this.setAbsolute(undefined);
 };
@@ -2455,7 +3596,7 @@ proto.gateway.web.v1.QueryMetricsResponse.prototype.clearSnapshot = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.hasSnapshot = function() {
+proto.gateway.web.v1.TimeRange.prototype.hasAbsolute = function() {
   return jspb.Message.getField(this, 2) != null;
 };
@@ -2476,8 +3617,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.StreamMetricAnalyticsRequest.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.AbsoluteTimeRange.toObject(opt_includeInstance, this);
 };
@@ -2486,13 +3627,14 @@ proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.toObject = function(
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.AbsoluteTimeRange} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.AbsoluteTimeRange.toObject = function(includeInstance, msg) {
   var f, obj = {
-query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(includeInstance, f)
+start: (f = msg.getStart()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+end: (f = msg.getEnd()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f)
   };
   if (includeInstance) {
@@ -2506,23 +3648,23 @@ query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(include
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.StreamMetricAnalyticsRequest}
+ * @return {!proto.gateway.web.v1.AbsoluteTimeRange}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.AbsoluteTimeRange.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.StreamMetricAnalyticsRequest;
-  return proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.AbsoluteTimeRange;
+  return proto.gateway.web.v1.AbsoluteTimeRange.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.AbsoluteTimeRange} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.StreamMetricAnalyticsRequest}
+ * @return {!proto.gateway.web.v1.AbsoluteTimeRange}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.AbsoluteTimeRange.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2530,9 +3672,14 @@ proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinaryFromReader =
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto.gateway.web.v1.MetricQuery;
-      reader.readMessage(value,proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader);
-      msg.setQuery(value);
+      var value = new google_protobuf_timestamp_pb.Timestamp;
+      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
+      msg.setStart(value);
+      break;
+    case 2:
+      var value = new google_protobuf_timestamp_pb.Timestamp;
+      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
+      msg.setEnd(value);
       break;
     default:
       reader.skipField();
@@ -2547,9 +3694,9 @@ proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinaryFromReader =
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.serializeBinary = function() {
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.StreamMetricAnalyticsRequest.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.AbsoluteTimeRange.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2557,48 +3704,56 @@ proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.serializeBinary = fu
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} message
+ * @param {!proto.gateway.web.v1.AbsoluteTimeRange} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.AbsoluteTimeRange.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getQuery();
+  f = message.getStart();
   if (f != null) {
     writer.writeMessage(
       1,
       f,
-      proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter
+      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
+    );
+  }
+  f = message.getEnd();
+  if (f != null) {
+    writer.writeMessage(
+      2,
+      f,
+      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
   }
 };
 /**
- * optional MetricQuery query = 1;
- * @return {?proto.gateway.web.v1.MetricQuery}
+ * optional google.protobuf.Timestamp start = 1;
+ * @return {?proto.google.protobuf.Timestamp}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.getQuery = function() {
-  return /** @type{?proto.gateway.web.v1.MetricQuery} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricQuery, 1));
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.getStart = function() {
+  return /** @type{?proto.google.protobuf.Timestamp} */ (
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 1));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricQuery|undefined} value
- * @return {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} returns this
+ * @param {?proto.google.protobuf.Timestamp|undefined} value
+ * @return {!proto.gateway.web.v1.AbsoluteTimeRange} returns this
 */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.setQuery = function(value) {
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.setStart = function(value) {
   return jspb.Message.setWrapperField(this, 1, value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} returns this
+ * @return {!proto.gateway.web.v1.AbsoluteTimeRange} returns this
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.clearQuery = function() {
-  return this.setQuery(undefined);
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.clearStart = function() {
+  return this.setStart(undefined);
 };
@@ -2606,11 +3761,48 @@ proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.clearQuery = functio
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.hasQuery = function() {
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.hasStart = function() {
   return jspb.Message.getField(this, 1) != null;
 };
+/**
+ * optional google.protobuf.Timestamp end = 2;
+ * @return {?proto.google.protobuf.Timestamp}
+ */
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.getEnd = function() {
+  return /** @type{?proto.google.protobuf.Timestamp} */ (
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
+};
+/**
+ * @param {?proto.google.protobuf.Timestamp|undefined} value
+ * @return {!proto.gateway.web.v1.AbsoluteTimeRange} returns this
+*/
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.setEnd = function(value) {
+  return jspb.Message.setWrapperField(this, 2, value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.AbsoluteTimeRange} returns this
+ */
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.clearEnd = function() {
+  return this.setEnd(undefined);
+};
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.gateway.web.v1.AbsoluteTimeRange.prototype.hasEnd = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
 /**
  * Oneof group definitions for this message. Each group defines the field
@@ -2620,22 +3812,22 @@ proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.hasQuery = function(
  * @private {!Array<!Array<number>>}
  * @const
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.oneofGroups_ = [[1,2]];
+proto.gateway.web.v1.QueryDataEnvelope.oneofGroups_ = [[1,2]];
 /**
  * @enum {number}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.EventCase = {
+proto.gateway.web.v1.QueryDataEnvelope.EventCase = {
   EVENT_NOT_SET: 0,
   SNAPSHOT: 1,
-  BUCKET_UPDATE: 2
+  UPDATE: 2
 };
 /**
- * @return {proto.gateway.web.v1.MetricAnalyticsEnvelope.EventCase}
+ * @return {proto.gateway.web.v1.QueryDataEnvelope.EventCase}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.getEventCase = function() {
-  return /** @type {proto.gateway.web.v1.MetricAnalyticsEnvelope.EventCase} */(jspb.Message.computeOneofCase(this, proto.gateway.web.v1.MetricAnalyticsEnvelope.oneofGroups_[0]));
+proto.gateway.web.v1.QueryDataEnvelope.prototype.getEventCase = function() {
+  return /** @type {proto.gateway.web.v1.QueryDataEnvelope.EventCase} */(jspb.Message.computeOneofCase(this, proto.gateway.web.v1.QueryDataEnvelope.oneofGroups_[0]));
 };
@@ -2653,8 +3845,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricAnalyticsEnvelope.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.QueryDataEnvelope.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.QueryDataEnvelope.toObject(opt_includeInstance, this);
 };
@@ -2663,14 +3855,14 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.toObject = function(opt_i
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricAnalyticsEnvelope} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.QueryDataEnvelope} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.QueryDataEnvelope.toObject = function(includeInstance, msg) {
   var f, obj = {
-snapshot: (f = msg.getSnapshot()) && proto.gateway.web.v1.MetricAnalyticsSnapshot.toObject(includeInstance, f),
-bucketUpdate: (f = msg.getBucketUpdate()) && proto.gateway.web.v1.MetricSeriesBucketUpdate.toObject(includeInstance, f)
+snapshot: (f = msg.getSnapshot()) && proto.gateway.web.v1.QuerySnapshot.toObject(includeInstance, f),
+update: (f = msg.getUpdate()) && proto.gateway.web.v1.QuerySeriesUpdate.toObject(includeInstance, f)
   };
   if (includeInstance) {
@@ -2684,23 +3876,23 @@ bucketUpdate: (f = msg.getBucketUpdate()) && proto.gateway.web.v1.MetricSeriesBu
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricAnalyticsEnvelope}
+ * @return {!proto.gateway.web.v1.QueryDataEnvelope}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.QueryDataEnvelope.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricAnalyticsEnvelope;
-  return proto.gateway.web.v1.MetricAnalyticsEnvelope.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.QueryDataEnvelope;
+  return proto.gateway.web.v1.QueryDataEnvelope.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricAnalyticsEnvelope} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.QueryDataEnvelope} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricAnalyticsEnvelope}
+ * @return {!proto.gateway.web.v1.QueryDataEnvelope}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.QueryDataEnvelope.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2708,14 +3900,14 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.deserializeBinaryFromReader = funct
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto.gateway.web.v1.MetricAnalyticsSnapshot;
-      reader.readMessage(value,proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader);
+      var value = new proto.gateway.web.v1.QuerySnapshot;
+      reader.readMessage(value,proto.gateway.web.v1.QuerySnapshot.deserializeBinaryFromReader);
       msg.setSnapshot(value);
       break;
     case 2:
-      var value = new proto.gateway.web.v1.MetricSeriesBucketUpdate;
-      reader.readMessage(value,proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinaryFromReader);
-      msg.setBucketUpdate(value);
+      var value = new proto.gateway.web.v1.QuerySeriesUpdate;
+      reader.readMessage(value,proto.gateway.web.v1.QuerySeriesUpdate.deserializeBinaryFromReader);
+      msg.setUpdate(value);
       break;
     default:
       reader.skipField();
@@ -2730,9 +3922,9 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.deserializeBinaryFromReader = funct
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.serializeBinary = function() {
+proto.gateway.web.v1.QueryDataEnvelope.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricAnalyticsEnvelope.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.QueryDataEnvelope.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2740,55 +3932,55 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.serializeBinary = functio
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricAnalyticsEnvelope} message
+ * @param {!proto.gateway.web.v1.QueryDataEnvelope} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.QueryDataEnvelope.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getSnapshot();
   if (f != null) {
     writer.writeMessage(
       1,
       f,
-      proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter
+      proto.gateway.web.v1.QuerySnapshot.serializeBinaryToWriter
     );
   }
-  f = message.getBucketUpdate();
+  f = message.getUpdate();
   if (f != null) {
     writer.writeMessage(
       2,
       f,
-      proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter
+      proto.gateway.web.v1.QuerySeriesUpdate.serializeBinaryToWriter
     );
   }
 };
 /**
- * optional MetricAnalyticsSnapshot snapshot = 1;
- * @return {?proto.gateway.web.v1.MetricAnalyticsSnapshot}
+ * optional QuerySnapshot snapshot = 1;
+ * @return {?proto.gateway.web.v1.QuerySnapshot}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.getSnapshot = function() {
-  return /** @type{?proto.gateway.web.v1.MetricAnalyticsSnapshot} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricAnalyticsSnapshot, 1));
+proto.gateway.web.v1.QueryDataEnvelope.prototype.getSnapshot = function() {
+  return /** @type{?proto.gateway.web.v1.QuerySnapshot} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.QuerySnapshot, 1));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricAnalyticsSnapshot|undefined} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsEnvelope} returns this
+ * @param {?proto.gateway.web.v1.QuerySnapshot|undefined} value
+ * @return {!proto.gateway.web.v1.QueryDataEnvelope} returns this
 */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.setSnapshot = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 1, proto.gateway.web.v1.MetricAnalyticsEnvelope.oneofGroups_[0], value);
+proto.gateway.web.v1.QueryDataEnvelope.prototype.setSnapshot = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 1, proto.gateway.web.v1.QueryDataEnvelope.oneofGroups_[0], value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricAnalyticsEnvelope} returns this
+ * @return {!proto.gateway.web.v1.QueryDataEnvelope} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.clearSnapshot = function() {
+proto.gateway.web.v1.QueryDataEnvelope.prototype.clearSnapshot = function() {
   return this.setSnapshot(undefined);
 };
@@ -2797,36 +3989,36 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.clearSnapshot = function(
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.hasSnapshot = function() {
+proto.gateway.web.v1.QueryDataEnvelope.prototype.hasSnapshot = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 /**
- * optional MetricSeriesBucketUpdate bucket_update = 2;
- * @return {?proto.gateway.web.v1.MetricSeriesBucketUpdate}
+ * optional QuerySeriesUpdate update = 2;
+ * @return {?proto.gateway.web.v1.QuerySeriesUpdate}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.getBucketUpdate = function() {
-  return /** @type{?proto.gateway.web.v1.MetricSeriesBucketUpdate} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricSeriesBucketUpdate, 2));
+proto.gateway.web.v1.QueryDataEnvelope.prototype.getUpdate = function() {
+  return /** @type{?proto.gateway.web.v1.QuerySeriesUpdate} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.QuerySeriesUpdate, 2));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricSeriesBucketUpdate|undefined} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsEnvelope} returns this
+ * @param {?proto.gateway.web.v1.QuerySeriesUpdate|undefined} value
+ * @return {!proto.gateway.web.v1.QueryDataEnvelope} returns this
 */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.setBucketUpdate = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.MetricAnalyticsEnvelope.oneofGroups_[0], value);
+proto.gateway.web.v1.QueryDataEnvelope.prototype.setUpdate = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.QueryDataEnvelope.oneofGroups_[0], value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricAnalyticsEnvelope} returns this
+ * @return {!proto.gateway.web.v1.QueryDataEnvelope} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.clearBucketUpdate = function() {
-  return this.setBucketUpdate(undefined);
+proto.gateway.web.v1.QueryDataEnvelope.prototype.clearUpdate = function() {
+  return this.setUpdate(undefined);
 };
@@ -2834,7 +4026,7 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.clearBucketUpdate = funct
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.hasBucketUpdate = function() {
+proto.gateway.web.v1.QueryDataEnvelope.prototype.hasUpdate = function() {
   return jspb.Message.getField(this, 2) != null;
 };
@@ -2845,7 +4037,7 @@ proto.gateway.web.v1.MetricAnalyticsEnvelope.prototype.hasBucketUpdate = functio
  * @private {!Array<number>}
  * @const
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.repeatedFields_ = [1];
+proto.gateway.web.v1.QuerySnapshot.repeatedFields_ = [1];
@@ -2862,8 +4054,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricAnalyticsSnapshot.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.QuerySnapshot.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.QuerySnapshot.toObject(opt_includeInstance, this);
 };
@@ -2872,16 +4064,16 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.toObject = function(opt_i
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricAnalyticsSnapshot} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.QuerySnapshot} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.QuerySnapshot.toObject = function(includeInstance, msg) {
   var f, obj = {
 seriesList: jspb.Message.toObjectList(msg.getSeriesList(),
     proto.gateway.web.v1.MetricSeries.toObject, includeInstance),
-windowStart: (f = msg.getWindowStart()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-windowEnd: (f = msg.getWindowEnd()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+rangeStart: (f = msg.getRangeStart()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+rangeEnd: (f = msg.getRangeEnd()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
 bucketSizeMs: jspb.Message.getFieldWithDefault(msg, 4, 0),
 expectedBucketCount: jspb.Message.getFieldWithDefault(msg, 5, 0),
 unit: jspb.Message.getFieldWithDefault(msg, 6, "")
@@ -2898,23 +4090,23 @@ unit: jspb.Message.getFieldWithDefault(msg, 6, "")
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot}
+ * @return {!proto.gateway.web.v1.QuerySnapshot}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.QuerySnapshot.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricAnalyticsSnapshot;
-  return proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.QuerySnapshot;
+  return proto.gateway.web.v1.QuerySnapshot.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricAnalyticsSnapshot} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.QuerySnapshot} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot}
+ * @return {!proto.gateway.web.v1.QuerySnapshot}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.QuerySnapshot.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2929,12 +4121,12 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader = funct
     case 2:
       var value = new google_protobuf_timestamp_pb.Timestamp;
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
-      msg.setWindowStart(value);
+      msg.setRangeStart(value);
       break;
     case 3:
       var value = new google_protobuf_timestamp_pb.Timestamp;
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
-      msg.setWindowEnd(value);
+      msg.setRangeEnd(value);
       break;
     case 4:
       var value = /** @type {number} */ (reader.readInt64());
@@ -2961,9 +4153,9 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader = funct
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.serializeBinary = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.QuerySnapshot.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2971,11 +4163,11 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.serializeBinary = functio
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricAnalyticsSnapshot} message
+ * @param {!proto.gateway.web.v1.QuerySnapshot} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.QuerySnapshot.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getSeriesList();
   if (f.length > 0) {
@@ -2985,7 +4177,7 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter = function(
       proto.gateway.web.v1.MetricSeries.serializeBinaryToWriter
     );
   }
-  f = message.getWindowStart();
+  f = message.getRangeStart();
   if (f != null) {
     writer.writeMessage(
       2,
@@ -2993,7 +4185,7 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter = function(
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
   }
-  f = message.getWindowEnd();
+  f = message.getRangeEnd();
   if (f != null) {
     writer.writeMessage(
       3,
@@ -3029,7 +4221,7 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter = function(
  * repeated MetricSeries series = 1;
  * @return {!Array<!proto.gateway.web.v1.MetricSeries>}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getSeriesList = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.getSeriesList = function() {
   return /** @type{!Array<!proto.gateway.web.v1.MetricSeries>} */ (
     jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricSeries, 1));
 };
@@ -3037,9 +4229,9 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getSeriesList = function(
 /**
  * @param {!Array<!proto.gateway.web.v1.MetricSeries>} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
 */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setSeriesList = function(value) {
+proto.gateway.web.v1.QuerySnapshot.prototype.setSeriesList = function(value) {
   return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
@@ -3049,25 +4241,25 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setSeriesList = function(
  * @param {number=} opt_index
  * @return {!proto.gateway.web.v1.MetricSeries}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.addSeries = function(opt_value, opt_index) {
+proto.gateway.web.v1.QuerySnapshot.prototype.addSeries = function(opt_value, opt_index) {
   return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.gateway.web.v1.MetricSeries, opt_index);
 };
 /**
  * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.clearSeriesList = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.clearSeriesList = function() {
   return this.setSeriesList([]);
 };
 /**
- * optional google.protobuf.Timestamp window_start = 2;
+ * optional google.protobuf.Timestamp range_start = 2;
  * @return {?proto.google.protobuf.Timestamp}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getWindowStart = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.getRangeStart = function() {
   return /** @type{?proto.google.protobuf.Timestamp} */ (
     jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
 };
@@ -3075,19 +4267,19 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getWindowStart = function
 /**
  * @param {?proto.google.protobuf.Timestamp|undefined} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
 */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setWindowStart = function(value) {
+proto.gateway.web.v1.QuerySnapshot.prototype.setRangeStart = function(value) {
   return jspb.Message.setWrapperField(this, 2, value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.clearWindowStart = function() {
-  return this.setWindowStart(undefined);
+proto.gateway.web.v1.QuerySnapshot.prototype.clearRangeStart = function() {
+  return this.setRangeStart(undefined);
 };
@@ -3095,16 +4287,16 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.clearWindowStart = functi
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.hasWindowStart = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.hasRangeStart = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 /**
- * optional google.protobuf.Timestamp window_end = 3;
+ * optional google.protobuf.Timestamp range_end = 3;
  * @return {?proto.google.protobuf.Timestamp}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getWindowEnd = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.getRangeEnd = function() {
   return /** @type{?proto.google.protobuf.Timestamp} */ (
     jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 3));
 };
@@ -3112,19 +4304,19 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getWindowEnd = function()
 /**
  * @param {?proto.google.protobuf.Timestamp|undefined} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
 */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setWindowEnd = function(value) {
+proto.gateway.web.v1.QuerySnapshot.prototype.setRangeEnd = function(value) {
   return jspb.Message.setWrapperField(this, 3, value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.clearWindowEnd = function() {
-  return this.setWindowEnd(undefined);
+proto.gateway.web.v1.QuerySnapshot.prototype.clearRangeEnd = function() {
+  return this.setRangeEnd(undefined);
 };
@@ -3132,7 +4324,7 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.clearWindowEnd = function
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.hasWindowEnd = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.hasRangeEnd = function() {
   return jspb.Message.getField(this, 3) != null;
 };
@@ -3141,16 +4333,16 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.hasWindowEnd = function()
  * optional int64 bucket_size_ms = 4;
  * @return {number}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getBucketSizeMs = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.getBucketSizeMs = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 /**
  * @param {number} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setBucketSizeMs = function(value) {
+proto.gateway.web.v1.QuerySnapshot.prototype.setBucketSizeMs = function(value) {
   return jspb.Message.setProto3IntField(this, 4, value);
 };
@@ -3159,16 +4351,16 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setBucketSizeMs = functio
  * optional int32 expected_bucket_count = 5;
  * @return {number}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getExpectedBucketCount = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.getExpectedBucketCount = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
 };
 /**
  * @param {number} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setExpectedBucketCount = function(value) {
+proto.gateway.web.v1.QuerySnapshot.prototype.setExpectedBucketCount = function(value) {
   return jspb.Message.setProto3IntField(this, 5, value);
 };
@@ -3177,16 +4369,16 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setExpectedBucketCount =
  * optional string unit = 6;
  * @return {string}
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.getUnit = function() {
+proto.gateway.web.v1.QuerySnapshot.prototype.getUnit = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.MetricAnalyticsSnapshot} returns this
+ * @return {!proto.gateway.web.v1.QuerySnapshot} returns this
  */
-proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setUnit = function(value) {
+proto.gateway.web.v1.QuerySnapshot.prototype.setUnit = function(value) {
   return jspb.Message.setProto3StringField(this, 6, value);
 };
@@ -3230,7 +4422,7 @@ proto.gateway.web.v1.MetricSeries.prototype.toObject = function(opt_includeInsta
  */
 proto.gateway.web.v1.MetricSeries.toObject = function(includeInstance, msg) {
   var f, obj = {
-groupKeyMap: (f = msg.getGroupKeyMap()) ? f.toObject(includeInstance, undefined) : [],
+groupValuesMap: (f = msg.getGroupValuesMap()) ? f.toObject(includeInstance, undefined) : [],
 bucketsList: jspb.Message.toObjectList(msg.getBucketsList(),
     proto.gateway.web.v1.MetricBucket.toObject, includeInstance)
   };
@@ -3270,7 +4462,7 @@ proto.gateway.web.v1.MetricSeries.deserializeBinaryFromReader = function(msg, re
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = msg.getGroupKeyMap();
+      var value = msg.getGroupValuesMap();
       reader.readMessage(value, function(message, reader) {
         jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
          });
@@ -3309,7 +4501,7 @@ proto.gateway.web.v1.MetricSeries.prototype.serializeBinary = function() {
  */
 proto.gateway.web.v1.MetricSeries.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getGroupKeyMap(true);
+  f = message.getGroupValuesMap(true);
   if (f && f.getLength() > 0) {
     f.serializeBinary(1, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
   }
@@ -3325,12 +4517,12 @@ proto.gateway.web.v1.MetricSeries.serializeBinaryToWriter = function(message, wr
 /**
- * map<string, string> group_key = 1;
+ * map<string, string> group_values = 1;
  * @param {boolean=} opt_noLazyCreate Do not create the map if
  * empty, instead returning `undefined`
  * @return {!jspb.Map<string,string>}
  */
-proto.gateway.web.v1.MetricSeries.prototype.getGroupKeyMap = function(opt_noLazyCreate) {
+proto.gateway.web.v1.MetricSeries.prototype.getGroupValuesMap = function(opt_noLazyCreate) {
   return /** @type {!jspb.Map<string,string>} */ (
       jspb.Message.getMapField(this, 1, opt_noLazyCreate,
       null));
@@ -3341,8 +4533,8 @@ proto.gateway.web.v1.MetricSeries.prototype.getGroupKeyMap = function(opt_noLazy
  * Clears values from the map. The map will be non-null.
  * @return {!proto.gateway.web.v1.MetricSeries} returns this
  */
-proto.gateway.web.v1.MetricSeries.prototype.clearGroupKeyMap = function() {
-  this.getGroupKeyMap().clear();
+proto.gateway.web.v1.MetricSeries.prototype.clearGroupValuesMap = function() {
+  this.getGroupValuesMap().clear();
   return this;
 };
@@ -3582,8 +4774,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricSeriesBucketUpdate.toObject(opt_includeInstance, this);
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.QuerySeriesUpdate.toObject(opt_includeInstance, this);
 };
@@ -3592,13 +4784,13 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.toObject = function(opt_
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.gateway.web.v1.MetricSeriesBucketUpdate} msg The msg instance to transform.
+ * @param {!proto.gateway.web.v1.QuerySeriesUpdate} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.toObject = function(includeInstance, msg) {
+proto.gateway.web.v1.QuerySeriesUpdate.toObject = function(includeInstance, msg) {
   var f, obj = {
-groupKeyMap: (f = msg.getGroupKeyMap()) ? f.toObject(includeInstance, undefined) : [],
+groupValuesMap: (f = msg.getGroupValuesMap()) ? f.toObject(includeInstance, undefined) : [],
 bucket: (f = msg.getBucket()) && proto.gateway.web.v1.MetricBucket.toObject(includeInstance, f),
 generatedAt: (f = msg.getGeneratedAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f)
   };
@@ -3614,23 +4806,23 @@ generatedAt: (f = msg.getGeneratedAt()) && google_protobuf_timestamp_pb.Timestam
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate}
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.QuerySeriesUpdate.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.gateway.web.v1.MetricSeriesBucketUpdate;
-  return proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.gateway.web.v1.QuerySeriesUpdate;
+  return proto.gateway.web.v1.QuerySeriesUpdate.deserializeBinaryFromReader(msg, reader);
 };
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.gateway.web.v1.MetricSeriesBucketUpdate} msg The message object to deserialize into.
+ * @param {!proto.gateway.web.v1.QuerySeriesUpdate} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate}
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.QuerySeriesUpdate.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3638,7 +4830,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinaryFromReader = func
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = msg.getGroupKeyMap();
+      var value = msg.getGroupValuesMap();
       reader.readMessage(value, function(message, reader) {
         jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
          });
@@ -3666,9 +4858,9 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinaryFromReader = func
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.serializeBinary = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.QuerySeriesUpdate.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -3676,13 +4868,13 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.serializeBinary = functi
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricSeriesBucketUpdate} message
+ * @param {!proto.gateway.web.v1.QuerySeriesUpdate} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.QuerySeriesUpdate.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getGroupKeyMap(true);
+  f = message.getGroupValuesMap(true);
   if (f && f.getLength() > 0) {
     f.serializeBinary(1, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
   }
@@ -3706,12 +4898,12 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter = function
 /**
- * map<string, string> group_key = 1;
+ * map<string, string> group_values = 1;
  * @param {boolean=} opt_noLazyCreate Do not create the map if
  * empty, instead returning `undefined`
  * @return {!jspb.Map<string,string>}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getGroupKeyMap = function(opt_noLazyCreate) {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.getGroupValuesMap = function(opt_noLazyCreate) {
   return /** @type {!jspb.Map<string,string>} */ (
       jspb.Message.getMapField(this, 1, opt_noLazyCreate,
       null));
@@ -3720,10 +4912,10 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getGroupKeyMap = functio
 /**
  * Clears values from the map. The map will be non-null.
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate} returns this
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearGroupKeyMap = function() {
-  this.getGroupKeyMap().clear();
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.clearGroupValuesMap = function() {
+  this.getGroupValuesMap().clear();
   return this;
 };
@@ -3732,7 +4924,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearGroupKeyMap = funct
  * optional MetricBucket bucket = 2;
  * @return {?proto.gateway.web.v1.MetricBucket}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getBucket = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.getBucket = function() {
   return /** @type{?proto.gateway.web.v1.MetricBucket} */ (
     jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricBucket, 2));
 };
@@ -3740,18 +4932,18 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getBucket = function() {
 /**
  * @param {?proto.gateway.web.v1.MetricBucket|undefined} value
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate} returns this
 */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.setBucket = function(value) {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.setBucket = function(value) {
   return jspb.Message.setWrapperField(this, 2, value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate} returns this
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearBucket = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.clearBucket = function() {
   return this.setBucket(undefined);
 };
@@ -3760,7 +4952,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearBucket = function()
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.hasBucket = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.hasBucket = function() {
   return jspb.Message.getField(this, 2) != null;
 };
@@ -3769,7 +4961,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.hasBucket = function() {
  * optional google.protobuf.Timestamp generated_at = 3;
  * @return {?proto.google.protobuf.Timestamp}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getGeneratedAt = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.getGeneratedAt = function() {
   return /** @type{?proto.google.protobuf.Timestamp} */ (
     jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 3));
 };
@@ -3777,18 +4969,18 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getGeneratedAt = functio
 /**
  * @param {?proto.google.protobuf.Timestamp|undefined} value
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate} returns this
 */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.setGeneratedAt = function(value) {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.setGeneratedAt = function(value) {
   return jspb.Message.setWrapperField(this, 3, value);
 };
 /**
  * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
+ * @return {!proto.gateway.web.v1.QuerySeriesUpdate} returns this
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearGeneratedAt = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.clearGeneratedAt = function() {
   return this.setGeneratedAt(undefined);
 };
@@ -3797,7 +4989,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearGeneratedAt = funct
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.hasGeneratedAt = function() {
+proto.gateway.web.v1.QuerySeriesUpdate.prototype.hasGeneratedAt = function() {
   return jspb.Message.getField(this, 3) != null;
 };
@@ -3815,19 +5007,48 @@ proto.gateway.web.v1.MetricKind = {
 /**
  * @enum {number}
  */
-proto.gateway.web.v1.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
+proto.gateway.web.v1.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
+};
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.SumAggregation = {
+  SUM_AGGREGATION_UNSPECIFIED: 0,
+  SUM_AGGREGATION_RATE: 1,
+  SUM_AGGREGATION_INCREASE: 2,
+  SUM_AGGREGATION_LAST: 3,
+  SUM_AGGREGATION_COUNT: 4
+};
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.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
+};
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.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
 };
 goog.object.extend(exports, proto.gateway.web.v1);