[BUG] Service bus custom endpoint address

[Anton0123]

Describe the bug
The custom endpoint address is not merged from the namespace properties to producer/processor/consumer properties. This results in the custom endpoint address being null.

To Reproduce
Configure a custom endpoint address for the namespace but not for individual consumers or producers. The custom endpoint address will not be used when sending or receiving messages.

Code Snippet
Example configuration

spring:
  cloud:
    function:
      definition: consume;supply
    stream:
      bindings:
        consume-in-0:
          destination: sbq-test-1
        supply-out-0:
          destination: sbq-test-2
      binders:
        servicebus-0:
          type: servicebus
          default-candidate: true
          environment:
            spring:
              cloud:
                azure:
                  client:
                    amqp:
                      transport-type: amqp_web_sockets
                  servicebus:
                    custom-endpoint-address: https://test.address.com:443
                    namespace: sb-test-1
                    credential:
                      client-id: ${CLIENT_ID}
                      client-secret: ${CLIENT_SECRET}
                    profile:
                      tenant-id: ${TENANT_ID}
      servicebus:
        bindings:
          consume-in-0:
            consumer:
              entity-type: queue
          supply-out-0:
            producer:
              entity-type: queue

Expected behavior
I expect the custom-endpoint-address to be used by the consumers/producers/processors.

Screenshots

Setup (please complete the following information):

• OS: Windows 11
• IDE: IntelliJ
• Library/Libraries: com.azure.spring:spring-cloud-azure-stream-binder-servicebus:5.19.0
• Java version: 22
• App Server/Environment: -
• Frameworks: Spring boot

Additional context
See com.azure.spring.messaging.servicebus.implementation.properties.merger, for example SenderPropertiesParentMerger. It does not map the custom endpoint address.
https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/SenderPropertiesParentMerger.java

[jairmyree]

@Anton0123 Thank you for reaching out. @Netyyyy could you please look into this issue?

[Netyyyy]

Sure, we will take a look

[Anton0123]

Sure, we will take a look

Thank you, this is currently a blocker for us going into production

[moarychan]

HI @Anton0123 , thanks for using Spring Cloud Azure!

You can use the below workaround first; the fix is coming and available in the next version:

Add below Java configuration:

@Configuration
class ServiceBusClientConfiguration {

    @Bean
    AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder> reproducerCustomizer() {
        return builder -> builder.customEndpointAddress("https://test.address.com:443");
    }

    @Bean
    ServiceBusProcessorFactoryCustomizer processorFactoryCustomizer(@Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultAzureCredential,
                                                                    AzureTokenCredentialResolver azureTokenCredentialResolver,
                                                                    ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder>> clientBuilderCustomizers) {
        return (processor -> {
            if (processor instanceof DefaultServiceBusNamespaceProcessorFactory factory) {
                factory.setDefaultCredential(defaultAzureCredential);
                factory.setTokenCredentialResolver(azureTokenCredentialResolver);
                clientBuilderCustomizers.orderedStream().forEach(factory::addServiceBusClientBuilderCustomizer);
            }
        });
    }

    @Bean
    ServiceBusProducerFactoryCustomizer producerFactoryCustomizer(@Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultAzureCredential,
                                                                  AzureTokenCredentialResolver azureTokenCredentialResolver,
                                                                  ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder>> clientBuilderCustomizers) {
        return (producer -> {
            if (producer instanceof DefaultServiceBusNamespaceProducerFactory factory) {
                factory.setDefaultCredential(defaultAzureCredential);
                factory.setTokenCredentialResolver(azureTokenCredentialResolver);
                clientBuilderCustomizers.orderedStream().forEach(factory::addServiceBusClientBuilderCustomizer);
            }
        });
    }
}