From 608a7c2b7e71312a2f3907539dcf32cb42f92948 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 09:10:09 +0000 Subject: [PATCH 1/8] chore: release 0.119.8-SNAPSHOT (#313) :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). --- pom.xml | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 086a9336d..7d91c2dfb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.119.7-alpha + 0.119.8-alpha-SNAPSHOT jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/versions.txt b/versions.txt index 48b0ec943..4dfb087d5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.119.7-alpha:0.119.7-alpha +google-cloud-logging-logback:0.119.7-alpha:0.119.8-alpha-SNAPSHOT From 4dc0cda23466eb58f61658495d02000ec2386176 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 26 Jan 2021 01:18:03 -0800 Subject: [PATCH 2/8] chore: regenerate README (#314) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-01-26 09:12:27,020 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-logging-logback/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-01-26 09:12:27,899 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/964fa9ae-a0c8-4c8b-98db-9b34a1344b57/targets - [ ] To automatically regenerate this PR, check this box. --- .github/readme/synth.metadata/synth.metadata | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 75246390c..52eeba019 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-logging-logback.git", - "sha": "dfe6c69665dcd8eadb073758d10017e22528848c" + "sha": "608a7c2b7e71312a2f3907539dcf32cb42f92948" } }, { diff --git a/README.md b/README.md index fe7addf37..36b315233 100644 --- a/README.md +++ b/README.md @@ -20,18 +20,18 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-logging-logback - 0.119.6-alpha + 0.119.7-alpha ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-logging-logback:0.119.6-alpha' +compile 'com.google.cloud:google-cloud-logging-logback:0.119.7-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.119.6-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.119.7-alpha" ``` ## Authentication From 2d740c7212c6e9cc21ff4ce4a68878c4a7dd93fd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 26 Jan 2021 19:05:34 +0100 Subject: [PATCH 3/8] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.119.7-alpha (#312) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4d7652e4e..b9b1c3c95 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-logging-logback - 0.119.6-alpha + 0.119.7-alpha diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 06c6affe8..c470b611f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.119.6-alpha + 0.119.7-alpha From dddbeaf35f6825bded644b4abff9da39cd2bdda2 Mon Sep 17 00:00:00 2001 From: Nicole Zhu <69952136+nicoleczhu@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:30:30 -0800 Subject: [PATCH 4/8] docs: fix broken cloud link (#315) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36b315233..05e4be338 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. -[product-docs]: https://cloud.google.com/logging-logback/docs/ +[product-docs]: https://cloud.google.com/logging/docs/setup/java#logback_appender_for [javadocs]: https://googleapis.dev/java/google-cloud-logging-logback/latest/index.html [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging-logback/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging-logback/java7.html From 521ba847dc3fee01d55f6345ddd55fb94c811ff0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 28 Jan 2021 10:40:02 -0800 Subject: [PATCH 5/8] chore: regenerate README (#317) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-01-28 17:32:48,626 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-logging-logback/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-01-28 17:32:49,535 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/f80c1ff4-5d53-4757-bbe5-e37b778b60b3/targets - [ ] To automatically regenerate this PR, check this box. --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 52eeba019..d7dc4224e 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-logging-logback.git", - "sha": "608a7c2b7e71312a2f3907539dcf32cb42f92948" + "sha": "dddbeaf35f6825bded644b4abff9da39cd2bdda2" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "3816b080296d4d52975079fd26c110dd26ba25af" + "sha": "57c23fa5705499a4181095ced81f0ee0933b64f6" } } ] diff --git a/README.md b/README.md index 05e4be338..36b315233 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. -[product-docs]: https://cloud.google.com/logging/docs/setup/java#logback_appender_for +[product-docs]: https://cloud.google.com/logging-logback/docs/ [javadocs]: https://googleapis.dev/java/google-cloud-logging-logback/latest/index.html [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging-logback/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging-logback/java7.html From c0e02ba4c5b91ccec39ec939d158dc7997ce1658 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 28 Jan 2021 21:21:22 -0800 Subject: [PATCH 6/8] build: migrate to flakybot (#318) --- .kokoro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 3344470b6..5ae1a2f34 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -110,8 +110,8 @@ bash .kokoro/coerce_logs.sh if [[ "${ENABLE_BUILD_COP}" == "true" ]] then - chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop - ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-logging-logback + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot + ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-logging-logback fi echo "exiting with ${RETURN_CODE}" From b7898d287bc96b879ebc0cac18cb4774eba95e0d Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 1 Feb 2021 11:43:04 -0800 Subject: [PATCH 7/8] feat: allow flush level OFF (#319) --- .../com/google/cloud/logging/logback/LoggingAppender.java | 5 ++++- .../google/cloud/logging/logback/LoggingAppenderTest.java | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java index 65ec051ec..3c7b4411c 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -211,7 +211,10 @@ public synchronized void start() { MonitoredResource resource = getMonitoredResource(getProjectId()); defaultWriteOptions = new WriteOption[] {WriteOption.logName(getLogName()), WriteOption.resource(resource)}; - getLogging().setFlushSeverity(severityFor(getFlushLevel())); + Level flushLevel = getFlushLevel(); + if (flushLevel != Level.OFF) { + getLogging().setFlushSeverity(severityFor(flushLevel)); + } loggingEnhancers = new ArrayList<>(); List resourceEnhancers = MonitoredResourceUtil.getResourceEnhancers(); loggingEnhancers.addAll(resourceEnhancers); diff --git a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java index ec85327ce..ab6cd8346 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -112,6 +112,14 @@ public void testFlushLevelConfigUpdatesLoggingFlushSeverity() { assertThat(capturedArgument.getValue().iterator().next()).isEqualTo(logEntry); } + @Test + public void testFlushLevelConfigSupportsFlushLevelOff() { + loggingAppender.setFlushLevel(Level.OFF); + loggingAppender.start(); + Severity foundSeverity = logging.getFlushSeverity(); + assertThat(foundSeverity).isEqualTo(null); + } + @Test public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { Map jsonContent = new HashMap<>(); From b6bc7291abdcd2bc7d3b808d8202d4c7098cc639 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 11:02:34 -0800 Subject: [PATCH 8/8] chore: release 0.120.0 (#320) --- CHANGELOG.md | 12 ++++++++++++ pom.xml | 2 +- versions.txt | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d98a6f1b..9a27dbd80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.120.0](https://www.github.com/googleapis/java-logging-logback/compare/v0.119.7...v0.120.0) (2021-02-01) + + +### Features + +* allow flush level OFF ([#319](https://www.github.com/googleapis/java-logging-logback/issues/319)) ([b7898d2](https://www.github.com/googleapis/java-logging-logback/commit/b7898d287bc96b879ebc0cac18cb4774eba95e0d)) + + +### Documentation + +* fix broken cloud link ([#315](https://www.github.com/googleapis/java-logging-logback/issues/315)) ([dddbeaf](https://www.github.com/googleapis/java-logging-logback/commit/dddbeaf35f6825bded644b4abff9da39cd2bdda2)) + ### [0.119.7](https://www.github.com/googleapis/java-logging-logback/compare/v0.119.6...v0.119.7) (2021-01-26) diff --git a/pom.xml b/pom.xml index 7d91c2dfb..3106ec334 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.119.8-alpha-SNAPSHOT + 0.120.0-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/versions.txt b/versions.txt index 4dfb087d5..2cfde4702 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.119.7-alpha:0.119.8-alpha-SNAPSHOT +google-cloud-logging-logback:0.120.0-alpha:0.120.0-alpha