Add ApplicationInsights (#187)

* Add ApplicationInsights * Make test less flaky since CosmosDb emulator on GHA is slow
LogOtter · Oct 12, 2023 · 910c381 · 910c381
1 parent ace7572
commit 910c381
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,6 +6,8 @@
  <PackageVersion Include="Azure.Identity" Version="1.10.1" />
  <PackageVersion Include="Bogus" Version="34.0.2" />
  <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+ <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+ <PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
  <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" />
  <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.11" />
  <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.11" />
@@ -32,4 +34,4 @@
  <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
  <PackageVersion Include="Yarp.ReverseProxy" Version="2.0.0" />
  </ItemGroup>
-</Project>
+</Project>
diff --git a/sample/CustomerApi.Tests/CustomerController/GetAllCustomersTests.cs b/sample/CustomerApi.Tests/CustomerController/GetAllCustomersTests.cs
@@ -14,8 +14,10 @@ public class GetAllCustomersTests
  public async Task Valid_ReturnsOk()
  {
  using var customerApi = new TestCustomerApi();
+
  await customerApi.Given.AnExistingCustomer(CustomerUri.Parse("/customers/ExistingUser"), "bob@bobertson.co.uk", "Bob", "Bobertson");
  await customerApi.Given.AnExistingCustomer(CustomerUri.Parse("/customers/AnotherExistingUser"), "bobetta@bobson.co.uk", "Bobetta", "Bobson");
+ var createdTimestamp = DateTime.UtcNow;
 
  var authHeader = await customerApi.Given.AnExistingConsumer("Customers.Read");
 
@@ -43,15 +45,15 @@ public async Task Valid_ReturnsOk()
  bob.FirstName.Should().Be("Bob");
  bob.LastName.Should().Be("Bobertson");
  bob.CustomerUri.Should().Be("/customers/ExistingUser");
- bob.CreatedOn.Should().BeWithin(TimeSpan.FromSeconds(2)).Before(DateTimeOffset.UtcNow);
+ bob.CreatedOn.Should().BeWithin(TimeSpan.FromSeconds(2)).Before(createdTimestamp);
 
  var bobetta = customersResponse.Customers.FirstOrDefault(c => c.CustomerUri == "/customers/AnotherExistingUser");
  bobetta.Should().NotBeNull();
  bobetta!.EmailAddress.Should().Be("bobetta@bobson.co.uk");
  bobetta.FirstName.Should().Be("Bobetta");
  bobetta.LastName.Should().Be("Bobson");
  bobetta.CustomerUri.Should().Be("/customers/AnotherExistingUser");
- bobetta.CreatedOn.Should().BeWithin(TimeSpan.FromSeconds(1)).Before(DateTimeOffset.UtcNow);
+ bobetta.CreatedOn.Should().BeWithin(TimeSpan.FromSeconds(2)).Before(createdTimestamp);
  }
 
  [Fact]

diff --git a/sample/CustomerApi/CustomerApi.csproj b/sample/CustomerApi/CustomerApi.csproj
@@ -8,6 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
+ <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
  <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
  <PackageReference Include="Microsoft.SourceLink.GitHub">
  <PrivateAssets>all</PrivateAssets>

diff --git a/sample/CustomerApi/Program.cs b/sample/CustomerApi/Program.cs
@@ -19,6 +19,7 @@
 services.AddControllers();
 services.AddEndpointsApiExplorer();
 services.AddSwaggerGen();
+services.AddApplicationInsightsTelemetry();
 
 services.AddAuthentication().AddJwtBearer();
 

diff --git a/sample/CustomerApi/appsettings.json b/sample/CustomerApi/appsettings.json
@@ -22,5 +22,8 @@
  "CosmosDb": {
  "ConnectionString": "<Secret>",
  "DatabaseId": "CustomerApi"
+ },
+ "ApplicationInsights": {
+ "ConnectionString": "<Secret>"
  }
 }
diff --git a/sample/CustomerWorker/CustomerWorker.csproj b/sample/CustomerWorker/CustomerWorker.csproj
@@ -8,6 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
+ <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" />
  <PackageReference Include="Microsoft.Extensions.Hosting"/>
  </ItemGroup>
 

