Skip to content

Commit b5c9000

Browse files
Merge pull request #2403 from newrelic/azure_null_checks
A couple of quick null checks for completeness sake.
2 parents a267b8c + cacb4fc commit b5c9000

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

instrumentation/azure-messaging-servicebus-7.15.0/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient_Instrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public IterableStream<ServiceBusReceivedMessage> receiveMessages(int maxMessages
4545
ServiceBusReceivedMessage firstMessage = ServiceBusUtil.getFirstMessage(result); // can't be done inside the weaved class
4646
if (firstMessage != null) {
4747
Headers headers = new HeadersWrapper(firstMessage.getApplicationProperties());
48-
NewRelic.getAgent().getTransaction().acceptDistributedTraceHeaders(TransportType.ServiceBus, headers);
48+
if (NewRelic.getAgent().getTransaction() != null) {
49+
NewRelic.getAgent().getTransaction().acceptDistributedTraceHeaders(TransportType.ServiceBus, headers);
50+
}
4951
}
5052

5153
return result;

instrumentation/azure-messaging-servicebus-7.15.0/src/main/java/com/newrelic/utils/ServiceBusUtil.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ public static Flux<ServiceBusReceivedMessage> registerFluxLifecycleHooks(Flux<Se
6060
.doOnNext(message -> {
6161
token.linkAndExpire();
6262
Headers headers = new HeadersWrapper(message.getApplicationProperties());
63-
segment.getTransaction().acceptDistributedTraceHeaders(TransportType.ServiceBus, headers);
63+
if (segment.getTransaction() != null) {
64+
segment.getTransaction().acceptDistributedTraceHeaders(TransportType.ServiceBus, headers);
65+
}
6466
})
6567
.doFinally(signalType -> {
6668
segment.end();

0 commit comments

Comments
 (0)