USACE · MikeNeilson · Apr 8, 2026 · Apr 9, 2026 · Apr 9, 2026 · Apr 10, 2026
diff --git a/Dockerfile b/Dockerfile
@@ -30,10 +30,25 @@ RUN mkdir /download && \
     tar xzf apache-tomcat-*tar.gz && \
     mv apache-tomcat-9.0.112 /usr/local/tomcat/ && \
     cd / && \
-    rm -rf /download && \
     rm -rf /usr/local/tomcat/webapps/* && \
     mkdir /usr/local/tomcat/webapps/ROOT && \
-    echo "<html><body>Nothing to see here</body></html>" > /usr/local/tomcat/webapps/ROOT/index.html
+    echo "<html><body>Nothing to see here</body></html>" > /usr/local/tomcat/webapps/ROOT/index.html && \
+    mkdir -p /usr/local/tomecat/conf/Catalina/localhost
+# Now replace the Tomcat logging with logback
+# NOTE: I have review this method in jd-gui and do not see anything malicious, packages are isolated to avoid issues
+# with other code.
+# Additionally, when we are not also accounting for some legacy systems, we will likely shift to
+# Jetty to simplify the deployment process, making this subtitution unnecessary.
+RUN cd /download && \
+    wget https://repo1.maven.org/maven2/com/github/tomcat-slf4j-logback/tomcat9-slf4j-logback/9.0.115/tomcat9-slf4j-logback-9.0.115.jar && \
+    echo "cb463fb246fbb326d91b04a7280474f2b722b11cc9d3d7f6c3dbbefcff2c07e055f479d436ab785668d6fa90d0bfd325c86c4fa3a9ad9521159a2a3114916d91 *tomcat9-slf4j-logback-9.0.115.jar" > checksum.logback.txt && \
+    sha512sum -c checksum.logback.txt
+RUN cd /download && \
+    cp tomcat9-slf4j-logback-9.0.115.jar /usr/local/tomcat/bin/tomcat-juli.jar && \
+    rm /usr/local/tomcat/conf/logging.properties && \
+    rm -rf /download
+
+
 CMD ["/usr/local/tomcat/bin/catalina.sh","run"]
 
 FROM tomcat_base AS api
@@ -43,6 +58,9 @@ COPY --from=builder /builddir/cwms-data-api/build/docker/context.xml /usr/local/
 COPY --from=builder /builddir/cwms-data-api/build/docker/server.xml /usr/local/tomcat/conf
 COPY --from=builder /builddir/cwms-data-api/build/docker/setenv.sh /usr/local/tomcat/bin
 COPY --from=builder /builddir/cwms-data-api/build/docker/libs/ /usr/local/tomcat/lib
+COPY --from=builder /builddir/cwms-data-api/build/docker/logback.xml /logback.xml
+COPY --from=builder /builddir/cwms-data-api/build/docker/logback-juli.xml /logback-juli.xml
+COPY --from=builder /builddir/cwms-data-api/build/docker/app-context.xml /usr/local/tomcat/conf/Catalina/localhost/cwms-data.xml
 
 ENV CDA_JDBC_DRIVER="oracle.jdbc.driver.OracleDriver"
 ENV CDA_JDBC_URL=""

diff --git a/cda-gui/package-lock.json b/cda-gui/package-lock.json
diff --git a/cwms-data-api/build.gradle b/cwms-data-api/build.gradle
@@ -21,14 +21,15 @@ configurations {
 }
 
 configurations.implementation {
-    exclude group: 'com.oracle.database.jdbc'
+    exclude group: 'com.oracle.database.jdbc'    
 }
 
 configurations.all {
     exclude group: 'dom4j'
     exclude group: 'org.apache.xmlbeans'
     exclude group: 'org.apache.poi'
     exclude group: 'org.bouncycastle'
+    exclude group: 'org.apache.tomcat', module: 'tomcat-juli'
 }
 
 dependencies {
@@ -64,7 +65,7 @@ dependencies {
     }
     implementation(files("$buildDir/libs/${project.name}-${project.version}-codegen-shadow.jar"))
 
-    implementation(libs.slf4j)
+    compileOnly(libs.slf4j)
 
     implementation(libs.monolith) {
         //exclude group: "org.python", module: "jython-standalone"
@@ -75,7 +76,8 @@ dependencies {
     implementation(libs.google.flogger.api)
     implementation(libs.google.findbugs)
     implementation(libs.google.errorProne)
-    runtimeOnly(libs.google.flogger.backend)
+    implementation(project(":flogger-cda-context"))
+    runtimeOnly(libs.google.flogger.system.backend)
 
     implementation(libs.nucleus.data) {
         exclude group: "org.jdom"
@@ -153,16 +155,22 @@ dependencies {
 
     tomcatLibs(libs.bundles.tomcat.embedded)
     tomcatLibs(libs.bundles.tomcat.support)
+
+    implementation(libs.slf4j)
+    testImplementation(libs.slf4j.jul)
     tomcatLibs(libs.google.flogger.api)
-    tomcatLibs(libs.google.flogger.backend)
+    tomcatLibs(libs.google.flogger.system.backend)
+    baseLibs(libs.google.flogger.slf4j.backend) {
+        exclude group: "org.slf4j"
+    }
+
+    baseLibs(libs.ch.qos.logback)
 
     testImplementation(libs.bundles.testcontainers)
 
     testImplementation(libs.apache.commons.csv)
     testImplementation(libs.cwms.tomcat.auth)
-    testImplementation(libs.apache.freemarker)
-
-    testRuntimeOnly("org.slf4j:slf4j-jdk14:2.0.16")    
+    testImplementation(libs.apache.freemarker)   
 
     webjars(project(":cda-gui"))
 
@@ -186,7 +194,10 @@ task extractWebJars(type: Copy) {
 war {
     dependsOn extractWebJars
     from "$buildDir/extra"
-    from "src/resources/"
+    from "src/resources/"   
+    // classpath = classpath.filter { file ->
+    //     !file.name.contains("slf4j-api")
+    // }
 
     manifest {
         attributes "build-version": project.version
@@ -256,6 +267,7 @@ task run(type: JavaExec) {
     args "$buildDir/tomcat", "$buildDir/libs/${project.name}-${project.version}.war", context
     jvmArgs += "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
     jvmArgs += "-Djava.util.logging.config.file=$projectDir/logging.properties"
+    jvmArgs += "-Dlogback.configurationFile=${projectDir}/logback.xml"
     jvmArgs += "-DTOMCAT_RESOURCES=$buildDir/tomcat/conf/context.xml"
     jvmArgs += "-Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource"
     jvmArgs += "-Dcatalina.base=$buildDir/tomcat"
@@ -285,6 +297,7 @@ task integrationTests(type: Test) {
     jvmArgs += "-DwarContext=/cwms-data"
     jvmArgs += "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
     jvmArgs += "-Djava.util.logging.config.file=$projectDir/logging.properties"
+    jvmArgs += "-Dlogback.configurationFile=${projectDir}/logback.xml"
     jvmArgs += "-Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource"
     jvmArgs += "-Dcwms.dataapi.access.provider=MultipleAccessManager"
     jvmArgs += "-Dcwms.dataapi.access.providers=KeyAccessManager,CwmsAccessManager"
@@ -302,6 +315,7 @@ task prepareDockerBuild(type: Copy, dependsOn: war) {
 
     from(configurations.baseLibs) {
         into "libs"
+        //exclude "**/logback*"
     }
 
     from(sourceSets.test.resources) {

diff --git a/cwms-data-api/logback.xml b/cwms-data-api/logback.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
+<configuration>
+    <import class="ch.qos.logback.classic.encoder.JsonEncoder"/>
+    <import class="ch.qos.logback.core.ConsoleAppender"/>
+    <import class="ch.qos.logback.core.FileAppender"/>
+    <variable name="LOG_LEVEL" value="${LOG_LEVEL:-FINE}"/>
+    <contextName>CWMS-Data-API</contextName>
+    <appender name="STDERR" class="ConsoleAppender">
+        <encoder class="JsonEncoder"/>
+        <target>System.err</target>
+    </appender>
+
+    <appender name="FILE" class="FileAppender">
+        <encoder class="JsonEncoder"/>
+        <append>false</append>
+        <immediateFlush>true</immediateFlush>
+        <file>build/cda.log</file>
+    </appender>
+
+    <logger name="cwms.cda" level="${LOG_LEVEL}"/>
+    <logger name="fixtures" level="${LOG_LEVEL}"/>
+    <logger name="org.apache" level="ERROR"/>
+
+    <root level="INFO">
+        <appender-ref ref="STDERR"/>
+        <appender-ref ref="FILE"/>
+    </root>
+</configuration>
diff --git a/cwms-data-api/src/docker/app-context.xml b/cwms-data-api/src/docker/app-context.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiResourceLocking="true" delegate="true">
+    <ResourceLink
+        name="jdbc/CWMS3"
+        global="jdbc/CWMS3"
+        type="javax.sql.DataSource"
+    />   
+</Context>
diff --git a/cwms-data-api/src/docker/logback-juli.xml b/cwms-data-api/src/docker/logback-juli.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
+<configuration debug="true">
+    <import class="org.apache.juli.logging.ch.qos.logback.classic.encoder.JsonEncoder"/>
+    <import class="org.apache.juli.logging.ch.qos.logback.core.ConsoleAppender"/>
+
+    <variable name="LOG_LEVEL" value="${LOG_LEVEL:-INFO}"/>
+    <contextName>CWMS-Data-API</contextName>
+    <appender name="STDERR" class="ConsoleAppender">
+        <encoder class="JsonEncoder"/>
+        <target>System.err</target>
+    </appender>    
+
+    <logger name="cwms.cda" level="${LOG_LEVEL}"/>
+    <logger name="org.apache" level="ERROR"/>
+
+    <logger name="org.apache.catalina" level="INFO" additivity="false">
+        <appender-ref ref="STDERR" />
+    </logger>
+
+    <logger name="org.apache.catalina.core.ContainerBase.[Catalina]" level="INFO" additivity="false">
+        <appender-ref ref="STDERR" />
+    </logger>
+
+
+    <root level="INFO">
+        <appender-ref ref="STDERR"/>
+    </root>   
+</configuration>
diff --git a/cwms-data-api/src/docker/logback.xml b/cwms-data-api/src/docker/logback.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
+<configuration debug="true">
+    <import class="ch.qos.logback.classic.encoder.JsonEncoder"/>
+    <import class="ch.qos.logback.core.ConsoleAppender"/>
+
+    <variable name="LOG_LEVEL" value="${LOG_LEVEL:-INFO}"/>
+    <contextName>CWMS-Data-API</contextName>
+    <appender name="STDERR" class="ConsoleAppender">
+        <encoder class="JsonEncoder"/>
+        <target>System.err</target>
+    </appender>    
+
+    <logger name="cwms.cda" level="${LOG_LEVEL}"/>
+    <logger name="org.apache" level="ERROR"/>
+
+    <logger name="org.apache.catalina" level="INFO" additivity="false">
+        <appender-ref ref="STDERR" />
+    </logger>
+
+    <logger name="org.apache.catalina.core.ContainerBase.[Catalina]" level="INFO" additivity="false">
+        <appender-ref ref="STDERR" />
+    </logger>
+
+
+    <root level="INFO">
+        <appender-ref ref="STDERR"/>
+    </root>   
+</configuration>
diff --git a/cwms-data-api/src/docker/setenv.sh b/cwms-data-api/src/docker/setenv.sh
@@ -1 +1,5 @@
-export CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource"
+CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource"
+CATALINA_OPTS="$CATALINA_OPTS -Djuli-logback.configurationFile=/logback-juli.xml -Djuli-logback.ContextSelector=JNDI"
+CATALINA_OPTS="$CATALINA_OPTS -Dlogback.configurationFile=/logback.xml -Dlogback.ContextSelector=JNDI"
+
+export CATALINA_OPTS
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/RatingMetadataDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/RatingMetadataDao.java
@@ -63,6 +63,8 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import com.google.common.flogger.FluentLogger;
+import com.google.common.flogger.context.ScopedLoggingContexts;
+
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -190,9 +192,12 @@ public Map<RatingSpec, Set<AbstractRatingMetadata>> getRatingsForIds(
             boolean useParallel = true;
             Stream<Map<RatingSpec, Set<AbstractRatingMetadata>>> mapStream;
             if (useParallel) {
+                // get current context to pass in to Thread. Otherwise any log message would not include the Trace ID.
+                final var loggingContext = ScopedLoggingContexts.newContext();
                 mapStream = ratingIds.stream()
                         .map(ratingId -> CompletableFuture.supplyAsync(() ->
-                                retrieveRatings(office, ratingId, start, end), executor))
+                                loggingContext.callUnchecked(() -> retrieveRatings(office, ratingId, start, end))
+                                , executor))
                         .collect(Collectors.toList())
                         .stream()
                         .map(CompletableFuture::join);
@@ -221,7 +226,6 @@ public Map<RatingSpec, Set<AbstractRatingMetadata>> getRatingsForIds(
     public Map<RatingSpec, Set<AbstractRatingMetadata>> retrieveRatings(
             String office, String templateIdMask, ZonedDateTime start, ZonedDateTime end) {
         Map<RatingSpec,Set<AbstractRatingMetadata>> retVal = new LinkedHashMap<>();
-
         try (final Timer.Context ignored = markAndTime("retrieveRatings")) {
             RatingSpecDao ratingSpecDao = new RatingSpecDao(dsl);
             Optional<RatingSpec> spec = ratingSpecDao.retrieveRatingSpec(office, templateIdMask);