Skip to content

Adding Logging for JMS ITERATION Scope #10632

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
gh-worker-dd-mergequeue-cf854d merged 7 commits into from
Feb 19, 2026
+24 −1
Merged

Adding Logging for JMS ITERATION Scope #10632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d58e8d7
adding logging
mhlidd Feb 18, 2026
1b7234d
adding wrapper to avoid bytebuddy issues
mhlidd Feb 18, 2026
4b360cc
PR comments
mhlidd Feb 18, 2026
a1992da
Merge branch 'master' into mhlidd/add_jms_logging
mhlidd Feb 18, 2026
38051a9
Merge branch 'master' into mhlidd/add_jms_logging
mhlidd Feb 19, 2026
c19cb84
adding log helper to helper class names
mhlidd Feb 19, 2026
2b2852b
moving logger out of nested class
mhlidd Feb 19, 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
13 changes: 13 additions & 0 deletions ...entation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package datadog.trace.instrumentation.jms;

import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class JMSLogger {
private static final Logger log = LoggerFactory.getLogger(JMSLogger.class);

public static void logIterationSpan(AgentSpan span) {
log.debug("Expecting the following `ITERATION` span to be finished {}", span);
}
}
1 change: 1 addition & 0 deletions ....1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ public static void afterReceive(
CONSUMER_DECORATE.onError(span, throwable);

activateNext(span); // scope is left open until next message or it times out
JMSLogger.logIterationSpan(span);

SessionState sessionState = consumerState.getSessionState();
if (sessionState.isClientAcknowledge()) {
Expand Down
3 changes: 2 additions & 1 deletion ...ion/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public String[] helperClassNames() {
packageName + ".MessageExtractAdapter",
packageName + ".MessageExtractAdapter$1",
packageName + ".MessageInjectAdapter",
packageName + ".DatadogMessageListener"
packageName + ".DatadogMessageListener",
packageName + ".JMSLogger"
};
}

Expand Down
8 changes: 8 additions & 0 deletions dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package datadog.trace.core.scopemanager;

import static datadog.trace.api.ConfigDefaults.DEFAULT_ASYNC_PROPAGATING;
import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan;
import static datadog.trace.core.scopemanager.ContinuableScope.CONTEXT;
Expand Down Expand Up @@ -248,6 +249,13 @@ public void closePrevious(final boolean finishSpan) {
if (finishSpan && span != null) {
span.finishWithEndToEnd();
}
} else if (top != null) {
log.debug(
SEND_TELEMETRY,
"Scope found at top of stack has source {} when we expect {}. Current span at the top of the stack {}.",
top.source(),
ITERATION,
top.span());
}
}

Expand Down