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

@miradorlabs/web-grpc 1.3.0 → 2.0.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 (4) hide show

package/package.json +1 -1
package/proto/gateway/web/v1/telemetry_gateway.ts +720 -879
package/proto/gateway/web/v1/telemetry_gateway_grpc_pb.js +85 -74
package/proto/gateway/web/v1/telemetry_gateway_pb.js +1079 -984

package/proto/gateway/web/v1/telemetry_gateway_pb.js CHANGED Viewed

@@ -23,29 +23,31 @@ 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.GaugeAggregation', null, global);
+goog.exportSymbol('proto.gateway.web.v1.GaugeQueryRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.HistogramAggregation', null, global);
+goog.exportSymbol('proto.gateway.web.v1.HistogramQueryRequest', 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.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.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.StreamMetricAttributesRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.StreamMetricsRequest', null, global);
+goog.exportSymbol('proto.gateway.web.v1.SumAggregation', null, global);
+goog.exportSymbol('proto.gateway.web.v1.SumQueryRequest', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -56,16 +58,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 +79,16 @@ 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.
@@ -98,16 +100,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricInfo = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+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.MetricInfo, jspb.Message);
+goog.inherits(proto.gateway.web.v1.MetricCatalogSnapshot, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricInfo.displayName = 'proto.gateway.web.v1.MetricInfo';
+  proto.gateway.web.v1.MetricCatalogSnapshot.displayName = 'proto.gateway.web.v1.MetricCatalogSnapshot';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -119,16 +121,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.ListMetricAttributesRequest = function(opt_data) {
+proto.gateway.web.v1.MetricInfo = 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.MetricInfo, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.ListMetricAttributesRequest.displayName = 'proto.gateway.web.v1.ListMetricAttributesRequest';
+  proto.gateway.web.v1.MetricInfo.displayName = 'proto.gateway.web.v1.MetricInfo';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -140,16 +142,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.StreamMetricAttributesRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.gateway.web.v1.ListMetricAttributesResponse, jspb.Message);
+goog.inherits(proto.gateway.web.v1.StreamMetricAttributesRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.ListMetricAttributesResponse.displayName = 'proto.gateway.web.v1.ListMetricAttributesResponse';
+  proto.gateway.web.v1.StreamMetricAttributesRequest.displayName = 'proto.gateway.web.v1.StreamMetricAttributesRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -161,16 +163,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricAttribute = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricAttribute.repeatedFields_, null);
+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.MetricAttribute, jspb.Message);
+goog.inherits(proto.gateway.web.v1.MetricAttributeEnvelope, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricAttribute.displayName = 'proto.gateway.web.v1.MetricAttribute';
+  proto.gateway.web.v1.MetricAttributeEnvelope.displayName = 'proto.gateway.web.v1.MetricAttributeEnvelope';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -182,16 +184,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.MetricQuery = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricQuery.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.MetricQuery, jspb.Message);
+goog.inherits(proto.gateway.web.v1.MetricAttributeSnapshot, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricQuery.displayName = 'proto.gateway.web.v1.MetricQuery';
+  proto.gateway.web.v1.MetricAttributeSnapshot.displayName = 'proto.gateway.web.v1.MetricAttributeSnapshot';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -203,16 +205,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.MetricAttribute = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.gateway.web.v1.MetricAttribute.repeatedFields_, null);
 };
-goog.inherits(proto.gateway.web.v1.MetricFilter, jspb.Message);
+goog.inherits(proto.gateway.web.v1.MetricAttribute, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.MetricFilter.displayName = 'proto.gateway.web.v1.MetricFilter';
+  proto.gateway.web.v1.MetricAttribute.displayName = 'proto.gateway.web.v1.MetricAttribute';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -224,16 +226,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.QueryMetricsRequest = function(opt_data) {
+proto.gateway.web.v1.GaugeQueryRequest = 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.GaugeQueryRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.QueryMetricsRequest.displayName = 'proto.gateway.web.v1.QueryMetricsRequest';
+  proto.gateway.web.v1.GaugeQueryRequest.displayName = 'proto.gateway.web.v1.GaugeQueryRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -245,16 +247,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.QueryMetricsResponse = function(opt_data) {
+proto.gateway.web.v1.SumQueryRequest = 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.SumQueryRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.QueryMetricsResponse.displayName = 'proto.gateway.web.v1.QueryMetricsResponse';
+  proto.gateway.web.v1.SumQueryRequest.displayName = 'proto.gateway.web.v1.SumQueryRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -266,16 +268,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest = function(opt_data) {
+proto.gateway.web.v1.HistogramQueryRequest = 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.HistogramQueryRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.gateway.web.v1.StreamMetricAnalyticsRequest.displayName = 'proto.gateway.web.v1.StreamMetricAnalyticsRequest';
+  proto.gateway.web.v1.HistogramQueryRequest.displayName = 'proto.gateway.web.v1.HistogramQueryRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -398,8 +400,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 +410,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 +431,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 +456,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 +475,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 +485,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 +509,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 +586,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 +596,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 +617,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 +641,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 +663,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 +673,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 +699,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,27 +730,186 @@ 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;
+ * optional MetricInfo added = 2;
+ * @return {?proto.gateway.web.v1.MetricInfo}
+ */
+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 {?proto.gateway.web.v1.MetricInfo|undefined} value
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope} returns this
+*/
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.setAdded = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.MetricCatalogEnvelope.oneofGroups_[0], value);
+};
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.MetricCatalogEnvelope} returns this
+ */
+proto.gateway.web.v1.MetricCatalogEnvelope.prototype.clearAdded = function() {
+  return this.setAdded(undefined);
+};
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+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) {
+/**
+ * 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.MetricCatalogSnapshot.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricCatalogSnapshot.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.MetricCatalogSnapshot} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot.toObject = function(includeInstance, msg) {
+  var f, obj = {
+metricsList: jspb.Message.toObjectList(msg.getMetricsList(),
+    proto.gateway.web.v1.MetricInfo.toObject, includeInstance)
+  };
+  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.MetricCatalogSnapshot}
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  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.MetricCatalogSnapshot} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot}
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = new proto.gateway.web.v1.MetricInfo;
+      reader.readMessage(value,proto.gateway.web.v1.MetricInfo.deserializeBinaryFromReader);
+      msg.addMetrics(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.gateway.web.v1.MetricCatalogSnapshot.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.MetricCatalogSnapshot} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.gateway.web.v1.MetricCatalogSnapshot.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getMetricsList();
+  if (f.length > 0) {
+    writer.writeRepeatedMessage(
+      1,
+      f,
+      proto.gateway.web.v1.MetricInfo.serializeBinaryToWriter
+    );
+  }
+};
+/**
+ * repeated MetricInfo metrics = 1;
  * @return {!Array<!proto.gateway.web.v1.MetricInfo>}
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.getMetricsList = function() {
+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, 2));
+    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricInfo, 1));
 };
 /**
  * @param {!Array<!proto.gateway.web.v1.MetricInfo>} value
- * @return {!proto.gateway.web.v1.ListMetricsResponse} returns this
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot} returns this
 */
-proto.gateway.web.v1.ListMetricsResponse.prototype.setMetricsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 2, value);
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.setMetricsList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
@@ -739,16 +918,16 @@ proto.gateway.web.v1.ListMetricsResponse.prototype.setMetricsList = function(val
  * @param {number=} opt_index
  * @return {!proto.gateway.web.v1.MetricInfo}
  */
-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.MetricCatalogSnapshot.prototype.addMetrics = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.gateway.web.v1.MetricInfo, opt_index);
 };
 /**
  * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.ListMetricsResponse} returns this
+ * @return {!proto.gateway.web.v1.MetricCatalogSnapshot} returns this
  */
