Skip to content

Do not break the JMS instrumentation when unable to access a property #10255

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

Open
amarziali wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not break the JMS instrumentation when unable to access a property #10255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e2ddb1
Do not break the JMS instrumentation when unable to access a property
amarziali Dec 19, 2025
a956837
Merge branch 'master' into andrea.marziali/jms-npe
amarziali Dec 19, 2025
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
10 changes: 9 additions & 1 deletion .../javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MessageExtractAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@ public void forEachKey(Message carrier, AgentPropagation.KeyClassifier classifie
while (enumeration.hasMoreElements()) {
String key = ((String) enumeration.nextElement());
String lowerCaseKey = cache.computeIfAbsent(key, KEY_MAPPER);
Object value = carrier.getObjectProperty(key);
Object value = null;
try {
value = carrier.getObjectProperty(key);
} catch (Throwable t) {
// log and ignore if we cannot access this property but don't break the instrumentation
if (log.isDebugEnabled()) {
log.debug("Error accessing message property {}", key, t);
}
}
if (value instanceof String && !classifier.accept(lowerCaseKey, (String) value)) {
return;
}
Expand Down