Sync logging protos

google/logging/type/http_request.proto

@@ -17,14 +17,16 @@ syntax = "proto3";
 package google.logging.type;
 
 import "google/api/annotations.proto";
+import "google/protobuf/duration.proto";
 
 option java_multiple_files = true;
 option java_outer_classname = "HttpRequestProto";
 option java_package = "com.google.logging.type";
 
 
-// A common proto for logging HTTP requests.
-//
+// A common proto for logging HTTP requests. Only contains semantics
+// defined by the HTTP specification. Product-specific logging
+// information MUST be defined in a separate message.
 message HttpRequest {
   // The request method. Examples: `"GET"`, `"HEAD"`, `"PUT"`, `"POST"`.
   string request_method = 1;
@@ -62,6 +64,10 @@ message HttpRequest {
   // [HTTP/1.1 Header Field Definitions](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html).
   string referer = 8;
 
+  // The request processing latency on the server, from the time the request was
+  // received until the response was sent.
+  google.protobuf.Duration latency = 14;
+
   // Whether or not a cache lookup was attempted.
   bool cache_lookup = 11;
 

google/logging/type/log_severity.proto

@@ -23,40 +23,47 @@ option java_outer_classname = "LogSeverityProto";
 option java_package = "com.google.logging.type";
 
 
-// The severity of the event described in a log entry.  These guideline severity
-// levels are ordered, with numerically smaller levels treated as less severe
-// than numerically larger levels. If the source of the log entries uses a
-// different set of severity levels, the client should select the closest
-// corresponding `LogSeverity` value. For example, Java's FINE, FINER, and
-// FINEST levels might all map to `LogSeverity.DEBUG`. If the original severity
-// code must be preserved, it can be stored in the payload.
+// The severity of the event described in a log entry, expressed as one of the
+// standard severity levels listed below.  For your reference, the levels are
+// assigned the listed numeric values. The effect of using numeric values other
+// than those listed is undefined.
 //
+// You can filter for log entries by severity.  For example, the following
+// filter expression will match log entries with severities `INFO`, `NOTICE`,
+// and `WARNING`:
+//
+//     severity > DEBUG AND severity <= WARNING
+//
+// If you are writing log entries, you should map other severity encodings to
+// one of these standard levels. For example, you might map all of Java's FINE,
+// FINER, and FINEST levels to `LogSeverity.DEBUG`. You can preserve the
+// original severity level in the log entry payload if you wish.
 enum LogSeverity {
-  // The log entry has no assigned severity level.
+  // (0) The log entry has no assigned severity level.
   DEFAULT = 0;
 
-  // Debug or trace information.
+  // (100) Debug or trace information.
   DEBUG = 100;
 
-  // Routine information, such as ongoing status or performance.
+  // (200) Routine information, such as ongoing status or performance.
   INFO = 200;
 
-  // Normal but significant events, such as start up, shut down, or
-  // configuration.
+  // (300) Normal but significant events, such as start up, shut down, or
+  // a configuration change.
   NOTICE = 300;
 
-  // Warning events might cause problems.
+  // (400) Warning events might cause problems.
   WARNING = 400;
 
-  // Error events are likely to cause problems.
+  // (500) Error events are likely to cause problems.
   ERROR = 500;
 
-  // Critical events cause more severe problems or brief outages.
+  // (600) Critical events cause more severe problems or outages.
   CRITICAL = 600;
 
-  // A person must take an action immediately.
+  // (700) A person must take an action immediately.
   ALERT = 700;
 
-  // One or more systems are unusable.
+  // (800) One or more systems are unusable.
   EMERGENCY = 800;
 }

google/logging/v2/log_entry.proto

@@ -20,6 +20,7 @@ import "google/api/annotations.proto";
 import "google/api/monitored_resource.proto";
 import "google/logging/type/http_request.proto";
 import "google/logging/type/log_severity.proto";
+import "google/logging/v2/internal_entity_id.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
@@ -52,11 +53,11 @@ message LogEntry {
   // database that reported the error.
   google.api.MonitoredResource resource = 8;
 
-  // Required. The log entry payload, which can be one of multiple types.
+  // Optional. The log entry payload, which can be one of multiple types.
   oneof payload {
-    // The log entry payload, represented as a protocol buffer.
-    // You can only use `protoPayload` values that belong to a set of approved
-    // types.
+    // The log entry payload, represented as a protocol buffer.  Some
+    // Google Cloud Platform services use this field for their log
+    // entry payloads.
     google.protobuf.Any proto_payload = 2;
 
     // The log entry payload, represented as a Unicode string (UTF-8).
@@ -77,13 +78,13 @@ message LogEntry {
 
   // Optional. A unique ID for the log entry. If you provide this
   // field, the logging service considers other log entries in the
-  // same log with the same ID as duplicates which can be removed.  If
+  // same project with the same ID as duplicates which can be removed.  If
   // omitted, Stackdriver Logging will generate a unique ID for this
   // log entry.
   string insert_id = 4;
 
-  // Optional. Information about the HTTP request associated with this log entry,
-  // if applicable.
+  // Optional. Information about the HTTP request associated with this
+  // log entry, if applicable.
   google.logging.type.HttpRequest http_request = 7;
 
   // Optional. A set of user-defined (key, value) data that provides additional
@@ -98,15 +99,13 @@ message LogEntry {
 // Additional information about a potentially long-running operation with which
 // a log entry is associated.
 message LogEntryOperation {
-  // Required. An arbitrary operation identifier. Log entries with the
+  // Optional. An arbitrary operation identifier. Log entries with the
   // same identifier are assumed to be part of the same operation.
-  //
   string id = 1;
 
-  // Required. An arbitrary producer identifier. The combination of
+  // Optional. An arbitrary producer identifier. The combination of
   // `id` and `producer` must be globally unique.  Examples for `producer`:
   // `"MyDivision.MyBigCompany.com"`, `"github.com/MyProject/MyApplication"`.
-  //
   string producer = 2;
 
   // Optional. Set this to True if this is the first log entry in the operation.

google/logging/v2/logging.proto

@@ -35,29 +35,26 @@ option go_package = "google.golang.org/genproto/googleapis/logging/v2";
 service LoggingServiceV2 {
   // Deletes a log and all its log entries.
   // The log will reappear if it receives new entries.
-  //
   rpc DeleteLog(DeleteLogRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = { delete: "/v2beta1/{log_name=projects/*/logs/*}" };
   }
 
   // Writes log entries to Stackdriver Logging.  All log entries are
   // written by this method.
-  //
   rpc WriteLogEntries(WriteLogEntriesRequest) returns (WriteLogEntriesResponse) {
-    option (google.api.http) = { post: "/v2beta1/entries:write" body: "*" };
+    option (google.api.http) = { post: "/v2/entries:write" body: "*" };
   }
 
   // Lists log entries.  Use this method to retrieve log entries from Cloud
   // Logging.  For ways to export log entries, see
   // [Exporting Logs](/logging/docs/export).
-  //
   rpc ListLogEntries(ListLogEntriesRequest) returns (ListLogEntriesResponse) {
-    option (google.api.http) = { post: "/v2beta1/entries:list" body: "*" };
+    option (google.api.http) = { post: "/v2/entries:list" body: "*" };
   }
 
   // Lists the monitored resource descriptors used by Stackdriver Logging.
   rpc ListMonitoredResourceDescriptors(ListMonitoredResourceDescriptorsRequest) returns (ListMonitoredResourceDescriptorsResponse) {
-    option (google.api.http) = { get: "/v2beta1/monitoredResourceDescriptors" };
+    option (google.api.http) = { get: "/v2/monitoredResourceDescriptors" };
   }
 }
 
@@ -70,28 +67,37 @@ message DeleteLogRequest {
 
 // The parameters to WriteLogEntries.
 message WriteLogEntriesRequest {
-  // Optional. A default log resource name for those log entries in `entries`
-  // that do not specify their own `logName`.  Example:
+  // Optional. A default log resource name that is assigned to all log entries
+  // in `entries` that do not specify a value for `log_name`.  Example:
   // `"projects/my-project/logs/syslog"`.  See
   // [LogEntry][google.logging.v2.LogEntry].
   string log_name = 1;
 
-  // Optional. A default monitored resource for those log entries in `entries`
-  // that do not specify their own `resource`.
+  // Optional. A default monitored resource object that is assigned to all log
+  // entries in `entries` that do not specify a value for `resource`. Example:
+  //
+  //     { "type": "gce_instance",
+  //       "labels": {
+  //         "zone": "us-central1-a", "instance_id": "00000000000000000000" }}
+  //
+  // See [LogEntry][google.logging.v2.LogEntry].
   google.api.MonitoredResource resource = 2;
 
-  // Optional. User-defined `key:value` items that are added to
-  // the `labels` field of each log entry in `entries`, except when a log
-  // entry specifies its own `key:value` item with the same key.
-  // Example: `{ "size": "large", "color":"red" }`
+  // Optional. Default labels that are added to the `labels` field of all log
+  // entries in `entries`. If a log entry already has a label with the same key
+  // as a label in this parameter, then the log entry's label is not changed.
+  // See [LogEntry][google.logging.v2.LogEntry].
   map<string, string> labels = 3;
 
-  // Required. The log entries to write. The log entries must have values for
-  // all required fields.
+  // Required. The log entries to write. Values supplied for the fields
+  // `log_name`, `resource`, and `labels` in this `entries.write` request are
+  // added to those log entries that do not provide their own values for the
+  // fields.
   //
-  // To improve throughput and to avoid exceeding the quota limit for calls
-  // to `entries.write`, use this field to write multiple log entries at once
-  // rather than  // calling this method for each log entry.
+  // To improve throughput and to avoid exceeding the
+  // [quota limit](/logging/quota-policy) for calls to `entries.write`,
+  // you should write multiple log entries at once rather than
+  // calling this method for each individual log entry.
   repeated LogEntry entries = 4;
 
   // Optional. Whether valid entries should be written even if some other
@@ -110,14 +116,21 @@ message WriteLogEntriesResponse {
 
 // The parameters to `ListLogEntries`.
 message ListLogEntriesRequest {
-  // Required. One or more project IDs or project numbers from which to retrieve
-  // log entries.  Examples of a project ID: `"my-project-1A"`, `"1234567890"`.
+  // Deprecated. One or more project identifiers or project numbers from which
+  // to retrieve log entries.  Examples: `"my-project-1A"`, `"1234567890"`. If
+  // present, these project identifiers are converted to resource format and
+  // added to the list of resources in `resourceNames`. Callers should use
+  // `resourceNames` rather than this parameter.
   repeated string project_ids = 1;
 
-  // Optional. An [advanced logs filter](/logging/docs/view/advanced_filters).
-  // The filter is compared against all log entries in the projects specified by
-  // `projectIds`.  Only entries that match the filter are retrieved.  An empty
-  // filter matches all log entries.
+  // Optional. One or more cloud resources from which to retrieve log entries.
+  // Example: `"projects/my-project-1A"`, `"projects/1234567890"`.  Projects
+  // listed in `projectIds` are added to this list.
+  repeated string resource_names = 8;
+
+  // Optional. A filter that chooses which log entries to return.  See [Advanced
+  // Logs Filters](/logging/docs/view/advanced_filters).  Only log entries that
+  // match the filter are returned.  An empty filter matches all log entries.
   string filter = 2;
 
   // Optional. How the results should be sorted.  Presently, the only permitted
@@ -129,16 +142,14 @@ message ListLogEntriesRequest {
   string order_by = 3;
 
   // Optional. The maximum number of results to return from this request.
-  // You must check for presence of `nextPageToken` to determine if additional
-  // results are available, which you can retrieve by passing the
-  // `nextPageToken` value as the `pageToken` parameter in the next request.
+  // Non-positive values are ignored.  The presence of `nextPageToken` in the
+  // response indicates that more results might be available.
   int32 page_size = 4;
 
-  // Optional. If the `pageToken` parameter is supplied, then the next page of
-  // results is retrieved.  The `pageToken` parameter must be set to the value
-  // of the `nextPageToken` from the previous response.
-  // The values of `projectIds`, `filter`, and `orderBy` must be the same
-  // as in the previous request.
+  // Optional. If present, then retrieve the next batch of results from the
+  // preceding call to this method.  `pageToken` must be the value of
+  // `nextPageToken` from the previous response.  The values of other method
+  // parameters should be identical to those in the previous call.
   string page_token = 5;
 }
 
@@ -147,8 +158,8 @@ message ListLogEntriesResponse {
   // A list of log entries.
   repeated LogEntry entries = 1;
 
-  // If there are more results than were returned, then `nextPageToken` is
-  // included in the response.  To get the next set of results, call this
+  // If there might be more results than appear in this response, then
+  // `nextPageToken` is included.  To get the next set of results, call this
   // method again using the value of `nextPageToken` as `pageToken`.
   string next_page_token = 2;
 }
@@ -156,14 +167,14 @@ message ListLogEntriesResponse {
 // The parameters to ListMonitoredResourceDescriptors
 message ListMonitoredResourceDescriptorsRequest {
   // Optional. The maximum number of results to return from this request.
-  // You must check for presence of `nextPageToken` to determine if additional
-  // results are available, which you can retrieve by passing the
-  // `nextPageToken` value as the `pageToken` parameter in the next request.
+  // Non-positive values are ignored.  The presence of `nextPageToken` in the
+  // response indicates that more results might be available.
   int32 page_size = 1;
 
-  // Optional. If the `pageToken` parameter is supplied, then the next page of
-  // results is retrieved.  The `pageToken` parameter must be set to the value
-  // of the `nextPageToken` from the previous response.
+  // Optional. If present, then retrieve the next batch of results from the
+  // preceding call to this method.  `pageToken` must be the value of
+  // `nextPageToken` from the previous response.  The values of other method
+  // parameters should be identical to those in the previous call.
   string page_token = 2;
 }
 
@@ -172,8 +183,8 @@ message ListMonitoredResourceDescriptorsResponse {
   // A list of resource descriptors.
   repeated google.api.MonitoredResourceDescriptor resource_descriptors = 1;
 
-  // If there are more results than were returned, then `nextPageToken` is
-  // included in the response.  To get the next set of results, call this
+  // If there might be more results than appear in this response, then
+  // `nextPageToken` is included.  To get the next set of results, call this
   // method again using the value of `nextPageToken` as `pageToken`.
   string next_page_token = 2;
 }

google/logging/v2/logging_config.proto

@@ -17,6 +17,7 @@ syntax = "proto3";
 package google.logging.v2;
 
 import "google/api/annotations.proto";
+import "google/logging/v1/logging_config.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 
@@ -31,27 +32,27 @@ option go_package = "google.golang.org/genproto/googleapis/logging/v2";
 service ConfigServiceV2 {
   // Lists sinks.
   rpc ListSinks(ListSinksRequest) returns (ListSinksResponse) {
-    option (google.api.http) = { get: "/v2beta1/{parent=projects/*}/sinks" };
+    option (google.api.http) = { get: "/v2/{parent=projects/*}/sinks" };
   }
 
   // Gets a sink.
   rpc GetSink(GetSinkRequest) returns (LogSink) {
-    option (google.api.http) = { get: "/v2beta1/{sink_name=projects/*/sinks/*}" };
+    option (google.api.http) = { get: "/v2/{sink_name=projects/*/sinks/*}" };
   }
 
   // Creates a sink.
   rpc CreateSink(CreateSinkRequest) returns (LogSink) {
-    option (google.api.http) = { post: "/v2beta1/{parent=projects/*}/sinks" body: "sink" };
+    option (google.api.http) = { post: "/v2/{parent=projects/*}/sinks" body: "sink" };
   }
 
-  // Creates or updates a sink.
+  // Updates or creates a sink.
   rpc UpdateSink(UpdateSinkRequest) returns (LogSink) {
-    option (google.api.http) = { put: "/v2beta1/{sink_name=projects/*/sinks/*}" body: "sink" };
+    option (google.api.http) = { put: "/v2/{sink_name=projects/*/sinks/*}" body: "sink" };
   }
 
   // Deletes a sink.
   rpc DeleteSink(DeleteSinkRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2beta1/{sink_name=projects/*/sinks/*}" };
+    option (google.api.http) = { delete: "/v2/{sink_name=projects/*/sinks/*}" };
   }
 }
 
@@ -71,50 +72,66 @@ message LogSink {
     V1 = 2;
   }
 
-  // Required. The client-assigned sink identifier. Example:
-  // `"my-severe-errors-to-pubsub"`.
-  // Sink identifiers are limited to 1000 characters
-  // and can include only the following characters: `A-Z`, `a-z`,
-  // `0-9`, and the special characters `_-.`.
+  // Required. The client-assigned sink identifier, unique within the
+  // project. Example: `"my-syslog-errors-to-pubsub"`.  Sink identifiers are
+  // limited to 1000 characters and can include only the following characters:
+  // `A-Z`, `a-z`, `0-9`, and the special characters `_-.`.  The maximum length
+  // of the name is 100 characters.
   string name = 1;
 
-  // The export destination. See
+  // Required. The export destination. See
   // [Exporting Logs With Sinks](/logging/docs/api/tasks/exporting-logs).
-  // Examples: `"storage.googleapis.com/a-bucket"`,
-  // `"bigquery.googleapis.com/projects/a-project-id/datasets/a-dataset"`.
+  // Examples:
+  //
+  //     "storage.googleapis.com/my-gcs-bucket"
+  //     "bigquery.googleapis.com/projects/my-project-id/datasets/my-dataset"
+  //     "pubsub.googleapis.com/projects/my-project/topics/my-topic"
   string destination = 3;
 
-  // An [advanced logs filter](/logging/docs/view/advanced_filters). Only
-  // log entries matching that filter are exported. The filter must be
-  // consistent with the log entry format specified by the
+  // Optional. An [advanced logs filter](/logging/docs/view/advanced_filters).
+  // Only log entries matching the filter are exported. The filter
+  // must be consistent with the log entry format specified by the
   // `outputVersionFormat` parameter, regardless of the format of the
   // log entry that was originally written to Stackdriver Logging.
-  // Example (V2 format):
-  // `"logName=projects/my-projectid/logs/syslog AND severity>=ERROR"`.
+  // Example filter (V2 format):
+  //
+  //     logName=projects/my-projectid/logs/syslog AND severity>=ERROR
   string filter = 5;
 
-  // The log entry version to use for this sink's exported log entries.
-  // This version does not have to correspond to the version of the log entry
-  // when it was written to Stackdriver Logging.
+  // Optional. The log entry version to use for this sink's exported log
+  // entries.  This version does not have to correspond to the version of the
+  // log entry that was written to Stackdriver Logging. If omitted, the
+  // v2 format is used.
   VersionFormat output_version_format = 6;
+
+  // Output only. The iam identity to which the destination needs to grant write
+  // access.  This may be a service account or a group.
+  // Examples (Do not assume these specific values):
+  //    "serviceAccount:cloud-logs@system.gserviceaccount.com"
+  //    "group:cloud-logs@google.com"
+  //
+  //   For GCS destinations, the role "roles/owner" is required on the bucket
+  //   For Cloud Pubsub destinations, the role "roles/pubsub.publisher" is
+  //     required on the topic
+  //   For BigQuery, the role "roles/editor" is required on the dataset
+  string writer_identity = 8;
 }
 
 // The parameters to `ListSinks`.
 message ListSinksRequest {
-  // Required. The resource name containing the sinks.
+  // Required. The cloud resource containing the sinks.
   // Example: `"projects/my-logging-project"`.
   string parent = 1;
 
-  // Optional. If the `pageToken` parameter is supplied, then the next page of
-  // results is retrieved.  The `pageToken` parameter must be set to the value
-  // of the `nextPageToken` from the previous response.
-  // The value of `parent` must be the same as in the previous request.
+  // Optional. If present, then retrieve the next batch of results from the
+  // preceding call to this method.  `pageToken` must be the value of
+  // `nextPageToken` from the previous response.  The values of other method
+  // parameters should be identical to those in the previous call.
   string page_token = 2;
 
   // Optional. The maximum number of results to return from this request.
-  // You must check for presence of `nextPageToken` to determine if additional
-  // results are available, which you can retrieve by passing the
-  // `nextPageToken` value as the `pageToken` parameter in the next request.
+  // Non-positive values are ignored.  The presence of `nextPageToken` in the
+  // response indicates that more results might be available.
   int32 page_size = 3;
 }
 
@@ -123,51 +140,49 @@ message ListSinksResponse {
   // A list of sinks.
   repeated LogSink sinks = 1;
 
-  // If there are more results than were returned, then `nextPageToken` is
-  // included in the response.  To get the next set of results, call this
+  // If there might be more results than appear in this response, then
+  // `nextPageToken` is included.  To get the next set of results, call the same
   // method again using the value of `nextPageToken` as `pageToken`.
   string next_page_token = 2;
 }
 
 // The parameters to `GetSink`.
 message GetSinkRequest {
-  // The resource name of the sink to return.
+  // Required. The resource name of the sink to return.
   // Example: `"projects/my-project-id/sinks/my-sink-id"`.
   string sink_name = 1;
 }
 
 // The parameters to `CreateSink`.
 message CreateSinkRequest {
-  // The resource in which to create the sink.
+  // Required. The resource in which to create the sink.
   // Example: `"projects/my-project-id"`.
-  //
   // The new sink must be provided in the request.
   string parent = 1;
 
-  // The new sink, which must not have an identifier that already
-  // exists.
+  // Required. The new sink, whose `name` parameter is a sink identifier that
+  // is not already in use.
   LogSink sink = 2;
 }
 
 // The parameters to `UpdateSink`.
 message UpdateSinkRequest {
-  // The resource name of the sink to update.
-  // Example: `"projects/my-project-id/sinks/my-sink-id"`.
-  //
-  // The updated sink must be provided in the request and have the
-  // same name that is specified in `sinkName`.  If the sink does not
-  // exist, it is created.
+  // Required. The resource name of the sink to update, including the parent
+  // resource and the sink identifier.  If the sink does not exist, this method
+  // creates the sink.  Example: `"projects/my-project-id/sinks/my-sink-id"`.
   string sink_name = 1;
 
-  // The updated sink, whose name must be the same as the sink
-  // identifier in `sinkName`.  If `sinkName` does not exist, then
+  // Required. The updated sink, whose name is the same identifier that appears
+  // as part of `sinkName`.  If `sinkName` does not exist, then
   // this method creates a new sink.
   LogSink sink = 2;
 }
 
 // The parameters to `DeleteSink`.
 message DeleteSinkRequest {
-  // The resource name of the sink to delete.
-  // Example: `"projects/my-project-id/sinks/my-sink-id"`.
+  // Required. The resource name of the sink to delete, including the parent
+  // resource and the sink identifier.  Example:
+  // `"projects/my-project-id/sinks/my-sink-id"`.  It is an error if the sink
+  // does not exist.
   string sink_name = 1;
 }

google/logging/v2/logging_metrics.proto

@@ -20,6 +20,7 @@ import "google/api/annotations.proto";
 import "google/protobuf/empty.proto";
 
 option java_multiple_files = true;
+option java_outer_classname = "LoggingMetrics";
 option java_package = "com.google.logging.v2";
 
 option go_package = "google.golang.org/genproto/googleapis/logging/v2";
@@ -28,47 +29,63 @@ option go_package = "google.golang.org/genproto/googleapis/logging/v2";
 service MetricsServiceV2 {
   // Lists logs-based metrics.
   rpc ListLogMetrics(ListLogMetricsRequest) returns (ListLogMetricsResponse) {
-    option (google.api.http) = { get: "/v2beta1/{parent=projects/*}/metrics" };
+    option (google.api.http) = { get: "/v2/{parent=projects/*}/metrics" };
   }
 
   // Gets a logs-based metric.
   rpc GetLogMetric(GetLogMetricRequest) returns (LogMetric) {
-    option (google.api.http) = { get: "/v2beta1/{metric_name=projects/*/metrics/*}" };
+    option (google.api.http) = { get: "/v2/{metric_name=projects/*/metrics/*}" };
   }
 
   // Creates a logs-based metric.
   rpc CreateLogMetric(CreateLogMetricRequest) returns (LogMetric) {
-    option (google.api.http) = { post: "/v2beta1/{parent=projects/*}/metrics" body: "metric" };
+    option (google.api.http) = { post: "/v2/{parent=projects/*}/metrics" body: "metric" };
   }
 
   // Creates or updates a logs-based metric.
   rpc UpdateLogMetric(UpdateLogMetricRequest) returns (LogMetric) {
-    option (google.api.http) = { put: "/v2beta1/{metric_name=projects/*/metrics/*}" body: "metric" };
+    option (google.api.http) = { put: "/v2/{metric_name=projects/*/metrics/*}" body: "metric" };
   }
 
   // Deletes a logs-based metric.
   rpc DeleteLogMetric(DeleteLogMetricRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2beta1/{metric_name=projects/*/metrics/*}" };
+    option (google.api.http) = { delete: "/v2/{metric_name=projects/*/metrics/*}" };
   }
 }
 
 // Describes a logs-based metric.  The value of the metric is the
 // number of log entries that match a logs filter.
 message LogMetric {
+  // Stackdriver Logging API version.
+  enum ApiVersion {
+    // Stackdriver Logging API v2.
+    V2 = 0;
+
+    // Stackdriver Logging API v1.
+    V1 = 1;
+  }
+
   // Required. The client-assigned metric identifier. Example:
-  // `"severe_errors"`.  Metric identifiers are limited to 1000
+  // `"severe_errors"`.  Metric identifiers are limited to 100
   // characters and can include only the following characters: `A-Z`,
-  // `a-z`, `0-9`, and the special characters `_-.,+!*',()%/\`.  The
+  // `a-z`, `0-9`, and the special characters `_-.,+!*',()%/`.  The
   // forward-slash character (`/`) denotes a hierarchy of name pieces,
-  // and it cannot be the first character of the name.
+  // and it cannot be the first character of the name.  The '%' character
+  // is used to URL encode unsafe and reserved characters and must be
+  // followed by two hexadecimal digits according to RFC 1738.
   string name = 1;
 
-  // A description of this metric, which is used in documentation.
+  // Optional. A description of this metric, which is used in documentation.
   string description = 2;
 
-  // An [advanced logs filter](/logging/docs/view/advanced_filters).
-  // Example: `"logName:syslog AND severity>=ERROR"`.
+  // Required. An [advanced logs filter](/logging/docs/view/advanced_filters).
+  // Example: `"resource.type=gae_app AND severity>=ERROR"`.
   string filter = 3;
+
+  // Output only. The API version that created or updated this metric.
+  // The version also dictates the syntax of the filter expression. When a value
+  // for this field is missing, the default value of V2 should be assumed.
+  ApiVersion version = 4;
 }
 
 // The parameters to ListLogMetrics.
@@ -77,16 +94,15 @@ message ListLogMetricsRequest {
   // Example: `"projects/my-project-id"`.
   string parent = 1;
 
-  // Optional. If the `pageToken` parameter is supplied, then the next page of
-  // results is retrieved.  The `pageToken` parameter must be set to the value
-  // of the `nextPageToken` from the previous response.
-  // The value of `parent` must be the same as in the previous request.
+  // Optional. If present, then retrieve the next batch of results from the
+  // preceding call to this method.  `pageToken` must be the value of
+  // `nextPageToken` from the previous response.  The values of other method
+  // parameters should be identical to those in the previous call.
   string page_token = 2;
 
   // Optional. The maximum number of results to return from this request.
-  // You must check for presence of `nextPageToken` to determine if additional
-  // results are available, which you can retrieve by passing the
-  // `nextPageToken` value as the `pageToken` parameter in the next request.
+  // Non-positive values are ignored.  The presence of `nextPageToken` in the
+  // response indicates that more results might be available.
   int32 page_size = 3;
 }
 
@@ -95,8 +111,8 @@ message ListLogMetricsResponse {
   // A list of logs-based metrics.
   repeated LogMetric metrics = 1;
 
-  // If there are more results than were returned, then `nextPageToken` is
-  // included in the response.  To get the next set of results, call this
+  // If there might be more results than appear in this response, then
+  // `nextPageToken` is included.  To get the next set of results, call this
   // method again using the value of `nextPageToken` as `pageToken`.
   string next_page_token = 2;
 }
@@ -122,7 +138,6 @@ message CreateLogMetricRequest {
 }
 
 // The parameters to UpdateLogMetric.
-//
 message UpdateLogMetricRequest {
   // The resource name of the metric to update.
   // Example: `"projects/my-project-id/metrics/my-metric-id"`.