-proto.gateway.web.v1.ListMetricsResponse.prototype.clearMetricsList = function() {
+proto.gateway.web.v1.MetricCatalogSnapshot.prototype.clearMetricsList = function() {
   return this.setMetricsList([]);
 };
@@ -959,8 +1138,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.StreamMetricAttributesRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.StreamMetricAttributesRequest.toObject(opt_includeInstance, this);
 };
@@ -969,15 +1148,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.StreamMetricAttributesRequest} 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.StreamMetricAttributesRequest.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, "")
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+metricName: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
   if (includeInstance) {
@@ -991,23 +1170,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.StreamMetricAttributesRequest}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.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.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.ListMetricAttributesRequest} 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.ListMetricAttributesRequest}
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1016,15 +1195,15 @@ proto.gateway.web.v1.ListMetricAttributesRequest.deserializeBinaryFromReader = f
     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.setMetricName(value);
+      msg.setProjectId(value);
       break;
     case 3:
       var value = /** @type {string} */ (reader.readString());
-      msg.setOrganizationId(value);
+      msg.setMetricName(value);
       break;
     default:
       reader.skipField();
@@ -1039,9 +1218,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.StreamMetricAttributesRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.ListMetricAttributesRequest.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.StreamMetricAttributesRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -1049,27 +1228,27 @@ 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.StreamMetricAttributesRequest} 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.StreamMetricAttributesRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getProjectId();
+  f = message.getOrganizationId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getMetricName();
+  f = message.getProjectId();
   if (f.length > 0) {
     writer.writeString(
       2,
       f
     );
   }
-  f = message.getOrganizationId();
+  f = message.getMetricName();
   if (f.length > 0) {
     writer.writeString(
       3,
@@ -1080,66 +1259,85 @@ proto.gateway.web.v1.ListMetricAttributesRequest.serializeBinaryToWriter = funct
 /**
- * optional string project_id = 1;
+ * optional string organization_id = 1;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.getProjectId = function() {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.getOrganizationId = 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.StreamMetricAttributesRequest} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.setProjectId = function(value) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.setOrganizationId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * optional string metric_name = 2;
+ * optional string project_id = 2;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.getMetricName = function() {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.getProjectId = 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.StreamMetricAttributesRequest} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.setMetricName = function(value) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.setProjectId = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * optional string organization_id = 3;
+ * optional string metric_name = 3;
  * @return {string}
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.getOrganizationId = function() {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.getMetricName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesRequest} returns this
+ * @return {!proto.gateway.web.v1.StreamMetricAttributesRequest} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesRequest.prototype.setOrganizationId = function(value) {
+proto.gateway.web.v1.StreamMetricAttributesRequest.prototype.setMetricName = function(value) {
   return jspb.Message.setProto3StringField(this, 3, 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.ListMetricAttributesResponse.repeatedFields_ = [2];
+proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_ = [[1,2]];
+/**
+ * @enum {number}
+ */
+proto.gateway.web.v1.MetricAttributeEnvelope.EventCase = {
+  EVENT_NOT_SET: 0,
+  SNAPSHOT: 1,
+  ADDED: 2
+};
+/**
+ * @return {proto.gateway.web.v1.MetricAttributeEnvelope.EventCase}
+ */
+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]));
+};
@@ -1156,8 +1354,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.MetricAttributeEnvelope.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricAttributeEnvelope.toObject(opt_includeInstance, this);
 };
@@ -1166,15 +1364,14 @@ 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.MetricAttributeEnvelope} 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.MetricAttributeEnvelope.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)
+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) {
@@ -1188,23 +1385,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.MetricAttributeEnvelope}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricAttributeEnvelope.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.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.ListMetricAttributesResponse} 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.ListMetricAttributesResponse}
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricAttributeEnvelope.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1212,14 +1409,14 @@ 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 = new proto.gateway.web.v1.MetricAttributeSnapshot;
+      reader.readMessage(value,proto.gateway.web.v1.MetricAttributeSnapshot.deserializeBinaryFromReader);
+      msg.setSnapshot(value);
       break;
     case 2:
       var value = new proto.gateway.web.v1.MetricAttribute;
       reader.readMessage(value,proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader);
-      msg.addAttributes(value);
+      msg.setAdded(value);
       break;
     default:
       reader.skipField();
