Azure · stliu · Nov 9, 2021 · Oct 13, 2021 · Oct 15, 2021 · Oct 18, 2021
diff --git a/...e/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java b/...e/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java
@@ -9,6 +9,7 @@
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.core.AzureSpringIdentifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -48,6 +49,7 @@ public ConfigurationAsyncClient azureConfigurationAsyncClient(ConfigurationClien
     @Bean
     @ConditionalOnMissingBean
     public ConfigurationClientBuilder configurationClientBuilder(ConfigurationClientBuilderFactory factory) {
+        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_APP_CONFIG);
         return factory.build();
     }
 

diff --git a/...src/main/java/com/azure/spring/cloud/autoconfigure/cosmos/CosmosClientBuilderFactory.java b/...src/main/java/com/azure/spring/cloud/autoconfigure/cosmos/CosmosClientBuilderFactory.java
@@ -7,7 +7,6 @@
 import com.azure.core.util.Configuration;
 import com.azure.cosmos.ConnectionMode;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.spring.core.ApplicationId;
 import com.azure.spring.core.credential.descriptor.AuthenticationDescriptor;
 import com.azure.spring.core.credential.descriptor.KeyAuthenticationDescriptor;
 import com.azure.spring.core.credential.descriptor.TokenAuthenticationDescriptor;
@@ -53,11 +52,6 @@ protected List<AuthenticationDescriptor<?>> getAuthenticationDescriptors(CosmosC
         );
     }
 
-    @Override
-    protected void configureApplicationId(CosmosClientBuilder builder) {
-        builder.userAgentSuffix(ApplicationId.AZURE_SPRING_COSMOS);
-    }
-
     @Override
     protected void configureProxy(CosmosClientBuilder builder) {
         LOGGER.debug("No configureProxy for CosmosClientBuilder.");
@@ -96,6 +90,11 @@ protected void configureService(CosmosClientBuilder builder) {
         }
     }
 
+    @Override
+    protected BiConsumer<CosmosClientBuilder, String> consumeApplicationId() {
+        return CosmosClientBuilder::userAgentSuffix;
+    }
+
     @Override
     protected BiConsumer<CosmosClientBuilder, Configuration> consumeConfiguration() {
         LOGGER.warn("Configuration instance is not supported to configure in CosmosClientBuilder");

diff --git a/...m/azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubClientBuilderConfiguration.java b/...m/azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubClientBuilderConfiguration.java
@@ -7,7 +7,7 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.eventhubs.factory.EventHubClientBuilderFactory;
 import com.azure.spring.cloud.autoconfigure.eventhubs.properties.AzureEventHubProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.ConnectionStringProvider;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
@@ -39,7 +39,7 @@ public EventHubClientBuilderFactory eventHubClientBuilderFactory(AzureEventHubPr
         final EventHubClientBuilderFactory builderFactory = new EventHubClientBuilderFactory(properties);
 
         builderFactory.setConnectionStringProvider(connectionStringProviders.getIfAvailable());
-        builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_EVENT_HUB);
+        builderFactory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_EVENT_HUB);
         return builderFactory;
     }
 

diff --git a/.../azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubConsumerClientConfiguration.java b/.../azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubConsumerClientConfiguration.java
@@ -10,7 +10,7 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnMissingProperty;
 import com.azure.spring.cloud.autoconfigure.eventhubs.factory.EventHubClientBuilderFactory;
 import com.azure.spring.cloud.autoconfigure.eventhubs.properties.AzureEventHubProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -74,7 +74,7 @@ public EventHubClientBuilderFactory eventHubClientBuilderFactoryForConsumer() {
 
             builderFactory.setConnectionStringProvider(new StaticConnectionStringProvider<>(AzureServiceType.EVENT_HUB,
                                                                                             this.consumerProperties.getConnectionString()));
-            builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_EVENT_HUB);
+            builderFactory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_EVENT_HUB);
             return builderFactory;
         }
 

diff --git a/.../azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubProducerClientConfiguration.java b/.../azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubProducerClientConfiguration.java
@@ -10,7 +10,7 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnMissingProperty;
 import com.azure.spring.cloud.autoconfigure.eventhubs.factory.EventHubClientBuilderFactory;
 import com.azure.spring.cloud.autoconfigure.eventhubs.properties.AzureEventHubProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
 import com.azure.spring.eventhubs.core.EventHubOperation;
@@ -67,7 +67,7 @@ public EventHubClientBuilderFactory eventHubClientBuilderFactoryForProducer() {
 
             builderFactory.setConnectionStringProvider(new StaticConnectionStringProvider<>(AzureServiceType.EVENT_HUB,
                                                                                             this.producerProperties.getConnectionString()));
-            builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_EVENT_HUB);
+            builderFactory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_EVENT_HUB);
             return builderFactory;
         }
 

