Skip to content

Commit 46140d2

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into protobuf-ci-v4294
2 parents e44f86f + f504eee commit 46140d2

File tree

12 files changed

+36
-7
lines changed

12 files changed

+36
-7
lines changed

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@
4343
# base_ref: ${{ github.base_ref }}
4444
# head_ref: ${{ github.head_ref }}
4545
# token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
46+

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v4
9-
- uses: actions/setup-java@v4
9+
- uses: actions/setup-java@v5
1010
with:
1111
distribution: temurin
1212
java-version: 11

‎.kokoro/presubmit/graalvm-native-a.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-b.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-c.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.61.0
2-
googleapis_commitish: b0316578aaf7434e3c5bb93badd252f67aacf8d5
3-
libraries_bom_version: 26.65.0
1+
gapic_generator_version: 2.62.1
2+
googleapis_commitish: 2585041b27d424ed4496d163671a95a7e1af4c31
3+
libraries_bom_version: 26.67.0
44
libraries:
55
- api_shortname: pubsublite
66
name_pretty: Cloud Pub/Sub Lite

‎google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/v1/stub/GrpcAdminServiceStub.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
8383
.setFullMethodName("google.cloud.pubsublite.v1.AdminService/CreateTopic")
8484
.setRequestMarshaller(ProtoUtils.marshaller(CreateTopicRequest.getDefaultInstance()))
8585
.setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance()))
86+
.setSampledToLocalTracing(true)
8687
.build();
8788

8889
private static final MethodDescriptor<GetTopicRequest, Topic> getTopicMethodDescriptor =
@@ -91,6 +92,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
9192
.setFullMethodName("google.cloud.pubsublite.v1.AdminService/GetTopic")
9293
.setRequestMarshaller(ProtoUtils.marshaller(GetTopicRequest.getDefaultInstance()))
9394
.setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance()))
95+
.setSampledToLocalTracing(true)
9496
.build();
9597

9698
private static final MethodDescriptor<GetTopicPartitionsRequest, TopicPartitions>
@@ -101,6 +103,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
101103
.setRequestMarshaller(
102104
ProtoUtils.marshaller(GetTopicPartitionsRequest.getDefaultInstance()))
103105
.setResponseMarshaller(ProtoUtils.marshaller(TopicPartitions.getDefaultInstance()))
106+
.setSampledToLocalTracing(true)
104107
.build();
105108

106109
private static final MethodDescriptor<ListTopicsRequest, ListTopicsResponse>
@@ -110,6 +113,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
110113
.setFullMethodName("google.cloud.pubsublite.v1.AdminService/ListTopics")
111114
.setRequestMarshaller(ProtoUtils.marshaller(ListTopicsRequest.getDefaultInstance()))
112115
.setResponseMarshaller(ProtoUtils.marshaller(ListTopicsResponse.getDefaultInstance()))
116+
.setSampledToLocalTracing(true)
113117
.build();
114118

115119
private static final MethodDescriptor<UpdateTopicRequest, Topic> updateTopicMethodDescriptor =
@@ -118,6 +122,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
118122
.setFullMethodName("google.cloud.pubsublite.v1.AdminService/UpdateTopic")
119123
.setRequestMarshaller(ProtoUtils.marshaller(UpdateTopicRequest.getDefaultInstance()))
120124
.setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance()))
125+
.setSampledToLocalTracing(true)
121126
.build();
122127

123128
private static final MethodDescriptor<DeleteTopicRequest, Empty> deleteTopicMethodDescriptor =
@@ -126,6 +131,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
126131
.setFullMethodName("google.cloud.pubsublite.v1.AdminService/DeleteTopic")
127132
.setRequestMarshaller(ProtoUtils.marshaller(DeleteTopicRequest.getDefaultInstance()))
128133
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
134+
.setSampledToLocalTracing(true)
129135
.build();
130136

