fix NPE in the Spring Integration *InboundChannelAdapter (Azure#36927)

* fix NPE
* add debug logs and update changelog

Author: saragluna

sdk/spring/CHANGELOG.md

@@ -8,6 +8,18 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
 #### Bugs Fixed
 - Fix the issue that prevented the `disableChallengeResourceVerification` property of the AKV `SecretClient` to be configured [#36628](https://github.com/Azure/azure-sdk-for-java/pull/36628).
 
+### Spring Integration Azure Event Hubs
+This section includes changes in the `spring-integration-azure-eventhubs` module.
+
+#### Bugs Fixed
+- Fix NPE in the error handler of `EventHubsInboundChannelAdapter` when `instrumentationManager` or `instrumentationId` is null [#36927](https://github.com/Azure/azure-sdk-for-java/pull/36927).
+
+### Spring Integration Azure Service Bus
+This section includes changes in the `spring-integration-azure-servicebus` module.
+
+#### Bugs Fixed
+- Fix NPE in the error handler of `ServiceBusInboundChannelAdapter` when `instrumentationManager` or `instrumentationId` is null [#36927](https://github.com/Azure/azure-sdk-for-java/pull/36927).
+
 ## 5.5.0 (2023-08-28)
 - This release is compatible with Spring Boot 3.0.0-3.1.2. (Note: 3.1.x (x>2) should be supported, but they aren't tested with this release.)
 - This release is compatible with Spring Cloud 2022.0.0-2022.0.4. (Note: 2022.0.x (x>4) should be supported, but they aren't tested with this release.)

sdk/spring/spring-integration-azure-eventhubs/src/main/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapter.java

@@ -209,7 +209,8 @@ public void accept(ErrorContext errorContext) {
         }
 
         private void updateInstrumentation(ErrorContext errorContext) {
-            if (instrumentationManager == null) {
+            if (instrumentationManager == null || instrumentationId == null) {
+                LOGGER.debug("InstrumentationManager or instrumentationId is null, skip updateInstrumentation.");
                 return;
             }
 

sdk/spring/spring-integration-azure-servicebus/src/main/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapter.java

@@ -168,7 +168,8 @@ public void accept(ServiceBusErrorContext errorContext) {
         }
 
         private void updateInstrumentation(ServiceBusErrorContext errorContext) {
-            if (instrumentationManager == null) {
+            if (instrumentationManager == null || instrumentationId == null) {
+                LOGGER.debug("InstrumentationManager or instrumentationId is null, skip updateInstrumentation.");
                 return;
             }