From 12c4322de84b9fdb6cfd631156f1487430773977 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 00:10:18 +0000 Subject: [PATCH 1/5] chore(main): release 3.7.4-SNAPSHOT (#920) :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-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index cb44b408d..b3bc1ef82 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.7.3 + 3.7.4-SNAPSHOT pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.7.3 + 3.7.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.3 + 0.96.4-SNAPSHOT com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.3 + 0.96.4-SNAPSHOT diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index c525fb116..272522ece 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.7.3 + 3.7.4-SNAPSHOT jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.7.3 + 3.7.4-SNAPSHOT google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index ea9609d38..46d0fbc28 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.3 + 0.96.4-SNAPSHOT grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.3 + 3.7.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0d7d04337..5a722a6da 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.7.3 + 3.7.4-SNAPSHOT Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.3 + 0.96.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.3 + 0.96.4-SNAPSHOT com.google.cloud google-cloud-logging - 3.7.3 + 3.7.4-SNAPSHOT diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 529750fe2..fcfea8b59 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.3 + 0.96.4-SNAPSHOT proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.3 + 3.7.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3d6c41774..025fa175d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.7.3 + 3.7.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index fa20f38f2..fff1c787f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.7.3:3.7.3 -grpc-google-cloud-logging-v2:0.96.3:0.96.3 -proto-google-cloud-logging-v2:0.96.3:0.96.3 +google-cloud-logging:3.7.3:3.7.4-SNAPSHOT +grpc-google-cloud-logging-v2:0.96.3:0.96.4-SNAPSHOT +proto-google-cloud-logging-v2:0.96.3:0.96.4-SNAPSHOT From 7f7f488ab09f6e6c9eaa312aea511314ca077ab5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 30 Mar 2022 18:12:59 +0200 Subject: [PATCH 2/5] chore(deps): update dependency com.google.cloud:google-cloud-logging to v3.7.3 (#921) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-logging to v3.7.3 * 🦉 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 | 6 +++--- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d0905794e..ba7b60e06 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-logging - 3.7.2 + 3.7.3 ``` @@ -58,13 +58,13 @@ implementation 'com.google.cloud:google-cloud-logging' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-logging:3.7.2' +implementation 'com.google.cloud:google-cloud-logging:3.7.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.7.2" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.7.3" ``` ## Authentication diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 588325435..bc44a4714 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.7.2 + 3.7.3 From 1adf86722361ce946c733de87cb217fa2f65bfd5 Mon Sep 17 00:00:00 2001 From: losalex <90795544+losalex@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:03:53 -0700 Subject: [PATCH 3/5] fix: Async logging should not rethrow error in onFailure callback (#923) --- .../src/main/java/com/google/cloud/logging/LoggingImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java index 4404ea675..eac372e62 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java @@ -882,7 +882,7 @@ public void flush() { try { ApiFutures.allAsList(writesToFlush).get(FLUSH_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { - throw new RuntimeException(e); + System.err.println("ERROR: flush failure: " + e); } } From da925189d808833f1b7cc7a1934bcf66f51663be Mon Sep 17 00:00:00 2001 From: losalex <90795544+losalex@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:56:04 -0700 Subject: [PATCH 4/5] fix: Async logging should not rethrow error in onFailure callback correction (#925) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Async logging should not rethrow error in onFailure callback correction * 🦉 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 | 2 +- .../src/main/java/com/google/cloud/logging/LoggingImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba7b60e06..e930bdece 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:25.0.0') +implementation platform('com.google.cloud:libraries-bom:25.1.0') implementation 'com.google.cloud:google-cloud-logging' ``` diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java index eac372e62..c75658c11 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java @@ -882,7 +882,7 @@ public void flush() { try { ApiFutures.allAsList(writesToFlush).get(FLUSH_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { - System.err.println("ERROR: flush failure: " + e); + throw new RuntimeException(e); } } @@ -940,7 +940,7 @@ public void onSuccess(Void v) { public void onFailure(Throwable t) { try { Exception ex = t instanceof Exception ? (Exception) t : new Exception(t); - throw new RuntimeException(ex); + System.err.println("ERROR: onFailure exception: " + ex); } finally { removeFromPending(); } From 82df9ef061d58fd53d443b5510831851d2df0887 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:28:01 -0700 Subject: [PATCH 5/5] chore(main): release 3.7.4 (#924) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 580b710f1..24a1a4ff0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [3.7.4](https://github.com/googleapis/java-logging/compare/v3.7.3...v3.7.4) (2022-03-31) + + +### Bug Fixes + +* Async logging should not rethrow error in onFailure callback ([#923](https://github.com/googleapis/java-logging/issues/923)) ([1adf867](https://github.com/googleapis/java-logging/commit/1adf86722361ce946c733de87cb217fa2f65bfd5)) +* Async logging should not rethrow error in onFailure callback correction ([#925](https://github.com/googleapis/java-logging/issues/925)) ([da92518](https://github.com/googleapis/java-logging/commit/da925189d808833f1b7cc7a1934bcf66f51663be)) + ### [3.7.3](https://github.com/googleapis/java-logging/compare/v3.7.2...v3.7.3) (2022-03-29) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index b3bc1ef82..38b4c3354 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.7.4-SNAPSHOT + 3.7.4 pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.7.4-SNAPSHOT + 3.7.4 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.4-SNAPSHOT + 0.96.4 com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.4-SNAPSHOT + 0.96.4 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 272522ece..367302727 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.7.4-SNAPSHOT + 3.7.4 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.7.4-SNAPSHOT + 3.7.4 google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 46d0fbc28..5d06367d6 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.4-SNAPSHOT + 0.96.4 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.4-SNAPSHOT + 3.7.4 diff --git a/pom.xml b/pom.xml index 5a722a6da..544e39e82 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.7.4-SNAPSHOT + 3.7.4 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.4-SNAPSHOT + 0.96.4 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.4-SNAPSHOT + 0.96.4 com.google.cloud google-cloud-logging - 3.7.4-SNAPSHOT + 3.7.4 diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index fcfea8b59..082d86bc8 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.4-SNAPSHOT + 0.96.4 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.4-SNAPSHOT + 3.7.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 025fa175d..4874048d7 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.7.4-SNAPSHOT + 3.7.4 diff --git a/versions.txt b/versions.txt index fff1c787f..7e9ffe8a1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.7.3:3.7.4-SNAPSHOT -grpc-google-cloud-logging-v2:0.96.3:0.96.4-SNAPSHOT -proto-google-cloud-logging-v2:0.96.3:0.96.4-SNAPSHOT +google-cloud-logging:3.7.4:3.7.4 +grpc-google-cloud-logging-v2:0.96.4:0.96.4 +proto-google-cloud-logging-v2:0.96.4:0.96.4