From eabbb7885f151d92cb9d1c438c4edb1d70fbf3e8 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Thu, 13 Feb 2025 18:46:09 -0800 Subject: [PATCH 1/8] Doc: Suggest customers to not use this library if on cloud environments (#1434) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c77f62c4d..352cfa733 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,11 @@ Note that using the structured logging Json format you cannot control the log na The logs will be ingested into the project that hosts the environment where your application is running. The configuration `logDestinationProjectId` will be ignored. - +### Recommended way to ingest logs in Google Cloud managed environments +If your application is running on Google Cloud Environments such as Google Kubernetes Engine, App Engine flexible environment, and Cloud Run functions, it is recommended to use [logging agent](https://cloud.google.com/logging/docs/agent) +to send application logs to Cloud Logging. Logging agents send data written to a file, such as `stdout` or a file, as logs to Cloud Logging. Using logging agents and relying on logging files such as `stdout` and `stderr` will +ensure that application crashes don't break sending logs to your project. It will also reduce complex coding to explicitly handle buffering and retries using client libraries. For a detailed comparison of logging agents and +client libraries, see [Choosing an agent or client libraries](https://cloud.google.com/logging/docs/agent-or-library#choosing). ## Samples From 34a95398682235d87145280cd255498baacfd24b Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Mon, 17 Feb 2025 01:30:52 -0800 Subject: [PATCH 2/8] Fix: Fix Appender default flushlevel to be consistent with java-logging (#1441) * Fix: Fix Appender default flushlevel to be consistent with java-logging * fix easymock expectation failure --- README.md | 2 +- samples/pom.xml | 2 +- .../logging/logback/LoggingAppender.java | 6 +++--- .../logging/logback/LoggingAppenderTest.java | 19 +++++++------------ .../google/cloud/logging/logback/logback.xml | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 352cfa733..de2fab9b8 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ See [Logback filters](https://logback.qos.ch/manual/filters.html#thresholdFilter application.log - + WARN diff --git a/samples/pom.xml b/samples/pom.xml index 6e0c15d5d..20c2f8317 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -13,7 +13,7 @@ com.google.cloud.samples 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 30bfdfee4..079956fd7 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -62,7 +62,7 @@ * <!-- Optional: defaults to {@code "java.log"} --> * <log>application.log</log> * - * <!-- Optional: defaults to {@code "ERROR"} --> + * <!-- Optional: defaults to {@code "OFF"} --> * <flushLevel>WARN</flushLevel> * * <!-- Optional: defaults to {@code ASYNC} --> @@ -150,7 +150,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { /** * Sets a threshold for log severity level to flush all log entries that were batched so far. * - *

Defaults to Error. + *

Defaults to OFF. * * @param flushLevel Logback log level */ @@ -298,7 +298,7 @@ void setupMonitoredResource(MonitoredResource monitoredResource) { } private Level getFlushLevel() { - return (flushLevel != null) ? flushLevel : Level.ERROR; + return (flushLevel != null) ? flushLevel : Level.OFF; } private String getLogName() { 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 6cd59f575..9632cf330 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -193,9 +193,15 @@ public void testFlushLevelConfigSupportsFlushLevelOff() { assertThat(foundSeverity).isEqualTo(null); } + @Test + public void testDefaultFlushLevelOff() { + loggingAppender.start(); + Severity foundSeverity = logging.getFlushSeverity(); + assertThat(foundSeverity).isEqualTo(null); + } + @Test public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -223,7 +229,6 @@ public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { @Test public void testPartialSuccessOverrideHasExpectedValue() { - logging.setFlushSeverity(Severity.ERROR); Capture logNameArg = Capture.newInstance(); Capture resourceArg = Capture.newInstance(); Capture partialSuccessArg = Capture.newInstance(); @@ -247,7 +252,6 @@ public void testPartialSuccessOverrideHasExpectedValue() { @Test public void testDefaultWriteOptionsHasExpectedDefaults() { - logging.setFlushSeverity(Severity.ERROR); Capture partialSuccessArg = Capture.newInstance(); logging.write( EasyMock.>anyObject(), @@ -266,7 +270,6 @@ public void testDefaultWriteOptionsHasExpectedDefaults() { @Test public void testMdcValuesAreConvertedToLabels() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -325,7 +328,6 @@ public void testMdcValuesAreConvertedToLabelsWithPassingNullValues() { MDC.put("mdc1", "value1"); MDC.put("mdc2", null); MDC.put("mdc3", "value3"); - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -351,7 +353,6 @@ public void testMdcValuesAreConvertedToLabelsWithPassingNullValues() { @Test public void testAddCustomLoggingEventEnhancers() { MDC.put("mdc1", "value1"); - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -375,7 +376,6 @@ public void testAddCustomLoggingEventEnhancers() { @Test public void testAddCustomLoggingEnhancer() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -398,7 +398,6 @@ public void testAddCustomLoggingEnhancer() { @Test @SuppressWarnings("deprecation") public void testFlush() { - logging.setFlushSeverity(Severity.ERROR); logging.write( EasyMock.>anyObject(), anyObject(WriteOption.class), @@ -419,7 +418,6 @@ public void testFlush() { @Test public void testAutoPopulationEnabled() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedLogEntries = Capture.newInstance(); EasyMock.expect( logging.populateMetadata( @@ -458,7 +456,6 @@ public void testAutoPopulationEnabled() { @Test public void testRedirectToStdoutEnabled() { - logging.setFlushSeverity(Severity.ERROR); EasyMock.expect( logging.populateMetadata( EasyMock.>anyObject(), @@ -503,7 +500,6 @@ public void testRedirectToStdoutDisabled() { public void testFDiagnosticInfoAdded() { LoggingAppender.setInstrumentationStatus(false); Capture> capturedArgument = Capture.newInstance(); - logging.setFlushSeverity(Severity.ERROR); logging.write( capture(capturedArgument), anyObject(WriteOption.class), @@ -547,7 +543,6 @@ public void testFDiagnosticInfoAdded() { @Test public void testFDiagnosticInfoNotAdded() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), diff --git a/src/test/java/com/google/cloud/logging/logback/logback.xml b/src/test/java/com/google/cloud/logging/logback/logback.xml index d0ec77843..66e86e4e7 100644 --- a/src/test/java/com/google/cloud/logging/logback/logback.xml +++ b/src/test/java/com/google/cloud/logging/logback/logback.xml @@ -8,7 +8,7 @@ application.log - + WARN From a1a8bd892b0f7e660224694ae721e28f9cdf63fd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 18:40:29 +0000 Subject: [PATCH 3/8] chore(main): release 0.132.4-alpha-SNAPSHOT (#1439) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../java/com/google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index df239c916..f704749e2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.132.3-alpha + 0.132.4-alpha-SNAPSHOT jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b81b0df12..5bcbb614e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.132.3-alpha + 0.132.4-alpha-SNAPSHOT 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 079956fd7..3d5816e89 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -122,7 +122,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { // See // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files // {x-version-update-start:google-cloud-logging-logback:current} - public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.3-alpha"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.4-alpha-SNAPSHOT"; // {x-version-update-end} private static boolean instrumentationAdded = false; private static final Object instrumentationLock = new Object(); diff --git a/versions.txt b/versions.txt index e2e3dd388..16ba475cb 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.132.3-alpha:0.132.3-alpha +google-cloud-logging-logback:0.132.3-alpha:0.132.4-alpha-SNAPSHOT From fd5204a32cc85b5513641f627d17c4a0b2fbd177 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 26 Feb 2025 19:38:18 +0100 Subject: [PATCH 4/8] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 (#1444) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index a48787484..7e8b94667 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0 with: bom-path: pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 8d3f11dc4..728751d04 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index f78bafd26..39151469c 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0" } env_vars: { diff --git a/pom.xml b/pom.xml index f704749e2..c33be4770 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.google.cloud sdk-platform-java-config - 3.43.0 + 3.44.0 From 0d882d814610efcc6c6af668e8f299fa667c84d2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 26 Feb 2025 19:48:13 +0100 Subject: [PATCH 5/8] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.132.3-alpha (#1440) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 2fbe7f2f9..cacb6770e 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.132.2-alpha + 0.132.3-alpha From 2f32d9bb814a8b648233ca091cd872f935b5dc6a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 26 Feb 2025 20:01:54 +0100 Subject: [PATCH 6/8] deps: update dependency com.google.cloud:google-cloud-logging to v3.21.4 (#1445) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c33be4770..16c740640 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.13 5.5.0 1.4.4 - 3.21.3 + 3.21.4 1.7.36 1.10.1 From 712503c3014c9dd9b1b64b7a19b4196fa2283683 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 26 Feb 2025 20:41:57 +0100 Subject: [PATCH 7/8] chore(deps): update dependency com.google.cloud:libraries-bom to v26.55.0 (#1442) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 37a279638..36d0d0cae 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.54.0 + 26.55.0 pom import From 805497b72f08fd8a9ca2454231a9853c773b3c5a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:55:42 -0500 Subject: [PATCH 8/8] chore(main): release 0.132.4-alpha (#1443) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Joe Wang --- CHANGELOG.md | 13 +++++++++++++ pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d60427c22..f81402201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # Changelog +## [0.132.4-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.3-alpha...v0.132.4-alpha) (2025-02-26) + + +### Bug Fixes + +* Fix Appender default flushlevel to be consistent with java-logging ([#1441](https://github.com/googleapis/java-logging-logback/issues/1441)) ([34a9539](https://github.com/googleapis/java-logging-logback/commit/34a95398682235d87145280cd255498baacfd24b)) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-logging to v3.21.4 ([#1445](https://github.com/googleapis/java-logging-logback/issues/1445)) ([2f32d9b](https://github.com/googleapis/java-logging-logback/commit/2f32d9bb814a8b648233ca091cd872f935b5dc6a)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#1444](https://github.com/googleapis/java-logging-logback/issues/1444)) ([fd5204a](https://github.com/googleapis/java-logging-logback/commit/fd5204a32cc85b5513641f627d17c4a0b2fbd177)) + ## [0.132.3-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.2-alpha...v0.132.3-alpha) (2025-02-13) diff --git a/pom.xml b/pom.xml index 16c740640..de0195735 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.132.4-alpha-SNAPSHOT + 0.132.4-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5bcbb614e..382175391 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.132.4-alpha-SNAPSHOT + 0.132.4-alpha 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 3d5816e89..e1f11526c 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -122,7 +122,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { // See // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files // {x-version-update-start:google-cloud-logging-logback:current} - public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.4-alpha-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.4-alpha"; // {x-version-update-end} private static boolean instrumentationAdded = false; private static final Object instrumentationLock = new Object(); diff --git a/versions.txt b/versions.txt index 16ba475cb..05f2ee119 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.132.3-alpha:0.132.4-alpha-SNAPSHOT +google-cloud-logging-logback:0.132.4-alpha:0.132.4-alpha