mgmt, fix premium sdk version (#46021)

XiaofeiCao · web-flow · commit c10f1cb70e10 · 2025-07-16T17:15:14.000+08:00
* version

* move test to azure-resourcemanager

* assert callCount

* address comment
diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/resources/azure-resourcemanager-appplatform.properties b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/resources/azure-resourcemanager-appplatform.properties
diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/resources/azure-resourcemanager-appservice.properties b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/resources/azure-resourcemanager-appservice.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/resources/azure-resourcemanager-authorization.properties b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/resources/azure-resourcemanager-authorization.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/resources/azure-resourcemanager-cdn.properties b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/resources/azure-resourcemanager-cdn.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/resources/azure-resourcemanager-compute.properties b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/resources/azure-resourcemanager-compute.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/resources/azure-resourcemanager-containerinstance.properties b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/resources/azure-resourcemanager-containerinstance.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/resources/azure-resourcemanager-containerregistry.properties b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/resources/azure-resourcemanager-containerregistry.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/resources/azure-resourcemanager-containerservice.properties b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/resources/azure-resourcemanager-containerservice.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/resources/azure-resourcemanager-cosmos.properties b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/resources/azure-resourcemanager-cosmos.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/main/resources/azure-resourcemanager-dns.properties b/sdk/resourcemanager/azure-resourcemanager-dns/src/main/resources/azure-resourcemanager-dns.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/main/resources/azure-resourcemanager-eventhubs.properties b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/main/resources/azure-resourcemanager-eventhubs.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/main/resources/azure-resourcemanager-keyvault.properties b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/main/resources/azure-resourcemanager-keyvault.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/resources/azure-resourcemanager-monitor.properties b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/resources/azure-resourcemanager-monitor.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/azure-resourcemanager-msi.properties b/sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/azure-resourcemanager-msi.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/resources/azure-resourcemanager-network.properties b/sdk/resourcemanager/azure-resourcemanager-network/src/main/resources/azure-resourcemanager-network.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/main/resources/azure-resourcemanager-privatedns.properties b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/main/resources/azure-resourcemanager-privatedns.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/src/main/resources/azure-resourcemanager-redis.properties b/sdk/resourcemanager/azure-resourcemanager-redis/src/main/resources/azure-resourcemanager-redis.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java
@@ -39,12 +39,7 @@ public abstract class AzureServiceClient {
 
     private final ClientLogger logger = new ClientLogger(getClass());
 
-    private static final Map<String, String> PROPERTIES = CoreUtils.getProperties("azure.properties");
-
-    private static final String SDK_VERSION;
-    static {
-        SDK_VERSION = PROPERTIES.getOrDefault("version", "UnknownVersion");
-    }
+    private final String sdkVersion;
 
     private final SerializerAdapter serializerAdapter;
     private final HttpPipeline httpPipeline;
@@ -69,6 +64,14 @@ protected AzureServiceClient(HttpPipeline httpPipeline, SerializerAdapter serial
             packageName = packageName.substring(0, packageName.length() - implementationSegment.length());
         }
         this.sdkName = packageName;
+        if (packageName.startsWith("com.")) {
+            // com.azure.resourcemanager.compute -> azure-resourcemanager-compute.properties
+            String artifactId = packageName.substring("com.".length()).replace(".", "-");
+            Map<String, String> properties = CoreUtils.getProperties(artifactId + ".properties");
+            sdkVersion = properties.getOrDefault("version", "UnknownVersion");
+        } else {
+            sdkVersion = "UnknownVersion";
+        }
     }
 
     /**
@@ -102,7 +105,7 @@ public HttpPipeline getHttpPipeline() {
      * @return the default client context.
      */
     public Context getContext() {
-        return new Context("Sdk-Name", sdkName).addData("Sdk-Version", SDK_VERSION);
+        return new Context("Sdk-Name", sdkName).addData("Sdk-Version", sdkVersion);
     }
 
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/resources/azure-resourcemanager-resources.properties b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/resources/azure-resourcemanager-resources.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-search/src/main/resources/azure-resourcemanager-search.properties b/sdk/resourcemanager/azure-resourcemanager-search/src/main/resources/azure-resourcemanager-search.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/resources/azure-resourcemanager-servicebus.properties b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/resources/azure-resourcemanager-servicebus.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/main/resources/azure-resourcemanager-sql.properties b/sdk/resourcemanager/azure-resourcemanager-sql/src/main/resources/azure-resourcemanager-sql.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/resources/azure-resourcemanager-storage.properties b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/resources/azure-resourcemanager-storage.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/main/resources/azure-resourcemanager-trafficmanager.properties b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/main/resources/azure-resourcemanager-trafficmanager.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/sdk/resourcemanager/azure-resourcemanager/assets.json b/sdk/resourcemanager/azure-resourcemanager/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/resourcemanager/azure-resourcemanager",
-  "Tag": "java/resourcemanager/azure-resourcemanager_e30fd36609"
+  "Tag": "java/resourcemanager/azure-resourcemanager_87e8d43047"
 }
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/UserAgentPolicyTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/UserAgentPolicyTests.java
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.resourcemanager;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.HttpPipeline;
+import com.azure.core.http.HttpPipelineCallContext;
+import com.azure.core.http.HttpPipelineNextPolicy;
+import com.azure.core.http.HttpResponse;
+import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.http.policy.RetryPolicy;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.util.CoreUtils;
+import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
+import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
+import com.azure.resourcemanager.test.ResourceManagerTestProxyTestBase;
+import com.azure.resourcemanager.test.utils.TestDelayProvider;
+import com.azure.resourcemanager.test.utils.TestIdentifierProvider;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class UserAgentPolicyTests extends ResourceManagerTestProxyTestBase {
+    private AzureResourceManager azureResourceManager;
+    VerificationPolicy verificationPolicy = new VerificationPolicy();
+
+    @Test
+    public void assertSdkVersionCorrect() {
+        azureResourceManager.virtualMachines().list().stream().count();
+        Assertions.assertTrue(verificationPolicy.callCount.get() > 0);
+    }
+
+    @Override
+    protected HttpPipeline buildHttpPipeline(TokenCredential credential, AzureProfile profile,
+        HttpLogOptions httpLogOptions, List<HttpPipelinePolicy> policies, HttpClient httpClient) {
+        policies.add(verificationPolicy);
+        return HttpPipelineProvider.buildHttpPipeline(credential, profile, null, httpLogOptions, null,
+            new RetryPolicy("Retry-After", ChronoUnit.SECONDS), policies, httpClient);
+    }
+
+    @Override
+    protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) {
+        ResourceManagerUtils.InternalRuntimeContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode()));
+        ResourceManagerUtils.InternalRuntimeContext internalContext = new ResourceManagerUtils.InternalRuntimeContext();
+        internalContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer));
+        this.azureResourceManager = buildManager(AzureResourceManager.class, httpPipeline, profile);
+        setInternalContext(internalContext, azureResourceManager);
+    }
+
+    @Override
+    protected void cleanUpResources() {
+    }
+
+    private static class VerificationPolicy implements HttpPipelinePolicy {
+        private String sdkVersion;
+        private AtomicInteger callCount = new AtomicInteger();
+
+        @Override
+        public Mono<HttpResponse> process(HttpPipelineCallContext httpPipelineCallContext,
+            HttpPipelineNextPolicy httpPipelineNextPolicy) {
+            synchronized (this) {
+                if (sdkVersion == null) {
+                    sdkVersion = CoreUtils.getProperties("azure-resourcemanager-compute.properties").get("version");
+                }
+            }
+            Assertions.assertNotNull(sdkVersion);
+            Assertions.assertTrue(httpPipelineCallContext.getHttpRequest()
+                .getHeaders()
+                .get("User-Agent")
+                .getValue()
+                .contains(sdkVersion));
+            callCount.incrementAndGet();
+            return httpPipelineNextPolicy.process();
+        }
+    }
+}