diff --git a/...pring/cloud/autoconfigure/eventhubs/AzureEventHubSharedCredentialClientConfiguration.java b/...pring/cloud/autoconfigure/eventhubs/AzureEventHubSharedCredentialClientConfiguration.java
@@ -7,6 +7,7 @@
 import com.azure.spring.cloud.autoconfigure.eventhubs.factory.EventHubSharedAuthenticationClientBuilderFactory;
 import com.azure.spring.cloud.autoconfigure.eventhubs.factory.EventProcessorSharedAuthenticationClientBuilderFactory;
 import com.azure.spring.cloud.autoconfigure.eventhubs.properties.AzureEventHubProperties;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.ConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
 import com.azure.spring.eventhubs.core.EventHubOperation;
@@ -39,6 +40,7 @@ static class EventHubServiceClientConfiguration {
         @ConditionalOnMissingBean
         public EventHubSharedAuthenticationClientBuilder eventHubSharedAuthenticationClientBuilder(
             EventHubSharedAuthenticationClientBuilderFactory factory) {
+            factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_EVENT_HUB);
             return factory.build();
         }
 
@@ -62,6 +64,7 @@ static class EventProcessorServiceClientConfiguration {
         @ConditionalOnMissingBean
         public EventProcessorSharedAuthenticationClientBuilder eventProcessorSharedAuthenticationClientBuilder(
             EventProcessorSharedAuthenticationClientBuilderFactory factory) {
+            factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_EVENT_HUB);
             return factory.build();
         }
 

diff --git a/.../com/azure/spring/cloud/autoconfigure/eventhubs/factory/EventHubClientBuilderFactory.java b/.../com/azure/spring/cloud/autoconfigure/eventhubs/factory/EventHubClientBuilderFactory.java
@@ -131,8 +131,4 @@ protected List<AuthenticationDescriptor<?>> getAuthenticationDescriptors(EventHu
         );
     }
 
-    @Override
-    protected String getApplicationId() {
-        return super.getApplicationId();
-    }
 }
diff --git a/.../java/com/azure/spring/cloud/autoconfigure/jms/PremiumServiceBusJmsAutoConfiguration.java b/.../java/com/azure/spring/cloud/autoconfigure/jms/PremiumServiceBusJmsAutoConfiguration.java
@@ -15,8 +15,8 @@
 
 import javax.jms.ConnectionFactory;
 
