Skip to content

Commit f3cf5e7

Browse files
fix: Update .OwlBot-hermetic.yaml to preserve SubscriberShutdownSettings files (#2583)
* fix: Update .OwlBot-hermetic.yaml to preserve SubscriberShutdownSettings files * chore: generate libraries at Wed Oct 8 20:58:37 UTC 2025 --------- Co-authored-by: cloud-java-bot <[email protected]>
1 parent 1375f6d commit f3cf5e7

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/.OwlBot-hermetic.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ deep-preserve-regex:
4141
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java"
4242
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java"
4343
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java"
44+
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java"
4445
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java"
4546
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java"
4647
- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java"
@@ -64,6 +65,7 @@ deep-preserve-regex:
6465
- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java"
6566
- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java"
6667
- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberInterface.java"
68+
- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettings.java"
6769
- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java"
6870
- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Waiter.java"
6971

.github/workflows/update_generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# the branch into which the pull request is merged
2727
base_branch: main
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
3232
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ void stop() {
318318
case WAIT_FOR_PROCESSING:
319319
logger.log(
320320
Level.FINE,
321-
"WAIT_FOR_PROCESSING shutdown mode: Waiting for outstanding messages to complete processing.");
321+
"WAIT_FOR_PROCESSING shutdown mode: Waiting for outstanding messages to complete"
322+
+ " processing.");
322323
java.time.Duration timeout = subscriberShutdownSettings.getTimeout();
323324
if (timeout.isNegative()) {
324325
// Indefinite wait use existing blocking wait
@@ -330,7 +331,8 @@ void stop() {
330331
if (!completedWait) {
331332
logger.log(
332333
Level.WARNING,
333-
"Grace period expired for WAIT_FOR_PROCESSING shutdown. Nacking remaining messages.");
334+
"Grace period expired for WAIT_FOR_PROCESSING shutdown. Nacking remaining"
335+
+ " messages.");
334336
// Switch to NACK_IMMEDIATELY behavior for remaining messages
335337
nackAllOutstandingMessages();
336338
}

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,8 @@ public Builder setOpenTelemetry(OpenTelemetry openTelemetry) {
796796
* SubscriberShutdownSettings#newBuilder() default settings}.
797797
*/
798798
@BetaApi(
799-
"The surface for SubscriberShutdownSettings is not stable yet and may be changed in the future.")
799+
"The surface for SubscriberShutdownSettings is not stable yet and may be changed in the"
800+
+ " future.")
800801
public Builder setSubscriberShutdownSettings(
801802
SubscriberShutdownSettings subscriberShutdownSettings) {
802803
this.subscriberShutdownSettings = Preconditions.checkNotNull(subscriberShutdownSettings);

0 commit comments

Comments
 (0)