Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

Commit 534f960

Browse files
yoshi-automationyoshi-automation
authored
feat: added support for span kind (#228)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/2172df15-42fb-4ea2-9939-61316a413093/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 319788951 Source-Link: googleapis/googleapis@13d3b3a
1 parent 547dc1f commit 534f960

File tree

12 files changed

+786
-257
lines changed

12 files changed

+786
-257
lines changed

‎google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ public static class Builder extends StubSettings.Builder<TraceServiceStubSetting
261261
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
262262
ImmutableMap.builder();
263263
definitions.put(
264-
"idempotent",
264+
"retry_policy_1_codes",
265265
ImmutableSet.copyOf(
266266
Lists.<StatusCode.Code>newArrayList(
267-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
268-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
267+
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
268+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
269269
RETRYABLE_CODE_DEFINITIONS = definitions.build();
270270
}
271271

@@ -279,12 +279,14 @@ public static class Builder extends StubSettings.Builder<TraceServiceStubSetting
279279
.setInitialRetryDelay(Duration.ofMillis(100L))
280280
.setRetryDelayMultiplier(1.2)
281281
.setMaxRetryDelay(Duration.ofMillis(1000L))
282-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
283-
.setRpcTimeoutMultiplier(1.5)
284-
.setMaxRpcTimeout(Duration.ofMillis(30000L))
282+
.setInitialRpcTimeout(Duration.ofMillis(45000L))
283+
.setRpcTimeoutMultiplier(1.0)
284+
.setMaxRpcTimeout(Duration.ofMillis(45000L))
285285
.setTotalTimeout(Duration.ofMillis(45000L))
286286
.build();
287-
definitions.put("default", settings);
287+
definitions.put("retry_policy_1_params", settings);
288+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
289+
definitions.put("no_retry_params", settings);
288290
RETRY_PARAM_DEFINITIONS = definitions.build();
289291
}
290292

@@ -321,18 +323,18 @@ private static Builder initDefaults(Builder builder) {
321323

322324
builder
323325
.patchTracesSettings()
324-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
325-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
326+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
327+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
326328

327329
builder
328330
.listTracesSettings()
329-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
330-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
331+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
332+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
331333

332334
builder
333335
.getTraceSettings()
334-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
335-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
336+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
337+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
336338

337339
return builder;
338340
}

‎google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,13 @@ public static class Builder extends StubSettings.Builder<TraceServiceStubSetting
183183
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
184184
ImmutableMap.builder();
185185
definitions.put(
186-
"idempotent",
186+
"retry_policy_1_codes",
187187
ImmutableSet.copyOf(
188188
Lists.<StatusCode.Code>newArrayList(
189-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
190-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
189+
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
190+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
191+
definitions.put(
192+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
191193
RETRYABLE_CODE_DEFINITIONS = definitions.build();
192194
}
193195

@@ -201,12 +203,22 @@ public static class Builder extends StubSettings.Builder<TraceServiceStubSetting
201203
.setInitialRetryDelay(Duration.ofMillis(100L))
202204
.setRetryDelayMultiplier(1.2)
203205
.setMaxRetryDelay(Duration.ofMillis(1000L))
204-
.setInitialRpcTimeout(Duration.ofMillis(30000L))
205-
.setRpcTimeoutMultiplier(1.5)
206-
.setMaxRpcTimeout(Duration.ofMillis(60000L))
206+
.setInitialRpcTimeout(Duration.ofMillis(120000L))
207+
.setRpcTimeoutMultiplier(1.0)
208+
.setMaxRpcTimeout(Duration.ofMillis(120000L))
209+
.setTotalTimeout(Duration.ofMillis(120000L))
210+
.build();
211+
definitions.put("retry_policy_1_params", settings);
212+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
213+
definitions.put("no_retry_params", settings);
214+
settings =
215+
RetrySettings.newBuilder()
216+
.setInitialRpcTimeout(Duration.ofMillis(120000L))
217+
.setRpcTimeoutMultiplier(1.0)
218+
.setMaxRpcTimeout(Duration.ofMillis(120000L))
207219
.setTotalTimeout(Duration.ofMillis(120000L))
208220
.build();
209-
definitions.put("default", settings);
221+
definitions.put("no_retry_1_params", settings);
210222
RETRY_PARAM_DEFINITIONS = definitions.build();
211223
}
212224

@@ -241,13 +253,13 @@ private static Builder initDefaults(Builder builder) {
241253

242254
builder
243255
.createSpanSettings()
244-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
245-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
256+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
257+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
246258

247259
builder
248260
.batchWriteSpansSettings()
249-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
250-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
261+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
262+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
251263

252264
return builder;
253265
}

‎proto-google-cloud-trace-v1/clirr-ignored-differences.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>7012</differenceType>
6+
<className>com/google/devtools/cloudtrace/v1/*OrBuilder</className>
7+
<method>* get*(*)</method>
8+
</difference>
9+
<difference>
10+
<differenceType>7012</differenceType>
11+
<className>com/google/devtools/cloudtrace/v1/*OrBuilder</className>
12+
<method>boolean contains*(*)</method>
13+
</difference>
14+
<difference>
15+
<differenceType>7012</differenceType>
16+
<className>com/google/devtools/cloudtrace/v1/*OrBuilder</className>
17+
<method>boolean has*(*)</method>
18+
</difference>
19+
</differences>

‎proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
6969
static {
7070
java.lang.String[] descriptorData = {
7171
"\n)google/devtools/cloudtrace/v1/trace.pr"
72-
+ "oto\022\035google.devtools.cloudtrace.v1\032\034goog"
73-
+ "le/api/annotations.proto\032\027google/api/cli"
74-
+ "ent.proto\032\037google/api/field_behavior.pro"
75-
+ "to\032\031google/api/resource.proto\032\033google/pr"
76-
+ "otobuf/empty.proto\032\037google/protobuf/time"
77-
+ "stamp.proto\"f\n\005Trace\022\022\n\nproject_id\030\001 \001(\t"
72+
+ "oto\022\035google.devtools.cloudtrace.v1\032\027goog"
73+
+ "le/api/client.proto\032\037google/api/field_be"
74+
+ "havior.proto\032\031google/api/resource.proto\032"
75+
+ "\033google/protobuf/empty.proto\032\037google/pro"
76+
+ "tobuf/timestamp.proto\032\034google/api/annota"
77+
+ "tions.proto\"f\n\005Trace\022\022\n\nproject_id\030\001 \001(\t"
7878
+ "\022\020\n\010trace_id\030\002 \001(\t\0227\n\005spans\030\003 \003(\0132(.goog"
7979
+ "le.devtools.cloudtrace.v1.TraceSpan\">\n\006T"
8080
+ "races\0224\n\006traces\030\001 \003(\0132$.google.devtools."
@@ -134,12 +134,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
134134
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
135135
descriptorData,
136136
new com.google.protobuf.Descriptors.FileDescriptor[] {
137-
com.google.api.AnnotationsProto.getDescriptor(),
138137
com.google.api.ClientProto.getDescriptor(),
139138
com.google.api.FieldBehaviorProto.getDescriptor(),
140139
com.google.api.ResourceProto.getDescriptor(),
141140
com.google.protobuf.EmptyProto.getDescriptor(),
142141
com.google.protobuf.TimestampProto.getDescriptor(),
142+
com.google.api.AnnotationsProto.getDescriptor(),
143143
});
144144
internal_static_google_devtools_cloudtrace_v1_Trace_descriptor =
145145
getDescriptor().getMessageTypes().get(0);
@@ -221,12 +221,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
221221
registry.add(com.google.api.ClientProto.oauthScopes);
222222
com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
223223
descriptor, registry);
224-
com.google.api.AnnotationsProto.getDescriptor();
225224
com.google.api.ClientProto.getDescriptor();
226225
com.google.api.FieldBehaviorProto.getDescriptor();
227226
com.google.api.ResourceProto.getDescriptor();
228227
com.google.protobuf.EmptyProto.getDescriptor();
229228
com.google.protobuf.TimestampProto.getDescriptor();
229+
com.google.api.AnnotationsProto.getDescriptor();
230230
}
231231

232232
// @@protoc_insertion_point(outer_class_scope)

‎proto-google-cloud-trace-v1/src/main/proto/google/devtools/cloudtrace/v1/trace.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 Google LLC.
1+
// Copyright 2020 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.
@@ -16,12 +16,12 @@ syntax = "proto3";
1616

1717
package google.devtools.cloudtrace.v1;
1818

19-
import "google/api/annotations.proto";
2019
import "google/api/client.proto";
2120
import "google/api/field_behavior.proto";
2221
import "google/api/resource.proto";
2322
import "google/protobuf/empty.proto";
2423
import "google/protobuf/timestamp.proto";
24+
import "google/api/annotations.proto";
2525

2626
option csharp_namespace = "Google.Cloud.Trace.V1";
2727
option go_package = "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1;cloudtrace";

‎proto-google-cloud-trace-v2/clirr-ignored-differences.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>7012</differenceType>
6+
<className>com/google/devtools/cloudtrace/v2/*OrBuilder</className>
7+
<method>* get*(*)</method>
8+
</difference>
9+
<difference>
10+
<differenceType>7012</differenceType>
11+
<className>com/google/devtools/cloudtrace/v2/*OrBuilder</className>
12+
<method>boolean contains*(*)</method>
13+
</difference>
14+
<difference>
15+
<differenceType>7012</differenceType>
16+
<className>com/google/devtools/cloudtrace/v2/*OrBuilder</className>
17+
<method>boolean has*(*)</method>
18+
</difference>
19+
</differences>

0 commit comments

Comments
 (0)