Skip to content

Commit

Permalink
Synchronize new proto/yaml changes.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 216218149
  • Loading branch information
Google APIs authored and Copybara-Service committed Oct 8, 2018
1 parent 8f1de3d commit 7b34e5a
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 37 deletions.
2 changes: 1 addition & 1 deletion google/logging/logging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apis:
- name: google.logging.v2.MetricsServiceV2

documentation:
summary: Writes log entries and manages your Stackdriver Logging configuration.
summary: Writes log entries and manages your Logging configuration.
overview: |-
# Introduction
Expand Down
3 changes: 2 additions & 1 deletion google/logging/type/http_request.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand Down
3 changes: 2 additions & 1 deletion google/logging/type/log_severity.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand Down
23 changes: 16 additions & 7 deletions google/logging/v2/log_entry.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand Down Expand Up @@ -83,7 +84,7 @@ message LogEntry {
// Optional. The time the event described by the log entry occurred.
// This time is used to compute the log entry's age and to enforce
// the logs retention period. If this field is omitted in a new log
// entry, then Stackdriver Logging assigns it the current time.
// entry, then Logging assigns it the current time.
// Timestamps have nanosecond accuracy, but trailing zeros in the fractional
// seconds might be omitted when the timestamp is displayed.
//
Expand All @@ -95,17 +96,17 @@ message LogEntry {
// [LogSinks](/logging/docs/api/tasks/exporting-logs).
google.protobuf.Timestamp timestamp = 9;

// Output only. The time the log entry was received by Stackdriver Logging.
// Output only. The time the log entry was received by Logging.
google.protobuf.Timestamp receive_timestamp = 24;

// Optional. The severity of the log entry. The default value is
// `LogSeverity.DEFAULT`.
google.logging.type.LogSeverity severity = 10;

// Optional. A unique identifier for the log entry. If you provide a value,
// then Stackdriver Logging considers other log entries in the same project,
// then Logging considers other log entries in the same project,
// with the same `timestamp`, and with the same `insert_id` to be duplicates
// which can be removed. If omitted in new log entries, then Stackdriver
// which can be removed. If omitted in new log entries, then
// Logging assigns its own unique identifier. The `insert_id` is also used
// to order log entries that have the same `timestamp` value.
string insert_id = 4;
Expand Down Expand Up @@ -133,12 +134,20 @@ message LogEntry {
// `projects/my-projectid/traces/06796866738c859f2f19b7cfb3214824`
string trace = 22;

// Optional. The span ID within the trace associated with the log entry. For
// Stackdriver Trace spans, this is the same format that the Stackdriver Trace
// Optional. The span ID within the trace associated with the log entry.
// For Trace spans, this is the same format that the Trace
// API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
// as <code>"000000000000004a"</code>.
string span_id = 27;

// Optional. The sampling decision of the trace associated with the log entry.
// True means that the trace resource name in the `trace` field was sampled
// for storage in a trace backend. False means that the trace was not sampled
// for storage when this log entry was written, or the sampling decision was
// unknown at the time. A non-sampled `trace` value is still useful as a
// request correlation identifier. The default is False.
bool trace_sampled = 30;

// Optional. Source code location information associated with the log entry,
// if any.
LogEntrySourceLocation source_location = 23;
Expand Down
33 changes: 18 additions & 15 deletions google/logging/v2/logging.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand Down Expand Up @@ -54,11 +55,10 @@ service LoggingServiceV2 {
};
}

// Writes log entries to Stackdriver Logging. This API method is the
// only way to send log entries to Stackdriver Logging. This method
// is used, directly or indirectly, by the Stackdriver Logging agent
// (fluentd) and all logging libraries configured to use Stackdriver
// Logging.
// Writes log entries to Logging. This API method is the
// only way to send log entries to Logging. This method
// is used, directly or indirectly, by the Logging agent
// (fluentd) and all logging libraries configured to use Logging.
// A single request may contain log entries for a maximum of 1000
// different resources (projects, organizations, billing accounts or
// folders)
Expand All @@ -70,7 +70,7 @@ service LoggingServiceV2 {
}

// Lists log entries. Use this method to retrieve log entries from
// Stackdriver Logging. For ways to export log entries, see
// Logging. For ways to export log entries, see
// [Exporting Logs](/logging/docs/export).
rpc ListLogEntries(ListLogEntriesRequest) returns (ListLogEntriesResponse) {
option (google.api.http) = {
Expand All @@ -79,8 +79,7 @@ service LoggingServiceV2 {
};
}

// Lists the descriptors for monitored resource types used by Stackdriver
// Logging.
// Lists the descriptors for monitored resource types used by Logging.
rpc ListMonitoredResourceDescriptors(ListMonitoredResourceDescriptorsRequest) returns (ListMonitoredResourceDescriptorsResponse) {
option (google.api.http) = {
get: "/v2/monitoredResourceDescriptors"
Expand Down Expand Up @@ -135,11 +134,15 @@ message WriteLogEntriesRequest {
// "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
// "folders/[FOLDER_ID]/logs/[LOG_ID]"
//
// `[LOG_ID]` must be URL-encoded. For example,
// `"projects/my-project-id/logs/syslog"` or
// `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
// For more information about log names, see
// [LogEntry][google.logging.v2.LogEntry].
// `[LOG_ID]` must be URL-encoded. For example:
//
// "projects/my-project-id/logs/syslog"
// "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
//
// The permission <code>logging.logEntries.create</code> is needed on each
// project, organization, billing account, or folder that is receiving
// new log entries, whether the resource is specified in
// <code>logName</code> or in an individual log entry.
string log_name = 1;

// Optional. A default monitored resource object that is assigned to all log
Expand All @@ -158,7 +161,7 @@ message WriteLogEntriesRequest {
// See [LogEntry][google.logging.v2.LogEntry].
map<string, string> labels = 3;

// Required. The log entries to send to Stackdriver Logging. The order of log
// Required. The log entries to send to Logging. The order of log
// entries in this list does not matter. Values supplied in this method's
// `log_name`, `resource`, and `labels` fields are copied into those log
// entries in this list that do not include values for their corresponding
Expand Down
17 changes: 9 additions & 8 deletions google/logging/v2/logging_config.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand All @@ -30,8 +31,8 @@ option java_package = "com.google.logging.v2";
option php_namespace = "Google\\Cloud\\Logging\\V2";


// Service for configuring sinks used to export log entries outside of
// Stackdriver Logging.
// Service for configuring sinks used to export log entries out of
// Logging.
service ConfigServiceV2 {
// Lists sinks.
rpc ListSinks(ListSinksRequest) returns (ListSinksResponse) {
Expand Down Expand Up @@ -275,7 +276,7 @@ service ConfigServiceV2 {
// exported. The sink must be created within a project, organization, billing
// account, or folder.
message LogSink {
// Available log entry formats. Log entries can be written to Stackdriver
// Available log entry formats. Log entries can be written to
// Logging in either format and can be exported in either format.
// Version 2 is the preferred format.
enum VersionFormat {
Expand Down Expand Up @@ -321,7 +322,7 @@ message LogSink {
VersionFormat output_version_format = 6 [deprecated = true];

// Output only. An IAM identity&mdash;a service account or group&mdash;under
// which Stackdriver Logging writes the exported log entries to the sink's
// which Logging writes the exported log entries to the sink's
// destination. This field is set by
// [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
// and
Expand Down Expand Up @@ -423,7 +424,7 @@ message CreateSinkRequest {
// Optional. Determines the kind of IAM identity returned as `writer_identity`
// in the new sink. If this value is omitted or set to false, and if the
// sink's parent is a project, then the value returned as `writer_identity` is
// the same group or service account used by Stackdriver Logging before the
// the same group or service account used by Logging before the
// addition of writer identities to this API. The sink's destination must be
// in the same project as the sink itself.
//
Expand Down Expand Up @@ -476,7 +477,7 @@ message UpdateSinkRequest {
// empty updateMask will be an error.
//
// For a detailed `FieldMask` definition, see
// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
//
// Example: `updateMask=filter`.
google.protobuf.FieldMask update_mask = 4;
Expand All @@ -496,7 +497,7 @@ message DeleteSinkRequest {
string sink_name = 1;
}

// Specifies a set of log entries that are not to be stored in Stackdriver
// Specifies a set of log entries that are not to be stored in
// Logging. If your project receives a large volume of logs, you might be able
// to use exclusions to reduce your chargeable logs. Exclusions are processed
// after log sinks, so you can export log entries before they are excluded.
Expand Down
10 changes: 6 additions & 4 deletions google/logging/v2/logging_metrics.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand All @@ -21,6 +22,7 @@ import "google/api/distribution.proto";
import "google/api/metric.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";

option cc_enable_arenas = true;
option csharp_namespace = "Google.Cloud.Logging.V2";
Expand Down Expand Up @@ -79,12 +81,12 @@ service MetricsServiceV2 {
// extracted values along with an optional histogram of the values as specified
// by the bucket options.
message LogMetric {
// Stackdriver Logging API version.
// Logging API version.
enum ApiVersion {
// Stackdriver Logging API v2.
// Logging API v2.
V2 = 0;

// Stackdriver Logging API v1.
// Logging API v1.
V1 = 1;
}

Expand Down

0 comments on commit 7b34e5a

Please sign in to comment.