-import static com.azure.spring.core.ApplicationId.AZURE_SPRING_SERVICE_BUS;
-import static com.azure.spring.core.ApplicationId.VERSION;
+import static com.azure.spring.core.AzureSpringIdentifier.AZURE_SPRING_SERVICE_BUS;
+import static com.azure.spring.core.AzureSpringIdentifier.VERSION;
 
 /**
  * Automatic configuration class of ServiceBusJMS for Premium Service Bus

diff --git a/.../cloud/autoconfigure/keyvault/certificates/AzureKeyVaultCertificateAutoConfiguration.java b/.../cloud/autoconfigure/keyvault/certificates/AzureKeyVaultCertificateAutoConfiguration.java
@@ -49,6 +49,8 @@ public CertificateAsyncClient azureKeyVaultCertificateAsyncClient(CertificateCli
     @Bean
     @ConditionalOnMissingBean
     public CertificateClientBuilder certificateClientBuilder(CertificateClientBuilderFactory factory) {
+        // TODO (xiada): how to distinguish this from kv secrets?
+//        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_KEY_VAULT);
         return factory.build();
     }
 

diff --git a/...ure/spring/cloud/autoconfigure/keyvault/secrets/AzureKeyVaultSecretAutoConfiguration.java b/...ure/spring/cloud/autoconfigure/keyvault/secrets/AzureKeyVaultSecretAutoConfiguration.java
@@ -9,6 +9,7 @@
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.core.AzureSpringIdentifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -49,6 +50,7 @@ public SecretAsyncClient azureKeyVaultSecretAsyncClient(SecretClientBuilder buil
     @Bean
     @ConditionalOnMissingBean
     public SecretClientBuilder secretClientBuilder(SecretClientBuilderFactory factory) {
+        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_KEY_VAULT);
         return factory.build();
     }
 

diff --git a/...zure/spring/cloud/autoconfigure/servicebus/AzureServiceBusClientBuilderConfiguration.java b/...zure/spring/cloud/autoconfigure/servicebus/AzureServiceBusClientBuilderConfiguration.java
@@ -6,7 +6,7 @@
 import com.azure.messaging.servicebus.ServiceBusClientBuilder;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.servicebus.properties.AzureServiceBusProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.ConnectionStringProvider;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
@@ -35,10 +35,10 @@ class AzureServiceBusClientBuilderConfiguration {
     public ServiceBusClientBuilderFactory serviceBusClientBuilderFactory(
         ObjectProvider<ConnectionStringProvider<AzureServiceType.ServiceBus>> connectionStringProviders) {
 
-        final ServiceBusClientBuilderFactory builderFactory = new ServiceBusClientBuilderFactory(this.serviceBusProperties);
-        builderFactory.setConnectionStringProvider(connectionStringProviders.getIfAvailable());
-        builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_SERVICE_BUS);
-        return builderFactory;
+        final ServiceBusClientBuilderFactory factory = new ServiceBusClientBuilderFactory(this.serviceBusProperties);
+        factory.setConnectionStringProvider(connectionStringProviders.getIfAvailable());
+        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_SERVICE_BUS);
+        return factory;
     }
 
     @Bean

diff --git a/...ure/spring/cloud/autoconfigure/servicebus/AzureServiceBusConsumerClientConfiguration.java b/...ure/spring/cloud/autoconfigure/servicebus/AzureServiceBusConsumerClientConfiguration.java
@@ -13,7 +13,7 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnMissingProperty;
 import com.azure.spring.cloud.autoconfigure.servicebus.properties.AzureServiceBusProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
 import org.slf4j.Logger;
@@ -69,7 +69,7 @@ public ServiceBusClientBuilderFactory serviceBusClientBuilderFactoryForConsumer(
 
             builderFactory.setConnectionStringProvider(new StaticConnectionStringProvider<>(AzureServiceType.SERVICE_BUS,
                 this.consumerProperties.getConnectionString()));
-            builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_SERVICE_BUS);
+            builderFactory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_SERVICE_BUS);
             return builderFactory;
         }
 

diff --git a/...om/azure/spring/cloud/autoconfigure/servicebus/AzureServiceBusProcessorConfiguration.java b/...om/azure/spring/cloud/autoconfigure/servicebus/AzureServiceBusProcessorConfiguration.java
@@ -8,7 +8,7 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnMissingProperty;
 import com.azure.spring.cloud.autoconfigure.servicebus.properties.AzureServiceBusProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
 import com.azure.spring.servicebus.core.ServiceBusMessageProcessor;
@@ -66,7 +66,7 @@ public ServiceBusClientBuilderFactory serviceBusClientBuilderFactoryForProcessor
             final ServiceBusClientBuilderFactory builderFactory = new ServiceBusClientBuilderFactory(this.processorProperties);
             builderFactory.setConnectionStringProvider(new StaticConnectionStringProvider<>(AzureServiceType.SERVICE_BUS,
                 this.processorProperties.getConnectionString()));
-            builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_SERVICE_BUS);
+            builderFactory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_SERVICE_BUS);
 
             return builderFactory;
         }

diff --git a/...ure/spring/cloud/autoconfigure/servicebus/AzureServiceBusProducerClientConfiguration.java b/...ure/spring/cloud/autoconfigure/servicebus/AzureServiceBusProducerClientConfiguration.java
@@ -11,7 +11,7 @@
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnMissingProperty;
 import com.azure.spring.cloud.autoconfigure.servicebus.properties.AzureServiceBusProperties;
-import com.azure.spring.core.ApplicationId;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
 import org.slf4j.Logger;
@@ -74,7 +74,7 @@ public ServiceBusClientBuilderFactory serviceBusClientBuilderFactoryForProducer(
 
             builderFactory.setConnectionStringProvider(new StaticConnectionStringProvider<>(AzureServiceType.SERVICE_BUS,
                 this.producerProperties.getConnectionString()));
-            builderFactory.setSpringIdentifier(ApplicationId.AZURE_SPRING_SERVICE_BUS);
+            builderFactory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_SERVICE_BUS);
 
             return builderFactory;
         }

diff --git a/.../com/azure/spring/cloud/autoconfigure/storage/blob/AzureStorageBlobAutoConfiguration.java b/.../com/azure/spring/cloud/autoconfigure/storage/blob/AzureStorageBlobAutoConfiguration.java
@@ -6,6 +6,7 @@
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.storage.blob.BlobAsyncClient;
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.BlobContainerAsyncClient;
@@ -90,6 +91,7 @@ public BlobServiceClientBuilderFactory blobServiceClientBuilderFactory(AzureStor
     @Bean
     @ConditionalOnMissingBean
     public BlobServiceClientBuilder blobServiceClientBuilder(BlobServiceClientBuilderFactory factory) {
+        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_STORAGE_BLOB);
         return factory.build();
     }
 

diff --git a/...va/com/azure/spring/cloud/autoconfigure/storage/blob/BlobServiceClientBuilderFactory.java b/...va/com/azure/spring/cloud/autoconfigure/storage/blob/BlobServiceClientBuilderFactory.java
@@ -23,9 +23,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import static com.azure.spring.core.ApplicationId.AZURE_SPRING_STORAGE_BLOB;
-import static com.azure.spring.core.ApplicationId.VERSION;
-
 /**
  * Storage Blob Service client builder factory, it builds the storage blob client according the configuration context
  * and blob properties.
@@ -102,8 +99,4 @@ protected List<AuthenticationDescriptor<?>> getAuthenticationDescriptors(BlobSer
         );
     }
 
-    @Override
-    protected String getApplicationId() {
-        return AZURE_SPRING_STORAGE_BLOB + VERSION;
-    }
 }
diff --git a/.../spring/cloud/autoconfigure/storage/fileshare/AzureStorageFileShareAutoConfiguration.java b/.../spring/cloud/autoconfigure/storage/fileshare/AzureStorageFileShareAutoConfiguration.java
@@ -6,6 +6,7 @@
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.storage.file.share.ShareAsyncClient;
 import com.azure.storage.file.share.ShareClient;
 import com.azure.storage.file.share.ShareFileAsyncClient;
@@ -58,6 +59,7 @@ public ShareServiceClientBuilderFactory shareServiceClientBuilderFactory(AzureSt
     @Bean
     @ConditionalOnMissingBean
     public ShareServiceClientBuilder shareServiceClientBuilder(ShareServiceClientBuilderFactory factory) {
+        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_STORAGE_FILES);
         return factory.build();
     }
 

diff --git a/.../azure/spring/cloud/autoconfigure/storage/fileshare/ShareServiceClientBuilderFactory.java b/.../azure/spring/cloud/autoconfigure/storage/fileshare/ShareServiceClientBuilderFactory.java
@@ -23,9 +23,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import static com.azure.spring.core.ApplicationId.AZURE_SPRING_STORAGE_FILES;
-import static com.azure.spring.core.ApplicationId.VERSION;
-
 /**
  * Storage File Share Service client builder factory, it builds the storage blob client according the configuration
  * context and blob properties.
@@ -101,8 +98,4 @@ protected BiConsumer<ShareServiceClientBuilder, String> consumeConnectionString(
         return ShareServiceClientBuilder::connectionString;
     }
 
-    @Override
-    protected String getApplicationId() {
-        return AZURE_SPRING_STORAGE_FILES + VERSION;
-    }
 }
diff --git a/...om/azure/spring/cloud/autoconfigure/storage/queue/AzureStorageQueueAutoConfiguration.java b/...om/azure/spring/cloud/autoconfigure/storage/queue/AzureStorageQueueAutoConfiguration.java
@@ -6,6 +6,7 @@
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.ConnectionStringProvider;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
 import com.azure.spring.core.service.AzureServiceType;
@@ -61,6 +62,7 @@ public QueueServiceClientBuilderFactory queueServiceClientBuilderFactory(AzureSt
     @Bean
     @ConditionalOnMissingBean
     public QueueServiceClientBuilder queueServiceClientBuilder(QueueServiceClientBuilderFactory factory) {
+        factory.setSpringIdentifier(AzureSpringIdentifier.AZURE_SPRING_STORAGE_QUEUE);
         return factory.build();
     }
 

diff --git a/.../com/azure/spring/cloud/autoconfigure/storage/queue/QueueServiceClientBuilderFactory.java b/.../com/azure/spring/cloud/autoconfigure/storage/queue/QueueServiceClientBuilderFactory.java
@@ -23,9 +23,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import static com.azure.spring.core.ApplicationId.AZURE_SPRING_STORAGE_QUEUE;
-import static com.azure.spring.core.ApplicationId.VERSION;
-
 /**
  * Storage Queue Service client builder factory, it builds the storage blob client according the configuration context
  * and blob properties.
@@ -99,11 +96,6 @@ protected BiConsumer<QueueServiceClientBuilder, String> consumeConnectionString(
         return QueueServiceClientBuilder::connectionString;
     }
 
-    @Override
-    protected String getApplicationId() {
-        return AZURE_SPRING_STORAGE_QUEUE + VERSION;
-    }
-
     private QueueMessageEncoding convertToMessageEncoding(String messageEncoding) {
         return QueueMessageEncoding.BASE64
             .name()