diff --git a/sample/CustomerWorker/Program.cs b/sample/CustomerWorker/Program.cs
@@ -10,6 +10,8 @@
  .ConfigureServices(
  (_, services) =>
  {
+ services.AddApplicationInsightsTelemetryWorkerService();
+
  services
  .AddHealthChecks()
  .AddCheck<AlwaysHealthyCheck>("StartupCheck", tags: new[] { "ready" })

diff --git a/sample/CustomerWorker/appsettings.json b/sample/CustomerWorker/appsettings.json
@@ -1,2 +1,5 @@
 {
+ "ApplicationInsights": {
+ "ConnectionString": "<Secret>"
+ }
 }
diff --git a/sample/terraform/main.tf b/sample/terraform/main.tf
@@ -31,6 +31,22 @@ resource "azurerm_resource_group" "rg" {
  location = "uksouth"
 }
 
+resource "azurerm_log_analytics_workspace" "log-analytics-workspace" {
+ name = "log-otter-log-analytics-workspace"
+ location = azurerm_resource_group.rg.location
+ resource_group_name = azurerm_resource_group.rg.name
+ sku = "PerGB2018"
+ retention_in_days = 30
+}
+
+resource "azurerm_application_insights" "app-insights" {
+ name = "log-otter-app-insights"
+ location = azurerm_resource_group.rg.location
+ resource_group_name = azurerm_resource_group.rg.name
+ workspace_id = azurerm_log_analytics_workspace.log-analytics-workspace.id
+ application_type = "web"
+}
+
 resource "azurerm_cosmosdb_account" "db" {
  name = "log-otter-samples"
  location = azurerm_resource_group.rg.location
@@ -61,13 +77,14 @@ resource "azurerm_linux_web_app" "customer-api" {
  https_only = true
 
  app_settings = {
- ASPNETCORE_ENVIRONMENT = "Development"
- COSMOSDB__CONNECTIONSTRING = azurerm_cosmosdb_account.db.primary_sql_connection_string
- DOCKER_REGISTRY_SERVER_URL = var.docker_registry_url
- DOCKER_REGISTRY_SERVER_USERNAME = var.docker_registry_username
- DOCKER_REGISTRY_SERVER_PASSWORD = var.docker_registry_password
- WEBSITES_ENABLE_APP_SERVICE_STORAGE = "false"
- WEBSITE_WARMUP_PATH = "/health"
+ APPLICATIONINSIGHTS__CONNECTIONSTRING = azurerm_application_insights.app-insights.connection_string
+ ASPNETCORE_ENVIRONMENT = "Development"
+ COSMOSDB__CONNECTIONSTRING = azurerm_cosmosdb_account.db.primary_sql_connection_string
+ DOCKER_REGISTRY_SERVER_URL = var.docker_registry_url
+ DOCKER_REGISTRY_SERVER_USERNAME = var.docker_registry_username
+ DOCKER_REGISTRY_SERVER_PASSWORD = var.docker_registry_password
+ WEBSITES_ENABLE_APP_SERVICE_STORAGE = "false"
+ WEBSITE_WARMUP_PATH = "/health"
  }
 
  site_config {
@@ -100,11 +117,12 @@ resource "azurerm_linux_web_app" "customer-worker" {
  https_only = true
 
  app_settings = {
- DOCKER_REGISTRY_SERVER_URL = var.docker_registry_url
- DOCKER_REGISTRY_SERVER_USERNAME = var.docker_registry_username
- DOCKER_REGISTRY_SERVER_PASSWORD = var.docker_registry_password
- WEBSITES_ENABLE_APP_SERVICE_STORAGE = "false"
- WEBSITE_WARMUP_PATH = "/health"
+ APPLICATIONINSIGHTS__CONNECTIONSTRING = azurerm_application_insights.app-insights.connection_string
+ DOCKER_REGISTRY_SERVER_URL = var.docker_registry_url
+ DOCKER_REGISTRY_SERVER_USERNAME = var.docker_registry_username
+ DOCKER_REGISTRY_SERVER_PASSWORD = var.docker_registry_password
+ WEBSITES_ENABLE_APP_SERVICE_STORAGE = "false"
+ WEBSITE_WARMUP_PATH = "/health"
  }
 
  site_config {