Skip to content

Commit 823f970

Browse files
authored
Regenerate proto files in opentelemetry-stackdriver. (#108)
1 parent 68a534c commit 823f970

File tree

17 files changed

+157
-98
lines changed

17 files changed

+157
-98
lines changed

opentelemetry-stackdriver/proto/google/api/annotations.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

opentelemetry-stackdriver/proto/google/api/client.proto

Lines changed: 49 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -98,6 +98,22 @@ extend google.protobuf.ServiceOptions {
9898
// ...
9999
// }
100100
string oauth_scopes = 1050;
101+
102+
// The API version of this service, which should be sent by version-aware
103+
// clients to the service. This allows services to abide by the schema and
104+
// behavior of the service at the time this API version was deployed.
105+
// The format of the API version must be treated as opaque by clients.
106+
// Services may use a format with an apparent structure, but clients must
107+
// not rely on this to determine components within an API version, or attempt
108+
// to construct other valid API versions. Note that this is for upcoming
109+
// functionality and may not be implemented for all services.
110+
//
111+
// Example:
112+
//
113+
// service Foo {
114+
// option (google.api.api_version) = "v1_20230821_preview";
115+
// }
116+
string api_version = 525000001;
101117
}
102118

103119
// Required information for every language.
@@ -192,6 +208,10 @@ message Publishing {
192208
// Optional link to proto reference documentation. Example:
193209
// https://cloud.google.com/pubsub/lite/docs/reference/rpc
194210
string proto_reference_documentation_uri = 110;
211+
212+
// Optional link to REST reference documentation. Example:
213+
// https://cloud.google.com/pubsub/lite/docs/reference/rest
214+
string rest_reference_documentation_uri = 111;
195215
}
196216

197217
// Settings for Java client libraries.
@@ -243,8 +263,22 @@ message PhpSettings {
243263

244264
// Settings for Python client libraries.
245265
message PythonSettings {
266+
// Experimental features to be included during client library generation.
267+
// These fields will be deprecated once the feature graduates and is enabled
268+
// by default.
269+
message ExperimentalFeatures {
270+
// Enables generation of asynchronous REST clients if `rest` transport is
271+
// enabled. By default, asynchronous REST clients will not be generated.
272+
// This feature will be enabled by default 1 month after launching the
273+
// feature in preview packages.
274+
bool rest_async_io_enabled = 1;
275+
}
276+
246277
// Some settings.
247278
CommonLanguageSettings common = 1;
279+
280+
// Experimental features to be included during client library generation.
281+
ExperimentalFeatures experimental_features = 2;
248282
}
249283

250284
// Settings for Node client libraries.
@@ -329,6 +363,13 @@ message MethodSettings {
329363

330364
// The fully qualified name of the method, for which the options below apply.
331365
// This is used to find the method to apply the options.
366+
//
367+
// Example:
368+
//
369+
// publishing:
370+
// method_settings:
371+
// - selector: google.storage.control.v2.StorageControl.CreateFolder
372+
// # method settings for CreateFolder...
332373
string selector = 1;
333374

334375
// Describes settings to use for long-running operations when generating
@@ -337,17 +378,14 @@ message MethodSettings {
337378
//
338379
// Example of a YAML configuration::
339380
//
340-
// publishing:
341-
// method_settings:
381+
// publishing:
382+
// method_settings:
342383
// - selector: google.cloud.speech.v2.Speech.BatchRecognize
343384
// long_running:
344-
// initial_poll_delay:
345-
// seconds: 60 # 1 minute
385+
// initial_poll_delay: 60s # 1 minute
346386
// poll_delay_multiplier: 1.5
347-
// max_poll_delay:
348-
// seconds: 360 # 6 minutes
349-
// total_poll_timeout:
350-
// seconds: 54000 # 90 minutes
387+
// max_poll_delay: 360s # 6 minutes
388+
// total_poll_timeout: 54000s # 90 minutes
351389
LongRunning long_running = 2;
352390

353391
// List of top-level fields of the request message, that should be
@@ -356,8 +394,8 @@ message MethodSettings {
356394
//
357395
// Example of a YAML configuration:
358396
//
359-
// publishing:
360-
// method_settings:
397+
// publishing:
398+
// method_settings:
361399
// - selector: google.example.v1.ExampleService.CreateExample
362400
// auto_populated_fields:
363401
// - request_id

opentelemetry-stackdriver/proto/google/api/field_behavior.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

opentelemetry-stackdriver/proto/google/api/http.proto

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ message Http {
4141
bool fully_decode_reserved_expansion = 2;
4242
}
4343

44-
// # gRPC Transcoding
44+
// gRPC Transcoding
4545
//
4646
// gRPC Transcoding is a feature for mapping between a gRPC method and one or
4747
// more HTTP REST endpoints. It allows developers to build a single API service
@@ -82,9 +82,8 @@ message Http {
8282
//
8383
// This enables an HTTP REST to gRPC mapping as below:
8484
//
85-
// HTTP | gRPC
86-
// -----|-----
87-
// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")`
85+
// - HTTP: `GET /v1/messages/123456`
86+
// - gRPC: `GetMessage(name: "messages/123456")`
8887
//
8988
// Any fields in the request message which are not bound by the path template
9089
// automatically become HTTP query parameters if there is no HTTP request body.
@@ -108,11 +107,9 @@ message Http {
108107
//
109108
// This enables a HTTP JSON to RPC mapping as below:
110109
//
111-
// HTTP | gRPC
112-
// -----|-----
113-
// `GET /v1/messages/123456?revision=2&sub.subfield=foo` |
114-
// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield:
115-
// "foo"))`
110+
// - HTTP: `GET /v1/messages/123456?revision=2&sub.subfield=foo`
111+
// - gRPC: `GetMessage(message_id: "123456" revision: 2 sub:
112+
// SubMessage(subfield: "foo"))`
116113
//
117114
// Note that fields which are mapped to URL query parameters must have a
118115
// primitive type or a repeated primitive type or a non-repeated message type.
@@ -142,10 +139,8 @@ message Http {
142139
// representation of the JSON in the request body is determined by
143140
// protos JSON encoding:
144141
//
145-
// HTTP | gRPC
146-
// -----|-----
147-
// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
148-
// "123456" message { text: "Hi!" })`
142+
// - HTTP: `PATCH /v1/messages/123456 { "text": "Hi!" }`
143+
// - gRPC: `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
149144
//
150145
// The special name `*` can be used in the body mapping to define that
151146
// every field not bound by the path template should be mapped to the
@@ -168,10 +163,8 @@ message Http {
168163
//
169164
// The following HTTP JSON to RPC mapping is enabled:
170165
//
171-
// HTTP | gRPC
172-
// -----|-----
173-
// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
174-
// "123456" text: "Hi!")`
166+
// - HTTP: `PATCH /v1/messages/123456 { "text": "Hi!" }`
167+
// - gRPC: `UpdateMessage(message_id: "123456" text: "Hi!")`
175168
//
176169
// Note that when using `*` in the body mapping, it is not possible to
177170
// have HTTP parameters, as all fields not bound by the path end in
@@ -199,13 +192,13 @@ message Http {
199192
//
200193
// This enables the following two alternative HTTP JSON to RPC mappings:
201194
//
202-
// HTTP | gRPC
203-
// -----|-----
204-
// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
205-
// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id:
206-
// "123456")`
195+
// - HTTP: `GET /v1/messages/123456`
196+
// - gRPC: `GetMessage(message_id: "123456")`
207197
//
208-
// ## Rules for HTTP mapping
198+
// - HTTP: `GET /v1/users/me/messages/123456`
199+
// - gRPC: `GetMessage(user_id: "me" message_id: "123456")`
200+
//
201+
// Rules for HTTP mapping
209202
//
210203
// 1. Leaf request fields (recursive expansion nested messages in the request
211204
// message) are classified into three categories:
@@ -224,7 +217,7 @@ message Http {
224217
// request body, all
225218
// fields are passed via URL path and URL query parameters.
226219
//
227-
// ### Path template syntax
220+
// Path template syntax
228221
//
229222
// Template = "/" Segments [ Verb ] ;
230223
// Segments = Segment { "/" Segment } ;
@@ -263,7 +256,7 @@ message Http {
263256
// Document](https://developers.google.com/discovery/v1/reference/apis) as
264257
// `{+var}`.
265258
//
266-
// ## Using gRPC API Service Configuration
259+
// Using gRPC API Service Configuration
267260
//
268261
// gRPC API Service Configuration (service config) is a configuration language
269262
// for configuring a gRPC service to become a user-facing product. The
@@ -278,15 +271,14 @@ message Http {
278271
// specified in the service config will override any matching transcoding
279272
// configuration in the proto.
280273
//
281-
// Example:
274+
// The following example selects a gRPC method and applies an `HttpRule` to it:
282275
//
283276
// http:
284277
// rules:
285-
// # Selects a gRPC method and applies HttpRule to it.
286278
// - selector: example.v1.Messaging.GetMessage
287279
// get: /v1/messages/{message_id}/{sub.subfield}
288280
//
289-
// ## Special notes
281+
// Special notes
290282
//
291283
// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the
292284
// proto to JSON conversion must follow the [proto3

opentelemetry-stackdriver/proto/google/api/label.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

opentelemetry-stackdriver/proto/google/api/launch_stage.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

opentelemetry-stackdriver/proto/google/api/monitored_resource.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ message MonitoredResourceDescriptor {
4949

5050
// Required. The monitored resource type. For example, the type
5151
// `"cloudsql_database"` represents databases in Google Cloud SQL.
52-
// For a list of types, see [Monitoring resource
52+
// For a list of types, see [Monitored resource
5353
// types](https://cloud.google.com/monitoring/api/resources)
5454
// and [Logging resource
5555
// types](https://cloud.google.com/logging/docs/api/v2/resource-list).

opentelemetry-stackdriver/proto/google/api/resource.proto

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -179,8 +179,13 @@ message ResourceDescriptor {
179179

180180
// The plural name used in the resource name and permission names, such as
181181
// 'projects' for the resource name of 'projects/{project}' and the permission
182-
// name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same
183-
// concept of the `plural` field in k8s CRD spec
182+
// name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception
183+
// to this is for Nested Collections that have stuttering names, as defined
184+
// in [AIP-122](https://google.aip.dev/122#nested-collections), where the
185+
// collection ID in the resource name pattern does not necessarily directly
186+
// match the `plural` value.
187+
//
188+
// It is the same concept of the `plural` field in k8s CRD spec
184189
// https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/
185190
//
186191
// Note: The plural form is required even for singleton resources. See

opentelemetry-stackdriver/proto/google/devtools/cloudtrace/v2/trace.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

opentelemetry-stackdriver/proto/google/devtools/cloudtrace/v2/tracing.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 Google LLC
1+
// Copyright 2024 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)