@@ -1234,9 +1431,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.MetricAttributeEnvelope.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.ListMetricAttributesResponse.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.MetricAttributeEnvelope.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -1244,23 +1441,23 @@ 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.MetricAttributeEnvelope} 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.MetricAttributeEnvelope.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.MetricAttributeSnapshot.serializeBinaryToWriter
     );
   }
-  f = message.getAttributesList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
+  f = message.getAdded();
+  if (f != null) {
+    writer.writeMessage(
       2,
       f,
       proto.gateway.web.v1.MetricAttribute.serializeBinaryToWriter
@@ -1270,30 +1467,30 @@ proto.gateway.web.v1.ListMetricAttributesResponse.serializeBinaryToWriter = func
 /**
- * optional gateway.common.v1.ResponseStatus status = 1;
- * @return {?proto.gateway.common.v1.ResponseStatus}
+ * optional MetricAttributeSnapshot snapshot = 1;
+ * @return {?proto.gateway.web.v1.MetricAttributeSnapshot}
  */
-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.MetricAttributeEnvelope.prototype.getSnapshot = function() {
+  return /** @type{?proto.gateway.web.v1.MetricAttributeSnapshot} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricAttributeSnapshot, 1));
 };
 /**
- * @param {?proto.gateway.common.v1.ResponseStatus|undefined} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
+ * @param {?proto.gateway.web.v1.MetricAttributeSnapshot|undefined} value
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
 */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.setStatus = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+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.ListMetricAttributesResponse} returns this
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.clearStatus = function() {
-  return this.setStatus(undefined);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.clearSnapshot = function() {
+  return this.setSnapshot(undefined);
 };
@@ -1301,46 +1498,45 @@ proto.gateway.web.v1.ListMetricAttributesResponse.prototype.clearStatus = functi
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.hasStatus = function() {
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.hasSnapshot = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 /**
- * repeated MetricAttribute attributes = 2;
- * @return {!Array<!proto.gateway.web.v1.MetricAttribute>}
+ * optional MetricAttribute added = 2;
+ * @return {?proto.gateway.web.v1.MetricAttribute}
  */
-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.MetricAttributeEnvelope.prototype.getAdded = function() {
+  return /** @type{?proto.gateway.web.v1.MetricAttribute} */ (
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricAttribute, 2));
 };
 /**
- * @param {!Array<!proto.gateway.web.v1.MetricAttribute>} value
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
+ * @param {?proto.gateway.web.v1.MetricAttribute|undefined} value
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
 */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.setAttributesList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 2, value);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.setAdded = function(value) {
+  return jspb.Message.setOneofWrapperField(this, 2, proto.gateway.web.v1.MetricAttributeEnvelope.oneofGroups_[0], value);
 };
 /**
- * @param {!proto.gateway.web.v1.MetricAttribute=} opt_value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricAttribute}
+ * Clears the message field making it undefined.
+ * @return {!proto.gateway.web.v1.MetricAttributeEnvelope} returns this
  */
-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.prototype.clearAdded = function() {
+  return this.setAdded(undefined);
 };
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.ListMetricAttributesResponse} returns this
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.gateway.web.v1.ListMetricAttributesResponse.prototype.clearAttributesList = function() {
-  return this.setAttributesList([]);
+proto.gateway.web.v1.MetricAttributeEnvelope.prototype.hasAdded = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
@@ -1350,7 +1546,7 @@ proto.gateway.web.v1.ListMetricAttributesResponse.prototype.clearAttributesList
  * @private {!Array<number>}
  * @const
  */
-proto.gateway.web.v1.MetricAttribute.repeatedFields_ = [2];
+proto.gateway.web.v1.MetricAttributeSnapshot.repeatedFields_ = [1];
@@ -1367,8 +1563,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.MetricAttributeSnapshot.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.MetricAttributeSnapshot.toObject(opt_includeInstance, this);
 };
@@ -1377,14 +1573,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.MetricAttributeSnapshot} 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.MetricAttributeSnapshot.toObject = function(includeInstance, msg) {
   var f, obj = {
-key: jspb.Message.getFieldWithDefault(msg, 1, ""),
-valuesList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? undefined : f
+attributesList: jspb.Message.toObjectList(msg.getAttributesList(),
+    proto.gateway.web.v1.MetricAttribute.toObject, includeInstance)
   };
   if (includeInstance) {
@@ -1398,23 +1594,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.MetricAttributeSnapshot}
  */
-proto.gateway.web.v1.MetricAttribute.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.MetricAttributeSnapshot.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.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.MetricAttribute} 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.MetricAttribute}
+ * @return {!proto.gateway.web.v1.MetricAttributeSnapshot}
  */
-proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.MetricAttributeSnapshot.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1422,7 +1618,167 @@ proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader = function(msg,
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
+      var value = new proto.gateway.web.v1.MetricAttribute;
+      reader.readMessage(value,proto.gateway.web.v1.MetricAttribute.deserializeBinaryFromReader);
+      msg.addAttributes(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  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:
@@ -1531,13 +1887,6 @@ proto.gateway.web.v1.MetricAttribute.prototype.clearValuesList = function() {
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.gateway.web.v1.MetricQuery.repeatedFields_ = [4];
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1553,8 +1902,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.GaugeQueryRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.GaugeQueryRequest.toObject(opt_includeInstance, this);
 };
@@ -1563,20 +1912,18 @@ 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.GaugeQueryRequest} 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.GaugeQueryRequest.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, "")
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+metricName: jspb.Message.getFieldWithDefault(msg, 3, ""),
+aggregation: jspb.Message.getFieldWithDefault(msg, 4, 0),
+timeWindow: jspb.Message.getFieldWithDefault(msg, 5, 0),
+timeInterval: jspb.Message.getFieldWithDefault(msg, 6, 0)
   };
   if (includeInstance) {
@@ -1590,23 +1937,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.GaugeQueryRequest}
  */
-proto.gateway.web.v1.MetricQuery.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.GaugeQueryRequest.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.GaugeQueryRequest;
+  return proto.gateway.web.v1.GaugeQueryRequest.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.GaugeQueryRequest} 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.GaugeQueryRequest}
  */
-proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.GaugeQueryRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1615,37 +1962,28 @@ proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader = function(msg, rea
     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.setMetricName(value);
+      msg.setProjectId(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);
+      msg.setMetricName(value);
       break;
-    case 5:
-      var value = /** @type {!proto.gateway.web.v1.MetricAggregation} */ (reader.readEnum());
+    case 4:
+      var value = /** @type {!proto.gateway.web.v1.GaugeAggregation} */ (reader.readEnum());
       msg.setAggregation(value);
       break;
-    case 6:
+    case 5:
       var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (reader.readEnum());
       msg.setTimeWindow(value);
       break;
-    case 7:
+    case 6:
       var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (reader.readEnum());
       msg.setTimeInterval(value);
       break;
-    case 8:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setOrganizationId(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -1659,9 +1997,9 @@ proto.gateway.web.v1.MetricQuery.deserializeBinaryFromReader = function(msg, rea
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.gateway.web.v1.MetricQuery.prototype.serializeBinary = function() {
+proto.gateway.web.v1.GaugeQueryRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.GaugeQueryRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -1669,66 +2007,51 @@ proto.gateway.web.v1.MetricQuery.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.MetricQuery} message
+ * @param {!proto.gateway.web.v1.GaugeQueryRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter = function(message, writer) {
+proto.gateway.web.v1.GaugeQueryRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getProjectId();
+  f = message.getOrganizationId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getMetricName();
+  f = message.getProjectId();
   if (f.length > 0) {
     writer.writeString(
       2,
       f
     );
   }
-  f = message.getFilter();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.gateway.web.v1.MetricFilter.serializeBinaryToWriter
-    );
-  }
-  f = message.getGroupByList();
+  f = message.getMetricName();
   if (f.length > 0) {
-    writer.writeRepeatedString(
-      4,
+    writer.writeString(
+      3,
       f
     );
   }
   f = message.getAggregation();
   if (f !== 0.0) {
     writer.writeEnum(
-      5,
+      4,
       f
     );
   }
   f = message.getTimeWindow();
   if (f !== 0.0) {
     writer.writeEnum(
-      6,
+      5,
       f
     );
   }
   f = message.getTimeInterval();
   if (f !== 0.0) {
     writer.writeEnum(
-      7,
-      f
-    );
-  }
-  f = message.getOrganizationId();
-  if (f.length > 0) {
-    writer.writeString(
-      8,
+      6,
       f
     );
   }
@@ -1736,258 +2059,181 @@ proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter = function(message, wri
 /**
- * optional string project_id = 1;
+ * optional string organization_id = 1;
  * @return {string}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getProjectId = function() {
+proto.gateway.web.v1.GaugeQueryRequest.prototype.getOrganizationId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * @return {!proto.gateway.web.v1.GaugeQueryRequest} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setProjectId = function(value) {
+proto.gateway.web.v1.GaugeQueryRequest.prototype.setOrganizationId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * optional string metric_name = 2;
+ * optional string project_id = 2;
  * @return {string}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getMetricName = function() {
+proto.gateway.web.v1.GaugeQueryRequest.prototype.getProjectId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 /**
  * @param {string} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * @return {!proto.gateway.web.v1.GaugeQueryRequest} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setMetricName = function(value) {
+proto.gateway.web.v1.GaugeQueryRequest.prototype.setProjectId = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * optional MetricFilter filter = 3;
- * @return {?proto.gateway.web.v1.MetricFilter}
+ * optional string metric_name = 3;
+ * @return {string}
  */
-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.GaugeQueryRequest.prototype.getMetricName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricFilter|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);
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.GaugeQueryRequest} returns this
+ */
+proto.gateway.web.v1.GaugeQueryRequest.prototype.setMetricName = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * optional GaugeAggregation aggregation = 4;
+ * @return {!proto.gateway.web.v1.GaugeAggregation}
  */
-proto.gateway.web.v1.MetricQuery.prototype.clearFilter = function() {
-  return this.setFilter(undefined);
+proto.gateway.web.v1.GaugeQueryRequest.prototype.getAggregation = function() {
+  return /** @type {!proto.gateway.web.v1.GaugeAggregation} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {!proto.gateway.web.v1.GaugeAggregation} value
+ * @return {!proto.gateway.web.v1.GaugeQueryRequest} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.hasFilter = function() {
-  return jspb.Message.getField(this, 3) != null;
+proto.gateway.web.v1.GaugeQueryRequest.prototype.setAggregation = function(value) {
+  return jspb.Message.setProto3EnumField(this, 4, value);
 };
 /**
- * repeated string group_by = 4;
- * @return {!Array<string>}
+ * optional AnalyticsTimeWindow time_window = 5;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeWindow}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getGroupByList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 4));
+proto.gateway.web.v1.GaugeQueryRequest.prototype.getTimeWindow = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
 };
 /**
- * @param {!Array<string>} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * @param {!proto.gateway.web.v1.AnalyticsTimeWindow} value
+ * @return {!proto.gateway.web.v1.GaugeQueryRequest} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.setGroupByList = function(value) {
-  return jspb.Message.setField(this, 4, value || []);
+proto.gateway.web.v1.GaugeQueryRequest.prototype.setTimeWindow = function(value) {
+  return jspb.Message.setProto3EnumField(this, 5, value);
 };
 /**
- * @param {string} value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * optional AnalyticsTimeInterval time_interval = 6;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeInterval}
  */
-proto.gateway.web.v1.MetricQuery.prototype.addGroupBy = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 4, value, opt_index);
+proto.gateway.web.v1.GaugeQueryRequest.prototype.getTimeInterval = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
 };
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
+ * @param {!proto.gateway.web.v1.AnalyticsTimeInterval} value
+ * @return {!proto.gateway.web.v1.GaugeQueryRequest} returns this
  */
-proto.gateway.web.v1.MetricQuery.prototype.clearGroupByList = function() {
-  return this.setGroupByList([]);
+proto.gateway.web.v1.GaugeQueryRequest.prototype.setTimeInterval = function(value) {
+  return jspb.Message.setProto3EnumField(this, 6, value);
 };
+if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
- * optional MetricAggregation aggregation = 5;
- * @return {!proto.gateway.web.v1.MetricAggregation}
+ * 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.getAggregation = function() {
-  return /** @type {!proto.gateway.web.v1.MetricAggregation} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+proto.gateway.web.v1.SumQueryRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.SumQueryRequest.toObject(opt_includeInstance, this);
 };
 /**
- * @param {!proto.gateway.web.v1.MetricAggregation} 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.SumQueryRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.gateway.web.v1.MetricQuery.prototype.setAggregation = function(value) {
-  return jspb.Message.setProto3EnumField(this, 5, value);
+proto.gateway.web.v1.SumQueryRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+metricName: jspb.Message.getFieldWithDefault(msg, 3, ""),
+aggregation: jspb.Message.getFieldWithDefault(msg, 4, 0),
+timeWindow: jspb.Message.getFieldWithDefault(msg, 5, 0),
+timeInterval: jspb.Message.getFieldWithDefault(msg, 6, 0)
+  };
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
 };
+}
 /**
- * optional AnalyticsTimeWindow time_window = 6;
- * @return {!proto.gateway.web.v1.AnalyticsTimeWindow}
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.gateway.web.v1.SumQueryRequest}
  */
-proto.gateway.web.v1.MetricQuery.prototype.getTimeWindow = function() {
-  return /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
-};
-/**
- * @param {!proto.gateway.web.v1.AnalyticsTimeWindow} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
- */
-proto.gateway.web.v1.MetricQuery.prototype.setTimeWindow = function(value) {
-  return jspb.Message.setProto3EnumField(this, 6, value);
-};
-/**
- * optional AnalyticsTimeInterval time_interval = 7;
- * @return {!proto.gateway.web.v1.AnalyticsTimeInterval}
- */
-proto.gateway.web.v1.MetricQuery.prototype.getTimeInterval = function() {
-  return /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
-};
-/**
- * @param {!proto.gateway.web.v1.AnalyticsTimeInterval} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
- */
-proto.gateway.web.v1.MetricQuery.prototype.setTimeInterval = function(value) {
-  return jspb.Message.setProto3EnumField(this, 7, value);
-};
-/**
- * optional string organization_id = 8;
- * @return {string}
- */
-proto.gateway.web.v1.MetricQuery.prototype.getOrganizationId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
-};
-/**
- * @param {string} value
- * @return {!proto.gateway.web.v1.MetricQuery} returns this
- */
-proto.gateway.web.v1.MetricQuery.prototype.setOrganizationId = function(value) {
-  return jspb.Message.setProto3StringField(this, 8, 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) {
-/**
- * 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.MetricFilter.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.MetricFilter.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.MetricFilter} 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) {
-  var f, obj = {
-serviceNamesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? undefined : f,
-attributeEqualsMap: (f = msg.getAttributeEqualsMap()) ? f.toObject(includeInstance, undefined) : []
-  };
-  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.MetricFilter}
- */
-proto.gateway.web.v1.MetricFilter.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);
+proto.gateway.web.v1.SumQueryRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.gateway.web.v1.SumQueryRequest;
+  return proto.gateway.web.v1.SumQueryRequest.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.SumQueryRequest} 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.SumQueryRequest}
  */
-proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.SumQueryRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1996,13 +2242,27 @@ proto.gateway.web.v1.MetricFilter.deserializeBinaryFromReader = function(msg, re
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.addServiceNames(value);
+      msg.setOrganizationId(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 {string} */ (reader.readString());
+      msg.setProjectId(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMetricName(value);
+      break;
+    case 4:
+      var value = /** @type {!proto.gateway.web.v1.SumAggregation} */ (reader.readEnum());
+      msg.setAggregation(value);
+      break;
+    case 5:
+      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (reader.readEnum());
+      msg.setTimeWindow(value);
+      break;
+    case 6:
+      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (reader.readEnum());
+      msg.setTimeInterval(value);
       break;
     default:
       reader.skipField();
@@ -2017,9 +2277,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.SumQueryRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.MetricFilter.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.SumQueryRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2027,436 +2287,162 @@ 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.SumQueryRequest} 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.SumQueryRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getServiceNamesList();
+  f = message.getOrganizationId();
   if (f.length > 0) {
-    writer.writeRepeatedString(
+    writer.writeString(
       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.getProjectId();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
   }
-};
-/**
- * repeated string service_names = 1;
- * @return {!Array<string>}
- */
-proto.gateway.web.v1.MetricFilter.prototype.getServiceNamesList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 1));
-};
-/**
- * @param {!Array<string>} value
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
- */
-proto.gateway.web.v1.MetricFilter.prototype.setServiceNamesList = function(value) {
-  return jspb.Message.setField(this, 1, value || []);
-};
-/**
- * @param {string} value
- * @param {number=} opt_index
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
- */
-proto.gateway.web.v1.MetricFilter.prototype.addServiceNames = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.gateway.web.v1.MetricFilter} returns this
- */
-proto.gateway.web.v1.MetricFilter.prototype.clearServiceNamesList = function() {
-  return this.setServiceNamesList([]);
-};
-/**
- * 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
- */
-proto.gateway.web.v1.MetricFilter.prototype.clearAttributeEqualsMap = function() {
-  this.getAttributeEqualsMap().clear();
-  return this;
-};
-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.QueryMetricsRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.QueryMetricsRequest.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.QueryMetricsRequest} 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) {
-  var f, obj = {
-query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(includeInstance, f)
-  };
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
+  f = message.getMetricName();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
   }