131137
private static final MethodDescriptor<
@@ -139,6 +145,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
139145
ProtoUtils.marshaller(ListTopicSubscriptionsRequest.getDefaultInstance()))
140146
.setResponseMarshaller(
141147
ProtoUtils.marshaller(ListTopicSubscriptionsResponse.getDefaultInstance()))
148+
.setSampledToLocalTracing(true)
142149
.build();
143150

144151
private static final MethodDescriptor<CreateSubscriptionRequest, Subscription>
@@ -149,6 +156,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
149156
.setRequestMarshaller(
150157
ProtoUtils.marshaller(CreateSubscriptionRequest.getDefaultInstance()))
151158
.setResponseMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance()))
159+
.setSampledToLocalTracing(true)
152160
.build();
153161

154162
private static final MethodDescriptor<GetSubscriptionRequest, Subscription>
@@ -159,6 +167,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
159167
.setRequestMarshaller(
160168
ProtoUtils.marshaller(GetSubscriptionRequest.getDefaultInstance()))
161169
.setResponseMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance()))
170+
.setSampledToLocalTracing(true)
162171
.build();
163172

164173
private static final MethodDescriptor<ListSubscriptionsRequest, ListSubscriptionsResponse>
@@ -170,6 +179,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
170179
ProtoUtils.marshaller(ListSubscriptionsRequest.getDefaultInstance()))
171180
.setResponseMarshaller(
172181
ProtoUtils.marshaller(ListSubscriptionsResponse.getDefaultInstance()))
182+
.setSampledToLocalTracing(true)
173183
.build();
174184

175185
private static final MethodDescriptor<UpdateSubscriptionRequest, Subscription>
@@ -180,6 +190,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
180190
.setRequestMarshaller(
181191
ProtoUtils.marshaller(UpdateSubscriptionRequest.getDefaultInstance()))
182192
.setResponseMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance()))
193+
.setSampledToLocalTracing(true)
183194
.build();
184195

185196
private static final MethodDescriptor<DeleteSubscriptionRequest, Empty>
@@ -190,6 +201,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
190201
.setRequestMarshaller(
191202
ProtoUtils.marshaller(DeleteSubscriptionRequest.getDefaultInstance()))
192203
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
204+
.setSampledToLocalTracing(true)
193205
.build();
194206

195207
private static final MethodDescriptor<SeekSubscriptionRequest, Operation>
@@ -200,6 +212,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
200212
.setRequestMarshaller(
201213
ProtoUtils.marshaller(SeekSubscriptionRequest.getDefaultInstance()))
202214
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
215+
.setSampledToLocalTracing(true)
203216
.build();
204217

205218
private static final MethodDescriptor<CreateReservationRequest, Reservation>
@@ -210,6 +223,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
210223
.setRequestMarshaller(
211224
ProtoUtils.marshaller(CreateReservationRequest.getDefaultInstance()))
212225
.setResponseMarshaller(ProtoUtils.marshaller(Reservation.getDefaultInstance()))
226+
.setSampledToLocalTracing(true)
213227
.build();
214228

215229
private static final MethodDescriptor<GetReservationRequest, Reservation>
@@ -220,6 +234,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
220234
.setRequestMarshaller(
221235
ProtoUtils.marshaller(GetReservationRequest.getDefaultInstance()))
222236
.setResponseMarshaller(ProtoUtils.marshaller(Reservation.getDefaultInstance()))
237+
.setSampledToLocalTracing(true)
223238
.build();
224239

225240
private static final MethodDescriptor<ListReservationsRequest, ListReservationsResponse>
@@ -231,6 +246,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
231246
ProtoUtils.marshaller(ListReservationsRequest.getDefaultInstance()))
232247
.setResponseMarshaller(
233248
ProtoUtils.marshaller(ListReservationsResponse.getDefaultInstance()))
249+
.setSampledToLocalTracing(true)
234250
.build();
235251

236252
private static final MethodDescriptor<UpdateReservationRequest, Reservation>
@@ -241,6 +257,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
241257
.setRequestMarshaller(
242258
ProtoUtils.marshaller(UpdateReservationRequest.getDefaultInstance()))
243259
.setResponseMarshaller(ProtoUtils.marshaller(Reservation.getDefaultInstance()))
260+
.setSampledToLocalTracing(true)
244261
.build();
245262

