Skip to content

Actually output the trace context in the docker image. #1884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MikeNeilson merged 2 commits into from
Aug 24, 2026
+21 −11
Merged

Actually output the trace context in the docker image. #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7081e
Actually output the trace context in the docker image.
MikeNeilson Aug 18, 2026
e640402
Include org.apache.cataline errors in OTEL wrapper.
MikeNeilson Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cwms-data-api/src/docker/logback-juli.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,30 @@
<configuration>
<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>
</appender>

<appender name="OTEL-STDERR" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">

@oskarhurst oskarhurst Aug 21, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct me if I am wrong but isn't OpenTelemetryAppender unshaded so it could never resolve and use the shaded classes provided by juli. Also isn't locgback-juli only run inside of tomcat would would never have any cda trace-ids to begin with so we only need the change in the normal logback file to add the traces ids?

@MikeNeilson MikeNeilson Aug 24, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For anyone reading this PR:

The tomcat-juli jar is removed from the image and replaced with tomcat9-slf4j-logback, see

cwms-data-api/Dockerfile

Line 43 in a2be20c

RUN cd /download && \
(roughly around there, may have moved a few lines by time of reading).

Thus, no issues with any shading as that jar deals with it for us.

<appender-ref ref="STDERR"/>
</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" />
<appender-ref ref="OTEL-STDERR" />
</logger>

<logger name="org.apache.catalina.core.ContainerBase.[Catalina]" level="INFO" additivity="false">
<appender-ref ref="STDERR" />
<appender-ref ref="OTEL-STDERR" />
</logger>

<root level="INFO">
<appender-ref ref="STDERR"/>
<appender-ref ref="OTEL-STDERR"/>
</root>
</configuration>
18 changes: 12 additions & 6 deletions cwms-data-api/src/docker/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,32 @@
<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>
</appender>

<appender name="OTEL-STDERR" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
<appender-ref ref="STDERR"/>
</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" />
<appender-ref ref="OTEL-STDERR" />
</logger>

<logger name="org.apache.catalina.core.ContainerBase.[Catalina]" level="INFO" additivity="false">
<appender-ref ref="STDERR" />
<appender-ref ref="OTEL-STDERR" />
</logger>


<root level="INFO">
<appender-ref ref="STDERR"/>
</root>
<appender-ref ref="OTEL-STDERR"/>
</root>
</configuration>
Loading