-  return obj;
-};
-}
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.QueryMetricsRequest}
- */
-proto.gateway.web.v1.QueryMetricsRequest.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);
-};
-/**
- * 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 {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.QueryMetricsRequest}
- */
-proto.gateway.web.v1.QueryMetricsRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    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);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
+  f = message.getAggregation();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      4,
+      f
+    );
   }
-  return msg;
-};
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.QueryMetricsRequest.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.QueryMetricsRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.gateway.web.v1.QueryMetricsRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getQuery();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter
+  f = message.getTimeWindow();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      5,
+      f
     );
   }
-};
-/**
- * optional MetricQuery query = 1;
- * @return {?proto.gateway.web.v1.MetricQuery}
- */
-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));
-};
-/**
- * @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);
-};
-/**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.QueryMetricsRequest} returns this
- */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.clearQuery = function() {
-  return this.setQuery(undefined);
-};
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.gateway.web.v1.QueryMetricsRequest.prototype.hasQuery = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-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.QueryMetricsResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.gateway.web.v1.QueryMetricsResponse.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.QueryMetricsResponse} 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) {
-  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)
-  };
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
+  f = message.getTimeInterval();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      6,
+      f
+    );
   }
-  return obj;
 };
-}
 /**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse}
+ * optional string organization_id = 1;
+ * @return {string}
  */
