Skip to content

Commit 1ef98bf

Browse files
nickdalanickdala
authored
Enable tracing with App Insights (#18)
1 parent b2b9dbe commit 1ef98bf

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

‎apps/contoso-fiber/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@
142142
<artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
143143
</dependency>
144144

145-
<dependency>
146-
<groupId>com.microsoft.azure</groupId>
147-
<artifactId>applicationinsights-runtime-attach</artifactId>
148-
</dependency>
149-
150145
</dependencies>
151146

152147
<build>

‎apps/contoso-fiber/src/main/java/com/contoso/cams/CamsApplication.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313
import org.springframework.web.bind.annotation.ExceptionHandler;
1414
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
1515

16-
import com.microsoft.applicationinsights.attach.ApplicationInsights;
17-
1816
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
1917

2018
@SpringBootApplication
2119
@EnableCaching
2220
public class CamsApplication {
2321

2422
public static void main(String[] args) {
25-
ApplicationInsights.attach();
2623
SpringApplication.run(CamsApplication.class, args);
2724
}
2825

‎infra/shared/terraform/modules/app-insights/outputs.tf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ output "connection_string" {
22
value = azurerm_application_insights.app_insights.connection_string
33
}
44

5+
output "instrumentation_key" {
6+
value = azurerm_application_insights.app_insights.instrumentation_key
7+
}
8+
59
output "log_analytics_workspace_id" {
610
value = azurerm_log_analytics_workspace.app_workspace.id
711
}
812

913
output "app_insights_id" {
1014
value = azurerm_application_insights.app_insights.id
11-
}
15+
}

‎infra/shared/terraform/modules/app-service/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,14 @@ resource "azurerm_linux_web_app" "application" {
9494
sticky_settings {
9595
app_setting_names = [
9696
"APPLICATIONINSIGHTS_CONNECTION_STRING",
97+
"APPINSIGHTS_INSTRUMENTATIONKEY",
9798
"ApplicationInsightsAgent_EXTENSION_VERSION"
9899
]
99100
}
100101

101102
app_settings = {
102103
APPLICATIONINSIGHTS_CONNECTION_STRING = var.app_insights_connection_string
104+
APPINSIGHTS_INSTRUMENTATIONKEY = var.app_insights_instrumentation_key
103105
ApplicationInsightsAgent_EXTENSION_VERSION = "~3"
104106

105107
DATABASE_URL = var.contoso_webapp_options.postgresql_database_url

‎infra/shared/terraform/modules/app-service/variables.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ variable "app_insights_connection_string" {
4949
description = "The app insights connection string"
5050
}
5151

52+
variable "app_insights_instrumentation_key" {
53+
type = string
54+
description = "The app insights instrumentation key"
55+
}
56+
5257
variable "log_analytics_workspace_id" {
5358
type = string
5459
description = "The id of the log analytics workspace"

‎infra/terraform/application.tf‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# ---------------------
88

99
module "application" {
10-
count = var.environment == "prod" ? 1 : 0
10+
count = var.environment == "prod" ? 1 : 0
1111
source = "../shared/terraform/modules/app-service"
1212
resource_group = azurerm_resource_group.spoke[0].name
1313
application_name = var.application_name
@@ -17,6 +17,7 @@ module "application" {
1717
appsvc_subnet_id = module.spoke_vnet[0].subnets[local.app_service_subnet_name].id
1818
private_endpoint_subnet_id = module.spoke_vnet[0].subnets[local.private_link_subnet_name].id
1919
app_insights_connection_string = module.hub_app_insights[0].connection_string
20+
app_insights_instrumentation_key = module.hub_app_insights[0].instrumentation_key
2021
log_analytics_workspace_id = module.hub_app_insights[0].log_analytics_workspace_id
2122
frontdoor_host_name = module.frontdoor[0].host_name
2223
frontdoor_profile_uuid = module.frontdoor[0].resource_guid
@@ -25,7 +26,7 @@ module "application" {
2526
contoso_webapp_options = {
2627
contoso_active_directory_tenant_id = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_tenant_id[0].id})"
2728
contoso_active_directory_client_id = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_client_id[0].id})"
28-
contoso_active_directory_client_secret = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_client_secret[0].id})"
29+
contoso_active_directory_client_secret = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_client_secret[0].id})"
2930
postgresql_database_url = format("@Microsoft.KeyVault(SecretUri=%s)", module.secrets[0].secret_names["contoso-database-url"])
3031
postgresql_database_user = format("@Microsoft.KeyVault(SecretUri=%s)", module.secrets[0].secret_names["contoso-database-admin"])
3132
postgresql_database_password = format("@Microsoft.KeyVault(SecretUri=%s)", module.secrets[0].secret_names["contoso-database-admin-password"])
@@ -55,15 +56,16 @@ module "secondary_application" {
5556
appsvc_subnet_id = module.secondary_spoke_vnet[0].subnets[local.app_service_subnet_name].id
5657
private_endpoint_subnet_id = module.secondary_spoke_vnet[0].subnets[local.private_link_subnet_name].id
5758
app_insights_connection_string = module.hub_app_insights[0].connection_string
59+
app_insights_instrumentation_key = module.hub_app_insights[0].instrumentation_key
5860
log_analytics_workspace_id = module.hub_app_insights[0].log_analytics_workspace_id
5961
frontdoor_host_name = module.frontdoor[0].host_name
6062
frontdoor_profile_uuid = module.frontdoor[0].resource_guid
6163
public_network_access_enabled = false
6264

63-
contoso_webapp_options = {
65+
contoso_webapp_options = {
6466
contoso_active_directory_tenant_id = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_tenant_id[0].id})"
6567
contoso_active_directory_client_id = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_client_id[0].id})"
66-
contoso_active_directory_client_secret = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_client_secret[0].id})"
68+
contoso_active_directory_client_secret = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contoso_application_client_secret[0].id})"
6769
postgresql_database_url = format("@Microsoft.KeyVault(SecretUri=%s)", module.secondary_secrets[0].secret_names["secondary-contoso-database-url"])
6870
postgresql_database_user = format("@Microsoft.KeyVault(SecretUri=%s)", module.secondary_secrets[0].secret_names["secondary-contoso-database-admin"])
6971
postgresql_database_password = format("@Microsoft.KeyVault(SecretUri=%s)", module.secondary_secrets[0].secret_names["secondary-contoso-database-admin-password"])
@@ -77,7 +79,7 @@ module "secondary_application" {
7779
storage_container_name = format("@Microsoft.KeyVault(SecretUri=%s)", module.secondary_secrets[0].secret_names["secondary-contoso-storage-container-name"])
7880

7981
}
80-
82+
8183
}
8284

