Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix role name on Azure Functions #1526

Merged
merged 1 commit into from
Mar 3, 2021
Merged

Fix role name on Azure Functions #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...t/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
trask marked this conversation as resolved.
Show resolved Hide resolved
config.role.name = getEnvVar(WEBSITE_SITE_NAME);
config.role.name = getWebsiteSiteNameEnvVar();
}
config.role.name = overlayWithEnvVar(APPLICATIONINSIGHTS_ROLE_NAME, config.role.name);

Expand Down
21 changes: 16 additions & 5 deletions ...soft/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand All @@ -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);
trask marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void shouldOverrideRoleInstance() throws IOException {
envVars.set("APPLICATIONINSIGHTS_ROLE_INSTANCE", "role instance from env");
Expand Down