-proto.gateway.web.v1.QueryMetricsResponse.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);
+proto.gateway.web.v1.SumQueryRequest.prototype.getOrganizationId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
- * 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 {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse}
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.SumQueryRequest} returns this
  */
-proto.gateway.web.v1.QueryMetricsResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    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);
-      break;
-    case 2:
-      var value = new proto.gateway.web.v1.MetricAnalyticsSnapshot;
-      reader.readMessage(value,proto.gateway.web.v1.MetricAnalyticsSnapshot.deserializeBinaryFromReader);
-      msg.setSnapshot(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
+proto.gateway.web.v1.SumQueryRequest.prototype.setOrganizationId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
+ * optional string project_id = 2;
+ * @return {string}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.QueryMetricsResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
+proto.gateway.web.v1.SumQueryRequest.prototype.getProjectId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 /**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.gateway.web.v1.QueryMetricsResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.SumQueryRequest} returns this
  */
-proto.gateway.web.v1.QueryMetricsResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto_gateway_common_v1_status_pb.ResponseStatus.serializeBinaryToWriter
-    );
-  }
-  f = message.getSnapshot();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.gateway.web.v1.MetricAnalyticsSnapshot.serializeBinaryToWriter
-    );
-  }
+proto.gateway.web.v1.SumQueryRequest.prototype.setProjectId = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * optional gateway.common.v1.ResponseStatus status = 1;
- * @return {?proto.gateway.common.v1.ResponseStatus}
+ * optional string metric_name = 3;
+ * @return {string}
  */
-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.SumQueryRequest.prototype.getMetricName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 /**
- * @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 {string} value
+ * @return {!proto.gateway.web.v1.SumQueryRequest} returns this
+ */
+proto.gateway.web.v1.SumQueryRequest.prototype.setMetricName = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
+ * optional SumAggregation aggregation = 4;
+ * @return {!proto.gateway.web.v1.SumAggregation}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.clearStatus = function() {
-  return this.setStatus(undefined);
+proto.gateway.web.v1.SumQueryRequest.prototype.getAggregation = function() {
+  return /** @type {!proto.gateway.web.v1.SumAggregation} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
 };
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {!proto.gateway.web.v1.SumAggregation} value
+ * @return {!proto.gateway.web.v1.SumQueryRequest} returns this
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 1) != null;
+proto.gateway.web.v1.SumQueryRequest.prototype.setAggregation = function(value) {
+  return jspb.Message.setProto3EnumField(this, 4, value);
 };
 /**
- * optional MetricAnalyticsSnapshot snapshot = 2;
- * @return {?proto.gateway.web.v1.MetricAnalyticsSnapshot}
+ * optional AnalyticsTimeWindow time_window = 5;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeWindow}
  */
-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.SumQueryRequest.prototype.getTimeWindow = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricAnalyticsSnapshot|undefined} value
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
-*/
-proto.gateway.web.v1.QueryMetricsResponse.prototype.setSnapshot = function(value) {
-  return jspb.Message.setWrapperField(this, 2, value);
+ * @param {!proto.gateway.web.v1.AnalyticsTimeWindow} value
+ * @return {!proto.gateway.web.v1.SumQueryRequest} returns this
+ */
+proto.gateway.web.v1.SumQueryRequest.prototype.setTimeWindow = function(value) {
+  return jspb.Message.setProto3EnumField(this, 5, value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.QueryMetricsResponse} returns this
+ * optional AnalyticsTimeInterval time_interval = 6;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeInterval}
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.clearSnapshot = function() {
-  return this.setSnapshot(undefined);
+proto.gateway.web.v1.SumQueryRequest.prototype.getTimeInterval = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
 };
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {!proto.gateway.web.v1.AnalyticsTimeInterval} value
+ * @return {!proto.gateway.web.v1.SumQueryRequest} returns this
  */
-proto.gateway.web.v1.QueryMetricsResponse.prototype.hasSnapshot = function() {
-  return jspb.Message.getField(this, 2) != null;
+proto.gateway.web.v1.SumQueryRequest.prototype.setTimeInterval = function(value) {
+  return jspb.Message.setProto3EnumField(this, 6, value);
 };
@@ -2476,8 +2462,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.HistogramQueryRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.gateway.web.v1.HistogramQueryRequest.toObject(opt_includeInstance, this);
 };
@@ -2486,13 +2472,19 @@ 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.HistogramQueryRequest} 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.HistogramQueryRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-query: (f = msg.getQuery()) && proto.gateway.web.v1.MetricQuery.toObject(includeInstance, f)
+organizationId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+projectId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+metricName: jspb.Message.getFieldWithDefault(msg, 3, ""),
+aggregation: jspb.Message.getFieldWithDefault(msg, 4, 0),
+quantile: jspb.Message.getFloatingPointFieldWithDefault(msg, 5, 0.0),
+timeWindow: jspb.Message.getFieldWithDefault(msg, 6, 0),
+timeInterval: jspb.Message.getFieldWithDefault(msg, 7, 0)
   };
   if (includeInstance) {
@@ -2506,23 +2498,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.HistogramQueryRequest}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinary = function(bytes) {
+proto.gateway.web.v1.HistogramQueryRequest.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.HistogramQueryRequest;
+  return proto.gateway.web.v1.HistogramQueryRequest.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.HistogramQueryRequest} 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.HistogramQueryRequest}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.gateway.web.v1.HistogramQueryRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2530,9 +2522,32 @@ 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 = /** @type {string} */ (reader.readString());
+      msg.setOrganizationId(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setProjectId(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setMetricName(value);
+      break;
+    case 4:
+      var value = /** @type {!proto.gateway.web.v1.HistogramAggregation} */ (reader.readEnum());
+      msg.setAggregation(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readDouble());
+      msg.setQuantile(value);
+      break;
+    case 6:
+      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (reader.readEnum());
+      msg.setTimeWindow(value);
+      break;
+    case 7:
+      var value = /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (reader.readEnum());
+      msg.setTimeInterval(value);
       break;
     default:
       reader.skipField();
@@ -2547,9 +2562,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.HistogramQueryRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.gateway.web.v1.StreamMetricAnalyticsRequest.serializeBinaryToWriter(this, writer);
+  proto.gateway.web.v1.HistogramQueryRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
@@ -2557,57 +2572,187 @@ 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.HistogramQueryRequest} 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.HistogramQueryRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getQuery();
-  if (f != null) {
-    writer.writeMessage(
+  f = message.getOrganizationId();
+  if (f.length > 0) {
+    writer.writeString(
       1,
-      f,
-      proto.gateway.web.v1.MetricQuery.serializeBinaryToWriter
+      f
+    );
+  }
+  f = message.getProjectId();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getMetricName();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
+  f = message.getAggregation();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      4,
+      f
+    );
+  }
+  f = message.getQuantile();
+  if (f !== 0.0) {
+    writer.writeDouble(
+      5,
+      f
+    );
+  }
+  f = message.getTimeWindow();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      6,
+      f
+    );
+  }
+  f = message.getTimeInterval();
+  if (f !== 0.0) {
+    writer.writeEnum(
+      7,
+      f
     );
   }
 };
 /**
- * optional MetricQuery query = 1;
- * @return {?proto.gateway.web.v1.MetricQuery}
+ * optional string organization_id = 1;
+ * @return {string}
  */
