Skip to content

Commit 9771989

Browse files
authored
Review fixes for rocketmq-client-4.8:library (open-telemetry#17658)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 6c26c2c commit 9771989

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

instrumentation/rocketmq/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/MapSetter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.opentelemetry.context.propagation.TextMapSetter;
99
import javax.annotation.Nullable;
1010
import org.apache.rocketmq.client.hook.SendMessageContext;
11+
import org.apache.rocketmq.common.message.Message;
1112

1213
final class MapSetter implements TextMapSetter<SendMessageContext> {
1314

@@ -16,6 +17,10 @@ public void set(@Nullable SendMessageContext carrier, String key, String value)
1617
if (carrier == null) {
1718
return;
1819
}
19-
carrier.getMessage().getProperties().put(key, value);
20+
Message message = carrier.getMessage();
21+
if (message == null) {
22+
return;
23+
}
24+
message.getProperties().put(key, value);
2025
}
2126
}

instrumentation/rocketmq/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ public Long getBatchMessageCount(SendMessageContext request, @Nullable Void unus
8585

8686
@Override
8787
public List<String> getMessageHeader(SendMessageContext request, String name) {
88-
String value = request.getMessage().getProperties().get(name);
88+
Message message = request.getMessage();
89+
if (message == null) {
90+
return emptyList();
91+
}
92+
String value = message.getProperties().get(name);
8993
if (value != null) {
9094
return singletonList(value);
9195
}

0 commit comments

Comments
 (0)