fix: delegate to all parent logging options (#2500)

Support setting logDestinationProjectId. Fixes: #2496.
GoogleCloudPlatform · Dec 26, 2023 · cd706b7 · cd706b7
1 parent 8ed8ecd
commit cd706b7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/spring-cloud-gcp-logging/src/main/java/com/google/cloud/spring/logging/LoggingAppender.java b/spring-cloud-gcp-logging/src/main/java/com/google/cloud/spring/logging/LoggingAppender.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.spring.logging;
 
-import com.google.auth.Credentials;
 import com.google.cloud.logging.LoggingOptions;
 import com.google.cloud.spring.core.UserAgentHeaderProvider;
 
@@ -38,13 +37,7 @@ public class LoggingAppender extends com.google.cloud.logging.logback.LoggingApp
   protected LoggingOptions getLoggingOptions() {
 
     if (loggingOptions == null) {
-      LoggingOptions.Builder loggingOptionsBuilder = LoggingOptions.newBuilder();
-
-      // only credentials are set in the options of the parent class
-      Credentials credentials = super.getLoggingOptions().getCredentials();
-      if (credentials != null) {
-        loggingOptionsBuilder.setCredentials(credentials);
-      }
+      LoggingOptions.Builder loggingOptionsBuilder = super.getLoggingOptions().toBuilder();
 
       // set User-Agent
       loggingOptionsBuilder.setHeaderProvider(new UserAgentHeaderProvider(this.getClass()));

diff --git a/...cloud-gcp-logging/src/test/java/com/google/cloud/spring/logging/LoggingAppenderTests.java b/...cloud-gcp-logging/src/test/java/com/google/cloud/spring/logging/LoggingAppenderTests.java
@@ -38,4 +38,17 @@ void testGetLoggingOptions() {
         .contains("spring-cloud-gcp-logging")
         .contains("Spring");
   }
+
+  @Test
+  void testSetLogDestinationProjectId() {
+    LoggingAppender loggingAppender = new LoggingAppender();
+    loggingAppender.setCredentialsFile("src/test/resources/fake-project-key.json");
+    loggingAppender.setLogDestinationProjectId("my-log-destination-project");
+    assertThat(loggingAppender.getLoggingOptions().getCredentials()).isNotNull();
+    assertThat(loggingAppender.getLoggingOptions().getProjectId()).isEqualTo("my-log-destination-project");
+    assertThat(loggingAppender.getLoggingOptions().getUserAgent())
+        .isNotNull()
+        .contains("spring-cloud-gcp-logging")
+        .contains("Spring");
+  }
 }