-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.HistogramQueryRequest.prototype.getOrganizationId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 /**
- * @param {?proto.gateway.web.v1.MetricQuery|undefined} value
- * @return {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} returns this
-*/
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.setQuery = function(value) {
-  return jspb.Message.setWrapperField(this, 1, value);
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setOrganizationId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 /**
- * Clears the message field making it undefined.
- * @return {!proto.gateway.web.v1.StreamMetricAnalyticsRequest} returns this
+ * optional string project_id = 2;
+ * @return {string}
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.getProjectId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+/**
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.clearQuery = function() {
-  return this.setQuery(undefined);
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setProjectId = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
 };
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * optional string metric_name = 3;
+ * @return {string}
  */
-proto.gateway.web.v1.StreamMetricAnalyticsRequest.prototype.hasQuery = function() {
-  return jspb.Message.getField(this, 1) != null;
+proto.gateway.web.v1.HistogramQueryRequest.prototype.getMetricName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+/**
+ * @param {string} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setMetricName = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
+};
+/**
+ * optional HistogramAggregation aggregation = 4;
+ * @return {!proto.gateway.web.v1.HistogramAggregation}
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.getAggregation = function() {
+  return /** @type {!proto.gateway.web.v1.HistogramAggregation} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
+};
+/**
+ * @param {!proto.gateway.web.v1.HistogramAggregation} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setAggregation = function(value) {
+  return jspb.Message.setProto3EnumField(this, 4, value);
+};
+/**
+ * optional double quantile = 5;
+ * @return {number}
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.getQuantile = function() {
+  return /** @type {number} */ (jspb.Message.getFloatingPointFieldWithDefault(this, 5, 0.0));
+};
+/**
+ * @param {number} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setQuantile = function(value) {
+  return jspb.Message.setProto3FloatField(this, 5, value);
+};
+/**
+ * optional AnalyticsTimeWindow time_window = 6;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeWindow}
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.getTimeWindow = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeWindow} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+};
+/**
+ * @param {!proto.gateway.web.v1.AnalyticsTimeWindow} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setTimeWindow = function(value) {
+  return jspb.Message.setProto3EnumField(this, 6, value);
+};
+/**
+ * optional AnalyticsTimeInterval time_interval = 7;
+ * @return {!proto.gateway.web.v1.AnalyticsTimeInterval}
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.getTimeInterval = function() {
+  return /** @type {!proto.gateway.web.v1.AnalyticsTimeInterval} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
+};
+/**
+ * @param {!proto.gateway.web.v1.AnalyticsTimeInterval} value
+ * @return {!proto.gateway.web.v1.HistogramQueryRequest} returns this
+ */
+proto.gateway.web.v1.HistogramQueryRequest.prototype.setTimeInterval = function(value) {
+  return jspb.Message.setProto3EnumField(this, 7, value);
 };
@@ -3197,7 +3342,7 @@ proto.gateway.web.v1.MetricAnalyticsSnapshot.prototype.setUnit = function(value)
  * @private {!Array<number>}
  * @const
  */
-proto.gateway.web.v1.MetricSeries.repeatedFields_ = [2];
+proto.gateway.web.v1.MetricSeries.repeatedFields_ = [1];
@@ -3230,7 +3375,6 @@ 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) : [],
 bucketsList: jspb.Message.toObjectList(msg.getBucketsList(),
     proto.gateway.web.v1.MetricBucket.toObject, includeInstance)
   };
