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
Merged

Adding Logging for JMS ITERATION Scope #10632

Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 5 additions & 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 @@ -39,10 +39,14 @@
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class JMSMessageConsumerInstrumentation
implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
private final String namespace;
private static final Logger log =
LoggerFactory.getLogger(JMSMessageConsumerInstrumentation.class);

public JMSMessageConsumerInstrumentation(String namespace) {
this.namespace = namespace;
Expand Down Expand Up @@ -164,6 +168,7 @@ public static void afterReceive(
CONSUMER_DECORATE.onError(span, throwable);

activateNext(span); // scope is left open until next message or it times out
log.debug("Expecting the following `ITERATION` span to be finished {}", span);

SessionState sessionState = consumerState.getSessionState();
if (sessionState.isClientAcknowledge()) {
Expand Down
28 changes: 19 additions & 9 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 @@ -238,15 +239,24 @@ public void closePrevious(final boolean finishSpan) {

// close any immediately previous iteration scope
final ContinuableScope top = scopeStack.top;
if (top != null && top.source() == ITERATION) {
Copy link
Copy Markdown
Contributor

@ygree ygree Feb 18, 2026

Choose a reason for hiding this comment

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

To minimize the change scope, you could keep this as is and add else if (top!=null) instead.

if (iterationKeepAlive > 0) { // skip depth check because cancelling is cheap
cancelRootIterationScopeCleanup(scopeStack, top);
}
top.close();
scopeStack.cleanup();
AgentSpan span = top.span();
if (finishSpan && span != null) {
span.finishWithEndToEnd();
if (top != null) {
if (top.source() == ITERATION) {
if (iterationKeepAlive > 0) { // skip depth check because cancelling is cheap
cancelRootIterationScopeCleanup(scopeStack, top);
}
top.close();
scopeStack.cleanup();
AgentSpan span = top.span();
if (finishSpan && span != null) {
span.finishWithEndToEnd();
}
} else {
log.debug(
SEND_TELEMETRY,
"Scope found at top of stack has source {} when we expect {}. Current span at the top of the stack {}.",
top,
Copy link
Copy Markdown
Contributor

@ygree ygree Feb 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Instead of the source, it will output the scope and context. Did you mean to write "top.source()" instead?

ITERATION,
top.span());
}
}
}
Expand Down