From f2861a204b138acce39d3cda9d9d98353a8a2025 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 16:58:24 +0000 Subject: [PATCH 1/3] chore(main): release 1.120.7-SNAPSHOT (#1217) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-pubsub-bom/pom.xml | 8 ++++---- google-cloud-pubsub/pom.xml | 4 ++-- grpc-google-cloud-pubsub-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-pubsub-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index 3dd47f9b1..dccfd5b2d 100644 --- a/google-cloud-pubsub-bom/pom.xml +++ b/google-cloud-pubsub-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub-bom - 1.120.6 + 1.120.7-SNAPSHOT pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.120.6 + 1.120.7-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.102.6 + 1.102.7-SNAPSHOT com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.102.6 + 1.102.7-SNAPSHOT diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 01e81eeef..3c0f6102b 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub - 1.120.6 + 1.120.7-SNAPSHOT jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.120.6 + 1.120.7-SNAPSHOT google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index cf9e2248c..1779a8621 100644 --- a/grpc-google-cloud-pubsub-v1/pom.xml +++ b/grpc-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.102.6 + 1.102.7-SNAPSHOT grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.120.6 + 1.120.7-SNAPSHOT diff --git a/pom.xml b/pom.xml index b57b26256..a6b11c467 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.120.6 + 1.120.7-SNAPSHOT Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.102.6 + 1.102.7-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.102.6 + 1.102.7-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.120.6 + 1.120.7-SNAPSHOT diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 4e2d0312f..217aee5a9 100644 --- a/proto-google-cloud-pubsub-v1/pom.xml +++ b/proto-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.102.6 + 1.102.7-SNAPSHOT proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.120.6 + 1.120.7-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1547d6af7..11737a843 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.120.6 + 1.120.7-SNAPSHOT diff --git a/versions.txt b/versions.txt index 6ffc75b71..f29db5af8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.120.6:1.120.6 -grpc-google-cloud-pubsub-v1:1.102.6:1.102.6 -proto-google-cloud-pubsub-v1:1.102.6:1.102.6 +google-cloud-pubsub:1.120.6:1.120.7-SNAPSHOT +grpc-google-cloud-pubsub-v1:1.102.6:1.102.7-SNAPSHOT +proto-google-cloud-pubsub-v1:1.102.6:1.102.7-SNAPSHOT From 8782533204fcc312c1063763f5073db83c72382f Mon Sep 17 00:00:00 2001 From: Mike Micatka <31972785+mmicatka@users.noreply.github.com> Date: Mon, 1 Aug 2022 17:23:07 -0400 Subject: [PATCH 2/3] fix: Updated log level from WARNING -> INFO for EOD failures (#1218) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Updated log level from WARNING -> INFO for EOD failures * formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 4 ++-- .../cloud/pubsub/v1/StreamingSubscriberConnection.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9ad4cbe33..e98ba1a5f 100644 --- a/README.md +++ b/README.md @@ -58,13 +58,13 @@ implementation 'com.google.cloud:google-cloud-pubsub' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-pubsub:1.120.5' +implementation 'com.google.cloud:google-cloud-pubsub:1.120.6' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.120.5" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.120.6" ``` ## Authentication diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java index 1067fa7e5..e7046c1be 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java @@ -547,18 +547,17 @@ public void onFailure(Throwable t) { String errorMessage = metadataMap.get(ackId); if (errorMessage.startsWith(TRANSIENT_FAILURE_METADATA_PREFIX)) { // Retry all "TRANSIENT_*" error messages - do not set message future - logger.log(Level.WARNING, "Transient error message, will resend", errorMessage); + logger.log(Level.INFO, "Transient error message, will resend", errorMessage); ackRequestDataArrayRetryList.add(ackRequestData); } else if (errorMessage.equals(PERMANENT_FAILURE_INVALID_ACK_ID_METADATA)) { // Permanent failure, send logger.log( - Level.WARNING, + Level.INFO, "Permanent error invalid ack id message, will not resend", errorMessage); ackRequestData.setResponse(AckResponse.INVALID, setResponseOnSuccess); } else { - logger.log( - Level.WARNING, "Unknown error message, will not resend", errorMessage); + logger.log(Level.INFO, "Unknown error message, will not resend", errorMessage); ackRequestData.setResponse(AckResponse.OTHER, setResponseOnSuccess); } } else { From 95f65adcedfe6d68827ed5f477886e4cff02d8d9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 18:01:50 -0400 Subject: [PATCH 3/3] chore(main): release 1.120.7 (#1219) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google-cloud-pubsub-bom/pom.xml | 8 ++++---- google-cloud-pubsub/pom.xml | 4 ++-- grpc-google-cloud-pubsub-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-pubsub-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69fa16512..515a6314a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.120.7](https://github.com/googleapis/java-pubsub/compare/v1.120.6...v1.120.7) (2022-08-01) + + +### Bug Fixes + +* Updated log level from WARNING -> INFO for EOD failures ([#1218](https://github.com/googleapis/java-pubsub/issues/1218)) ([8782533](https://github.com/googleapis/java-pubsub/commit/8782533204fcc312c1063763f5073db83c72382f)) + ## [1.120.6](https://github.com/googleapis/java-pubsub/compare/v1.120.5...v1.120.6) (2022-08-01) diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index dccfd5b2d..4f9d213da 100644 --- a/google-cloud-pubsub-bom/pom.xml +++ b/google-cloud-pubsub-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub-bom - 1.120.7-SNAPSHOT + 1.120.7 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.120.7-SNAPSHOT + 1.120.7 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.102.7-SNAPSHOT + 1.102.7 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.102.7-SNAPSHOT + 1.102.7 diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 3c0f6102b..4bdd42cf6 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub - 1.120.7-SNAPSHOT + 1.120.7 jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.120.7-SNAPSHOT + 1.120.7 google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index 1779a8621..ddb400381 100644 --- a/grpc-google-cloud-pubsub-v1/pom.xml +++ b/grpc-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.102.7-SNAPSHOT + 1.102.7 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.120.7-SNAPSHOT + 1.120.7 diff --git a/pom.xml b/pom.xml index a6b11c467..ccc497703 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.120.7-SNAPSHOT + 1.120.7 Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.102.7-SNAPSHOT + 1.102.7 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.102.7-SNAPSHOT + 1.102.7 com.google.cloud google-cloud-pubsub - 1.120.7-SNAPSHOT + 1.120.7 diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 217aee5a9..42186487d 100644 --- a/proto-google-cloud-pubsub-v1/pom.xml +++ b/proto-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.102.7-SNAPSHOT + 1.102.7 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.120.7-SNAPSHOT + 1.120.7 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 11737a843..8ec39677c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.120.7-SNAPSHOT + 1.120.7 diff --git a/versions.txt b/versions.txt index f29db5af8..4fe92c588 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.120.6:1.120.7-SNAPSHOT -grpc-google-cloud-pubsub-v1:1.102.6:1.102.7-SNAPSHOT -proto-google-cloud-pubsub-v1:1.102.6:1.102.7-SNAPSHOT +google-cloud-pubsub:1.120.7:1.120.7 +grpc-google-cloud-pubsub-v1:1.102.7:1.102.7 +proto-google-cloud-pubsub-v1:1.102.7:1.102.7