From f81e3eb2e9813913fedda8ef2dc2932805e01510 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 18:52:17 +0000 Subject: [PATCH 1/5] chore(main): release 0.128.9-SNAPSHOT (#966) :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 7af8e6086..cf6396d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.129.8-alpha + 0.129.9-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 f6448b80f..3a5978b95 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.129.8-alpha + 0.129.9-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 2aa712042..8c3394e1b 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -108,7 +108,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.129.8-alpha"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.129.9-alpha-SNAPSHOT"; // {x-version-update-end} private static boolean instrumentationAdded = false; private static Object instrumentationLock = new Object(); diff --git a/versions.txt b/versions.txt index 97a858bc8..6ec3b0d9d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.129.8-alpha:0.129.8-alpha +google-cloud-logging-logback:0.129.8-alpha:0.129.9-alpha-SNAPSHOT From 6d41f9a3e274d78a9dfdc458feff9644206ee6b9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Jan 2023 01:40:03 +0100 Subject: [PATCH 2/5] deps: update dependency com.google.cloud:google-cloud-logging to v3.14.0 (#968) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update dependency com.google.cloud:google-cloud-logging to v3.14.0 * 🦉 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 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index da81efaa8..d3eea20b3 100644 --- a/README.md +++ b/README.md @@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-logging-logback - 0.129.7-alpha + 0.129.8-alpha ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging-logback:0.129.7-alpha' +implementation 'com.google.cloud:google-cloud-logging-logback:0.129.8-alpha' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.129.7-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.129.8-alpha" ``` ## Authentication diff --git a/pom.xml b/pom.xml index cf6396d8a..c905a1ccf 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.11 5.1.0 1.1.3 - 3.13.7 + 3.14.0 1.7.36 1.10.1 From 39008e5df23e985406ea56e51208e5f18d758916 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Jan 2023 01:40:36 +0100 Subject: [PATCH 3/5] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.129.8-alpha (#967) 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-logback to v0.129.8-alpha * 🦉 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 --- 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 bdf47ddca..7c321ba72 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.129.7-alpha + 0.129.8-alpha From 0d8a66683f3c4de12ca62b75bc7d77a849cedaf2 Mon Sep 17 00:00:00 2001 From: Haril Song Date: Thu, 5 Jan 2023 10:34:15 +0900 Subject: [PATCH 4/5] chore: clean up final keyword and javaDoc typo (#969) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: clean up unnecessary keyword and javaDoc typo * chore: javaDoc 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 --- .../cloud/logging/logback/LoggingAppender.java | 12 ++++++------ .../cloud/logging/logback/MDCEventEnhancer.java | 2 +- .../cloud/logging/logback/LoggingAppenderTest.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) 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 8c3394e1b..948009328 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -102,7 +102,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { private static final String TYPE = "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent"; private static final List DEFAULT_LOGGING_EVENT_ENHANCERS = - ImmutableList.of(new MDCEventEnhancer()); + ImmutableList.of(new MDCEventEnhancer()); public static final String JAVA_LOGBACK_LIBRARY_NAME = "java-logback"; // Using release-please annotations to update DEFAULT_INSTRUMENTATION_VERSION with latest version. // See @@ -111,7 +111,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.129.9-alpha-SNAPSHOT"; // {x-version-update-end} private static boolean instrumentationAdded = false; - private static Object instrumentationLock = new Object(); + private static final Object instrumentationLock = new Object(); private volatile Logging logging; private LoggingOptions loggingOptions; @@ -158,7 +158,7 @@ public void setLog(String log) { * Sets the name of the monitored resource (Optional). If not define the appender will try to * identify the resource type automatically. Currently support resource types include "gae_app", * "gce_instance", "k8s_container", "cloud_run_revision" and "cloud_function". If the appender - * fails to identify the resource type it will be set to "global". + * fails to identify the resource type, it will be set to "global". * *

Must be a one of the supported resource types. @@ -248,7 +248,7 @@ public void addLoggingEventEnhancer(String enhancerClassName) { /** * Returns the current value of the ingestion mode. * - *

The method is deprecated. Use appender configuration to setup the ingestion + *

The method is deprecated. Use appender configuration to set up the ingestion * * @return a {@link Synchronicity} value of the ingestion module. */ @@ -344,7 +344,7 @@ String getProjectId() { @Override protected void append(ILoggingEvent e) { - List entriesList = new ArrayList(); + List entriesList = new ArrayList<>(); entriesList.add(logEntryFor(e)); // Check if instrumentation was already added - if not, create a log entry with instrumentation // data @@ -531,7 +531,7 @@ private static Severity severityFor(Level level) { * The package-private helper method used to set the flag which indicates if instrumentation info * already written or not. * - * @returns The value of the flag before it was set. + * @return The value of the flag before it was set. */ static boolean setInstrumentationStatus(boolean value) { if (instrumentationAdded == value) return instrumentationAdded; diff --git a/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java b/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java index ae52a286a..3a0c0009e 100644 --- a/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java +++ b/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java @@ -30,7 +30,7 @@ final class MDCEventEnhancer implements LoggingEventEnhancer { @Override - public final void enhanceLogEntry(LogEntry.Builder builder, ILoggingEvent e) { + public void enhanceLogEntry(LogEntry.Builder builder, ILoggingEvent e) { for (Map.Entry entry : e.getMDCPropertyMap().entrySet()) { if (null != entry.getKey() && null != entry.getValue()) { builder.addLabel(entry.getKey(), entry.getValue()); 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 ac97cbc3f..6cd59f575 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -63,9 +63,9 @@ public class LoggingAppenderTest { private static final String OVERRIDED_PROJECT_ID = "some-project-id"; private static final String DUMMY_CRED_FILE_PATH = "src/test/java/com/google/cloud/logging/logback/dummy-credentials.json"; - private static Payload.JsonPayload JSON_PAYLOAD = + private static final Payload.JsonPayload JSON_PAYLOAD = Payload.JsonPayload.of(ImmutableMap.of("message", "this is a test")); - private static Payload.JsonPayload JSON_ERROR_PAYLOAD = + private static final Payload.JsonPayload JSON_ERROR_PAYLOAD = Payload.JsonPayload.of( ImmutableMap.of( "message", From 613272281bfc83203fcd08608ed5caeec6d3cfbd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:35:40 -0800 Subject: [PATCH 5/5] chore(main): release 0.128.9 (#970) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../com/google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 463a733a3..d1e2ad6ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog +## [0.128.9](https://github.com/googleapis/java-logging-logback/compare/v0.128.8...v0.128.9) (2023-01-05) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-logging to v3.14.0 ([#968](https://github.com/googleapis/java-logging-logback/issues/968)) ([6d41f9a](https://github.com/googleapis/java-logging-logback/commit/6d41f9a3e274d78a9dfdc458feff9644206ee6b9)) + ## [0.128.8](https://github.com/googleapis/java-logging-logback/compare/v0.128.7...v0.128.8) (2022-12-31) diff --git a/pom.xml b/pom.xml index c905a1ccf..2a42f5aa7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.129.9-alpha-SNAPSHOT + 0.129.9-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 7c321ba72..bdf47ddca 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.129.8-alpha + 0.129.7-alpha diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3a5978b95..1d8b23173 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.129.9-alpha-SNAPSHOT + 0.129.9-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 948009328..60fc0578b 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -108,7 +108,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.129.9-alpha-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.129.9-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 6ec3b0d9d..223efff40 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.129.8-alpha:0.129.9-alpha-SNAPSHOT +google-cloud-logging-logback:0.129.9-alpha:0.129.9-alpha