Fix role name on Azure Functions (#1526)

microsoft · Mar 3, 2021 · e0dfbaa · e0dfbaa
1 parent 9ce9498
commit e0dfbaa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/...t/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationBuilder.java b/...t/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationBuilder.java
@@ -200,7 +200,7 @@ public static void overlayEnvVars(Configuration config) throws IOException {
 
         if (isTrimEmpty(config.role.name)) {
             // only use WEBSITE_SITE_NAME as a fallback
-            config.role.name = getEnvVar(WEBSITE_SITE_NAME);
+            config.role.name = getWebsiteSiteNameEnvVar();
         }
         config.role.name = overlayWithEnvVar(APPLICATIONINSIGHTS_ROLE_NAME, config.role.name);
 

diff --git a/...soft/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationTest.java b/...soft/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationTest.java
@@ -153,7 +153,7 @@ public void shouldParseProcessorConfiguration() throws IOException {
 
     @Test
     public void shouldUseDefaults() throws IOException {
-        envVars.set("WEBSITE_SITE_NAME", "role name from website env");
+        envVars.set("WEBSITE_SITE_NAME", "Role Name From Website Env");
         envVars.set("WEBSITE_INSTANCE_ID", "role instance from website env");
 
         Configuration configuration = loadConfiguration();
@@ -180,7 +180,7 @@ public void shouldOverrideConnectionString() throws IOException {
     @Test
     public void shouldOverrideRoleName() throws IOException {
         envVars.set("APPLICATIONINSIGHTS_ROLE_NAME", "role name from env");
-        envVars.set("WEBSITE_SITE_NAME", "role name from website env");
+        envVars.set("WEBSITE_SITE_NAME", "Role Name From Website Env");
 
         Configuration configuration = loadConfiguration();
         ConfigurationBuilder.overlayEnvVars(configuration);
@@ -190,24 +190,35 @@ public void shouldOverrideRoleName() throws IOException {
 
     @Test
     public void shouldOverrideRoleNameWithWebsiteEnvVar() throws IOException {
-        envVars.set("WEBSITE_SITE_NAME", "role name from website env");
+        envVars.set("WEBSITE_SITE_NAME", "Role Name From Website Env");
 
         Configuration configuration = loadConfiguration("applicationinsights_NoRole.json");
         ConfigurationBuilder.overlayEnvVars(configuration);
 
-        assertEquals("role name from website env", configuration.role.name);
+        assertEquals("Role Name From Website Env", configuration.role.name);
     }
 
     @Test
     public void shouldNotOverrideRoleNameWithWebsiteEnvVar() throws IOException {
-        envVars.set("WEBSITE_SITE_NAME", "role name from website env");
+        envVars.set("WEBSITE_SITE_NAME", "Role Name From Website Env");
 
         Configuration configuration = loadConfiguration();
         ConfigurationBuilder.overlayEnvVars(configuration);
 
         assertEquals("Something Good", configuration.role.name);
     }
 
+    @Test
+    public void shouldOverrideRoleNameWithLowercaseWebsiteEnvVarOnAzFn() throws IOException {
+        envVars.set("FUNCTIONS_WORKER_RUNTIME", "java");
+        envVars.set("WEBSITE_SITE_NAME", "Role Name From Website Env");
+
+        Configuration configuration = loadConfiguration("applicationinsights_NoRole.json");
+        ConfigurationBuilder.overlayEnvVars(configuration);
+
+        assertEquals("role name from website env", configuration.role.name);
+    }
+
     @Test
     public void shouldOverrideRoleInstance() throws IOException {
         envVars.set("APPLICATIONINSIGHTS_ROLE_INSTANCE", "role instance from env");