@@ -3270,12 +3414,6 @@ proto.gateway.web.v1.MetricSeries.deserializeBinaryFromReader = function(msg, re
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = msg.getGroupKeyMap();
-      reader.readMessage(value, function(message, reader) {
-        jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
-         });
-      break;
-    case 2:
       var value = new proto.gateway.web.v1.MetricBucket;
       reader.readMessage(value,proto.gateway.web.v1.MetricBucket.deserializeBinaryFromReader);
       msg.addBuckets(value);
@@ -3309,14 +3447,10 @@ proto.gateway.web.v1.MetricSeries.prototype.serializeBinary = function() {
  */
 proto.gateway.web.v1.MetricSeries.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getGroupKeyMap(true);
-  if (f && f.getLength() > 0) {
-    f.serializeBinary(1, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
-  }
   f = message.getBucketsList();
   if (f.length > 0) {
     writer.writeRepeatedMessage(
-      2,
+      1,
       f,
       proto.gateway.web.v1.MetricBucket.serializeBinaryToWriter
     );
@@ -3325,35 +3459,12 @@ proto.gateway.web.v1.MetricSeries.serializeBinaryToWriter = function(message, wr
 /**
- * map<string, string> group_key = 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) {
-  return /** @type {!jspb.Map<string,string>} */ (
-      jspb.Message.getMapField(this, 1, opt_noLazyCreate,
-      null));
-};
-/**
- * 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();
-  return this;
-};
-/**
- * repeated MetricBucket buckets = 2;
+ * repeated MetricBucket buckets = 1;
  * @return {!Array<!proto.gateway.web.v1.MetricBucket>}
  */
 proto.gateway.web.v1.MetricSeries.prototype.getBucketsList = function() {
   return /** @type{!Array<!proto.gateway.web.v1.MetricBucket>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricBucket, 2));
+    jspb.Message.getRepeatedWrapperField(this, proto.gateway.web.v1.MetricBucket, 1));
 };
@@ -3362,7 +3473,7 @@ proto.gateway.web.v1.MetricSeries.prototype.getBucketsList = function() {
  * @return {!proto.gateway.web.v1.MetricSeries} returns this
 */
 proto.gateway.web.v1.MetricSeries.prototype.setBucketsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 2, value);
+  return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
@@ -3372,7 +3483,7 @@ proto.gateway.web.v1.MetricSeries.prototype.setBucketsList = function(value) {
  * @return {!proto.gateway.web.v1.MetricBucket}
  */
 proto.gateway.web.v1.MetricSeries.prototype.addBuckets = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.gateway.web.v1.MetricBucket, opt_index);
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.gateway.web.v1.MetricBucket, opt_index);
 };
@@ -3598,7 +3709,6 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.toObject = function(opt_
  */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.toObject = function(includeInstance, msg) {
   var f, obj = {
-groupKeyMap: (f = msg.getGroupKeyMap()) ? 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)
   };
@@ -3638,17 +3748,11 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.deserializeBinaryFromReader = func
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = msg.getGroupKeyMap();
-      reader.readMessage(value, function(message, reader) {
-        jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
-         });
-      break;
-    case 2:
       var value = new proto.gateway.web.v1.MetricBucket;
       reader.readMessage(value,proto.gateway.web.v1.MetricBucket.deserializeBinaryFromReader);
       msg.setBucket(value);
       break;
-    case 3:
+    case 2:
       var value = new google_protobuf_timestamp_pb.Timestamp;
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
       msg.setGeneratedAt(value);
@@ -3682,14 +3786,10 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.serializeBinary = functi
  */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getGroupKeyMap(true);
-  if (f && f.getLength() > 0) {
-    f.serializeBinary(1, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
-  }
   f = message.getBucket();
   if (f != null) {
     writer.writeMessage(
-      2,
+      1,
       f,
       proto.gateway.web.v1.MetricBucket.serializeBinaryToWriter
     );
@@ -3697,7 +3797,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter = function
   f = message.getGeneratedAt();
   if (f != null) {
     writer.writeMessage(
-      3,
+      2,
       f,
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
@@ -3706,35 +3806,12 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.serializeBinaryToWriter = function
 /**
- * map<string, string> group_key = 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) {
-  return /** @type {!jspb.Map<string,string>} */ (
-      jspb.Message.getMapField(this, 1, opt_noLazyCreate,
-      null));
-};
-/**
- * Clears values from the map. The map will be non-null.
- * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
- */
-proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearGroupKeyMap = function() {
-  this.getGroupKeyMap().clear();
-  return this;
-};
-/**
- * optional MetricBucket bucket = 2;
+ * optional MetricBucket bucket = 1;
  * @return {?proto.gateway.web.v1.MetricBucket}
  */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getBucket = function() {
   return /** @type{?proto.gateway.web.v1.MetricBucket} */ (
-    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricBucket, 2));
+    jspb.Message.getWrapperField(this, proto.gateway.web.v1.MetricBucket, 1));
 };
@@ -3743,7 +3820,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getBucket = function() {
  * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
 */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.setBucket = function(value) {
-  return jspb.Message.setWrapperField(this, 2, value);
+  return jspb.Message.setWrapperField(this, 1, value);
 };
@@ -3761,17 +3838,17 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearBucket = function()
  * @return {boolean}
  */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.hasBucket = function() {
-  return jspb.Message.getField(this, 2) != null;
+  return jspb.Message.getField(this, 1) != null;
 };
 /**
- * optional google.protobuf.Timestamp generated_at = 3;
+ * optional google.protobuf.Timestamp generated_at = 2;
  * @return {?proto.google.protobuf.Timestamp}
  */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getGeneratedAt = function() {
   return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 3));
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
 };
@@ -3780,7 +3857,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.getGeneratedAt = functio
  * @return {!proto.gateway.web.v1.MetricSeriesBucketUpdate} returns this
 */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.setGeneratedAt = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
+  return jspb.Message.setWrapperField(this, 2, value);
 };
@@ -3798,7 +3875,7 @@ proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.clearGeneratedAt = funct
  * @return {boolean}
  */
 proto.gateway.web.v1.MetricSeriesBucketUpdate.prototype.hasGeneratedAt = function() {
-  return jspb.Message.getField(this, 3) != null;
+  return jspb.Message.getField(this, 2) != null;
 };
@@ -3815,19 +3892,37 @@ 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
 };
 goog.object.extend(exports, proto.gateway.web.v1);