Skip to content
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

Fix NPE in RocketMQ instrumentation #4901

Merged
merged 4 commits into from
Dec 16, 2021
Merged

Fix NPE in RocketMQ instrumentation #4901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa4c493
Fix NPE in RocketMQ instrumentation
Dec 14, 2021
e0c0fd8
fix tests
Dec 14, 2021
1e51aa9
add exception
Dec 15, 2021
cd6d4c9
Changed the condition a bit
Dec 15, 2021
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
4 changes: 3 additions & 1 deletion ...in/java/io/opentelemetry/instrumentation/rocketmq/RockerMqConsumerAttributeExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ protected String conversationId(MessageExt request) {
return null;
}

@Nullable
@Override
protected Long messagePayloadSize(MessageExt request) {
return (long) request.getBody().length;
byte[] body = request.getBody();
return body == null ? null : (long) body.length;
}

@Nullable
Expand Down
9 changes: 7 additions & 2 deletions ...in/java/io/opentelemetry/instrumentation/rocketmq/RockerMqProducerAttributeExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable;
import org.apache.rocketmq.client.hook.SendMessageContext;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.common.message.Message;

class RockerMqProducerAttributeExtractor
extends MessagingAttributesExtractor<SendMessageContext, Void> {
Expand All @@ -28,9 +30,11 @@ protected String destinationKind(SendMessageContext sendMessageContext) {
return SemanticAttributes.MessagingDestinationKindValues.TOPIC;
}

@Nullable
@Override
protected String destination(SendMessageContext sendMessageContext) {
return sendMessageContext.getMessage().getTopic();
Message message = sendMessageContext.getMessage();
return message == null ? null : message.getTopic();
}

@Override
Expand Down Expand Up @@ -77,6 +81,7 @@ protected Long messagePayloadCompressedSize(SendMessageContext sendMessageContex
@Nullable
@Override
protected String messageId(SendMessageContext request, @Nullable Void unused) {
return request.getSendResult().getMsgId();
SendResult sendResult = request.getSendResult();
return sendResult == null ? null : sendResult.getMsgId();
}
}
4 changes: 3 additions & 1 deletion ...pentelemetry/instrumentation/rocketmq/RockerMqProducerExperimentalAttributeExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ class RockerMqProducerExperimentalAttributeExtractor

@Override
public void onStart(AttributesBuilder attributes, SendMessageContext request) {
set(attributes, MESSAGING_ROCKETMQ_TAGS, request.getMessage().getTags());
if (request.getMessage() != null) {
set(attributes, MESSAGING_ROCKETMQ_TAGS, request.getMessage().getTags());
}
set(attributes, MESSAGING_ROCKETMQ_BROKER_ADDRESS, request.getBrokerAddr());
}

Expand Down
5 changes: 3 additions & 2 deletions ...y/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ public void sendMessageAfter(SendMessageContext context) {
if (context == null) {
return;
}
if (context.getMqTraceContext() instanceof Context) {
if (context.getMqTraceContext() instanceof Context
&& (context.getSendResult() != null || context.getException() != null)) {
Context otelContext = (Context) context.getMqTraceContext();
instrumenter.end(otelContext, context, null, null);
instrumenter.end(otelContext, context, null, context.getException());
}
}
}