246263
private static final MethodDescriptor<DeleteReservationRequest, Empty>
@@ -251,6 +268,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
251268
.setRequestMarshaller(
252269
ProtoUtils.marshaller(DeleteReservationRequest.getDefaultInstance()))
253270
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
271+
.setSampledToLocalTracing(true)
254272
.build();
255273

256274
private static final MethodDescriptor<ListReservationTopicsRequest, ListReservationTopicsResponse>
@@ -262,6 +280,7 @@ public class GrpcAdminServiceStub extends AdminServiceStub {
262280
ProtoUtils.marshaller(ListReservationTopicsRequest.getDefaultInstance()))
263281
.setResponseMarshaller(
264282
ProtoUtils.marshaller(ListReservationTopicsResponse.getDefaultInstance()))
283+
.setSampledToLocalTracing(true)
265284
.build();
266285

267286
private final UnaryCallable<CreateTopicRequest, Topic> createTopicCallable;

‎google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/v1/stub/GrpcCursorServiceStub.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class GrpcCursorServiceStub extends CursorServiceStub {
5656
ProtoUtils.marshaller(StreamingCommitCursorRequest.getDefaultInstance()))
5757
.setResponseMarshaller(
5858
ProtoUtils.marshaller(StreamingCommitCursorResponse.getDefaultInstance()))
59+
.setSampledToLocalTracing(true)
5960
.build();
6061

6162
private static final MethodDescriptor<CommitCursorRequest, CommitCursorResponse>
@@ -66,6 +67,7 @@ public class GrpcCursorServiceStub extends CursorServiceStub {
6667
.setRequestMarshaller(ProtoUtils.marshaller(CommitCursorRequest.getDefaultInstance()))
6768
.setResponseMarshaller(
6869
ProtoUtils.marshaller(CommitCursorResponse.getDefaultInstance()))
70+
.setSampledToLocalTracing(true)
6971
.build();
7072

7173
private static final MethodDescriptor<ListPartitionCursorsRequest, ListPartitionCursorsResponse>
@@ -77,6 +79,7 @@ public class GrpcCursorServiceStub extends CursorServiceStub {
7779
ProtoUtils.marshaller(ListPartitionCursorsRequest.getDefaultInstance()))
7880
.setResponseMarshaller(
7981
ProtoUtils.marshaller(ListPartitionCursorsResponse.getDefaultInstance()))
82+
.setSampledToLocalTracing(true)
8083
.build();
8184

8285
private final BidiStreamingCallable<StreamingCommitCursorRequest, StreamingCommitCursorResponse>

‎google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/v1/stub/GrpcPartitionAssignmentServiceStub.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class GrpcPartitionAssignmentServiceStub extends PartitionAssignmentServi
4949
ProtoUtils.marshaller(PartitionAssignmentRequest.getDefaultInstance()))
5050
.setResponseMarshaller(
5151
ProtoUtils.marshaller(PartitionAssignment.getDefaultInstance()))
52+
.setSampledToLocalTracing(true)
5253
.build();
5354

5455
private final BidiStreamingCallable<PartitionAssignmentRequest, PartitionAssignment>

‎google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/v1/stub/GrpcPublisherServiceStub.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class GrpcPublisherServiceStub extends PublisherServiceStub {
4545
.setFullMethodName("google.cloud.pubsublite.v1.PublisherService/Publish")
4646
.setRequestMarshaller(ProtoUtils.marshaller(PublishRequest.getDefaultInstance()))
4747
.setResponseMarshaller(ProtoUtils.marshaller(PublishResponse.getDefaultInstance()))
48+
.setSampledToLocalTracing(true)
4849
.build();
4950

5051
private final BidiStreamingCallable<PublishRequest, PublishResponse> publishCallable;

0 commit comments

Comments
 (0)