8385
// ---------------------------------------------------------------------------
@@ -99,6 +101,7 @@ module "dev_application" {
99101
appsvc_subnet_id = null
100102
private_endpoint_subnet_id = null
101103
app_insights_connection_string = module.dev_app_insights[0].connection_string
104+
app_insights_instrumentation_key = module.dev_app_insights[0].instrumentation_key
102105
log_analytics_workspace_id = module.dev_app_insights[0].log_analytics_workspace_id
103106
frontdoor_host_name = module.dev_frontdoor[0].host_name
104107
frontdoor_profile_uuid = module.dev_frontdoor[0].resource_guid
@@ -107,7 +110,7 @@ module "dev_application" {
107110
contoso_webapp_options = {
108111
contoso_active_directory_tenant_id = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.dev_contoso_application_tenant_id[0].id})"
109112
contoso_active_directory_client_id = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.dev_contoso_application_client_id[0].id})"
110-
contoso_active_directory_client_secret = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.dev_contoso_application_client_secret[0].id})"
113+
contoso_active_directory_client_secret = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.dev_contoso_application_client_secret[0].id})"
111114
postgresql_database_url = format("@Microsoft.KeyVault(SecretUri=%s)", module.dev_secrets[0].secret_names["dev-contoso-database-url"])
112115
postgresql_database_user = format("@Microsoft.KeyVault(SecretUri=%s)", module.dev_secrets[0].secret_names["dev-contoso-database-admin"])
113116
postgresql_database_password = format("@Microsoft.KeyVault(SecretUri=%s)", module.dev_secrets[0].secret_names["dev-contoso-database-admin-password"])

‎infra/terraform/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
azurerm = {
44
source = "hashicorp/azurerm"
5-
version = "3.110.0"
5+
version = "3.116.0"
66
}
77
azurecaf = {
88
source = "aztfmod/azurecaf"

0 commit comments

Comments
 (0)