Skip to content

Fix RocketMQ context propagation for batch messages in version 5.3.4+ #15559

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
Arunodoy18 wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −4
Open

Fix RocketMQ context propagation for batch messages in version 5.3.4+ #15559

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
7a32081
Fix RocketMQ context propagation for batch messages in version 5.3.4+
Arunodoy18 Dec 4, 2025
f307c07
Merge branch 'main' into fix-rocketmq-batch-context-propagation
Arunodoy18 Dec 7, 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
3 changes: 0 additions & 3 deletions ...java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,6 @@ void testRocketmqProduceAndConsume() throws Exception {

@Test
void testRocketmqProduceAndBatchConsume() throws Exception {
// context propagation doesn't work for batch messages in 5.3.4
Assumptions.assumeFalse(Boolean.getBoolean("testLatestDeps"));

consumer.setConsumeMessageBatchMaxSize(2);
// This test assumes that messages are sent and received as a batch. Occasionally it happens
// that the messages are not received as a batch, but one by one. This doesn't match what the
Expand Down
8 changes: 7 additions & 1 deletion ...telemetry/javaagent/instrumentation/rocketmqclient/v5_0/ReceiveSpanFinishingCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,14 @@ public void onSuccess(ReceiveMessageResult receiveMessageResult) {
null,
timer.startTime(),
timer.now());
// For batch messages, each message should have its own context that properly
Copy link
Contributor

@laurit laurit Dec 7, 2025

Choose a reason for hiding this comment

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

As pointed out in #15523 (comment) this won't work.

// links to the individual producer spans through context propagation
for (MessageView messageView : messageViews) {
VirtualFieldStore.setContextByMessage(messageView, context);
// Extract context from individual message properties (trace headers)
Context messageContext = RocketMqSingletons.propagators()
.getTextMapPropagator()
.extract(context, messageView, MessageMapGetter.INSTANCE);
VirtualFieldStore.setContextByMessage(messageView, messageContext);
}
}
}
Expand Down
Loading