Logback working locally, normal logging in docker compose.

Author: MikeNeilson

cwms-data-api/build.gradle

@@ -78,9 +78,6 @@ dependencies {
     implementation(libs.google.errorProne)
     implementation(project(":flogger-cda-context"))
     runtimeOnly(libs.google.flogger.system.backend)
-    runtimeOnly(libs.google.flogger.slf4j.backend) {
-        exclude group: "org.slf4j"
-    }
 
     implementation(libs.nucleus.data) {
         exclude group: "org.jdom"
@@ -163,10 +160,10 @@ dependencies {
     testImplementation(libs.slf4j.jul)
     tomcatLibs(libs.google.flogger.api)
     tomcatLibs(libs.google.flogger.system.backend)
-    tomcatLibs(libs.google.flogger.slf4j.backend) {
+    baseLibs(libs.google.flogger.slf4j.backend) {
         exclude group: "org.slf4j"
     }
-    //./gr  testRuntimeOnly(libs.slf4j)
+    
     baseLibs(libs.ch.qos.logback)
 
     testImplementation(libs.bundles.testcontainers)

cwms-data-api/src/test/resources/tomcat/conf/context.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context cookies="true">
+<Context cookies="true" delegate="true">
     <Resource name="jdbc/CWMS3" auth="Container" type="javax.sql.DataSource"
               username="${CDA_JDBC_USERNAME}" password="${CDA_JDBC_PASSWORD}"
               url="${CDA_JDBC_URL}"

flogger-cda-context/src/main/java/cwms/cda/logging/CdaLoggingContext.java

@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.slf4j.MDC;
 
@@ -68,9 +69,11 @@ public LoggingContextCloseable install() {
 
             final var tags = this.getTags();
             if (tags != null) {
-                tags.asMap().forEach((key, entry) -> {
-                    MDC.put(key, String.join(",", entry.stream().map(Object::toString).toList()));
-                });
+                tags.asMap().forEach((key, entry) ->
+                    MDC.put(key, String.join(",", entry.stream()
+                                                       .map(Object::toString)
+                                                       .collect(Collectors.toList())))
+                );
             }
 
             // Just reset back the MDC map to whatever it was before we decided to muck with it.