Back merge main into development

backend/CPS.ComplexCases.API.HttpTelemetry.Tests/CPS.ComplexCases.API.HttpTelemetry.Tests.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CPS.ComplexCases.API.HttpTelemetry\CPS.ComplexCases.API.HttpTelemetry.csproj" />
+  </ItemGroup>
+</Project>

backend/CPS.ComplexCases.API.HttpTelemetry.Tests/HealthCheckTelemetryHostRegistrationTests.cs

@@ -0,0 +1,97 @@
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.Channel;
+using Microsoft.ApplicationInsights.DataContracts;
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CPS.ComplexCases.API.HttpTelemetry.Tests;
+
+public class HealthCheckTelemetryHostRegistrationTests
+{
+    [Fact]
+    public void Register_WrapsTelemetryConfiguration_AndDropsStatusHostTelemetry()
+    {
+        var channel = new StubChannel();
+        var services = new ServiceCollection();
+        services.AddSingleton(_ => new TelemetryConfiguration { TelemetryChannel = channel });
+
+        HealthCheckTelemetryHostRegistration.Register(services);
+
+        var config = services.BuildServiceProvider().GetRequiredService<TelemetryConfiguration>();
+        var client = new TelemetryClient(config);
+
+        var statusRequest = new RequestTelemetry
+        {
+            Name = "Status",
+            Url = new Uri("https://example.com/api/status")
+        };
+        var invokeDependency = new DependencyTelemetry
+        {
+            Name = "Invoke",
+            Type = "InProc"
+        };
+        invokeDependency.Context.Operation.Name = "Functions.Status";
+
+        client.TrackRequest(statusRequest);
+        client.Track(invokeDependency);
+        client.TrackRequest(new RequestTelemetry
+        {
+            Name = "GetCase",
+            Url = new Uri("https://example.com/api/v1/cases/1")
+        });
+        client.Flush();
+
+        var remaining = Assert.Single(channel.Items);
+        var remainingRequest = Assert.IsType<RequestTelemetry>(remaining);
+        Assert.Equal("GetCase", remainingRequest.Name);
+    }
+
+    [Fact]
+    public void Register_AddsTelemetryModule_WhenConfigurationIsNotRegistered()
+    {
+        var services = new ServiceCollection();
+
+        HealthCheckTelemetryHostRegistration.Register(services);
+
+        Assert.Contains(services, descriptor =>
+            descriptor.ServiceType == typeof(ITelemetryModule)
+            && descriptor.ImplementationType == typeof(HealthCheckTelemetryModule));
+    }
+
+    [Fact]
+    public void Module_Initialize_DropsStatusRequestsAfterBuild()
+    {
+        var channel = new StubChannel();
+        var config = new TelemetryConfiguration { TelemetryChannel = channel };
+
+        new HealthCheckTelemetryModule().Initialize(config);
+        config.TelemetryProcessorChainBuilder.Build();
+
+        var client = new TelemetryClient(config);
+        client.TrackRequest(new RequestTelemetry
+        {
+            Name = "Status",
+            Url = new Uri("https://example.com/api/status")
+        });
+        client.TrackRequest(new RequestTelemetry
+        {
+            Name = "GetCase",
+            Url = new Uri("https://example.com/api/v1/cases/1")
+        });
+        client.Flush();
+
+        var remaining = Assert.Single(channel.Items);
+        var remainingRequest = Assert.IsType<RequestTelemetry>(remaining);
+        Assert.Equal("GetCase", remainingRequest.Name);
+    }
+
+    private sealed class StubChannel : ITelemetryChannel
+    {
+        public List<ITelemetry> Items { get; } = [];
+        public bool? DeveloperMode { get; set; }
+        public string? EndpointAddress { get; set; }
+        public void Send(ITelemetry item) => Items.Add(item);
+        public void Flush() { }
+        public void Dispose() { }
+    }
+}

backend/CPS.ComplexCases.API.HttpTelemetry/CPS.ComplexCases.API.HttpTelemetry.csproj

@@ -2,11 +2,12 @@
 
   <PropertyGroup>
 
-    <VersionPrefix>1.0.41</VersionPrefix>
+    <VersionPrefix>1.0.42</VersionPrefix>
 
     <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <DefineConstants>$(DefineConstants);HOST_TELEMETRY</DefineConstants>
 
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Brian Dunnington</Authors>
@@ -26,5 +27,11 @@
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\CPS.ComplexCases.Common\Telemetry\HealthCheckTelemetryFilter.cs" Link="HealthCheckTelemetryFilter.cs" />
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>CPS.ComplexCases.API.HttpTelemetry.Tests</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 
-</Project>
+</Project>

backend/CPS.ComplexCases.API.HttpTelemetry/HealthCheckTelemetryHostRegistration.cs

@@ -0,0 +1,47 @@
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CPS.ComplexCases.API.HttpTelemetry;
+
+internal static class HealthCheckTelemetryHostRegistration
+{
+    public static void Register(IServiceCollection services)
+    {
+        var configDescriptor = services.FirstOrDefault(descriptor => descriptor.ServiceType == typeof(TelemetryConfiguration));
+        if (configDescriptor?.ImplementationFactory is not null)
+        {
+            var implFactory = configDescriptor.ImplementationFactory;
+            services.Remove(configDescriptor);
+            services.AddSingleton(provider =>
+            {
+                var config = (TelemetryConfiguration)implFactory(provider);
+                Attach(config);
+                return config;
+            });
+            return;
+        }
+
+        if (configDescriptor?.ImplementationInstance is TelemetryConfiguration instance)
+        {
+            Attach(instance);
+            return;
+        }
+
+        services.AddSingleton<ITelemetryModule, HealthCheckTelemetryModule>();
+    }
+
+    internal static void Attach(TelemetryConfiguration config)
+    {
+        config.TelemetryProcessorChainBuilder
+            .Use(next => new HealthCheckTelemetryFilter(next))
+            .Build();
+    }
+}
+
+internal sealed class HealthCheckTelemetryModule : ITelemetryModule
+{
+    public void Initialize(TelemetryConfiguration configuration)
+    {
+        configuration.TelemetryProcessorChainBuilder.Use(next => new HealthCheckTelemetryFilter(next));
+    }
+}

backend/CPS.ComplexCases.API.HttpTelemetry/Startup.cs

@@ -24,6 +24,8 @@ public void Configure(WebJobsBuilderContext context, IWebJobsBuilder builder)
         builder.AddExtension<HttpTelemetryExtensionConfigProvider>();
         builder.Services.AddSingleton<ITelemetryInitializer, HttpTelemetryInitializer>();
         builder.Services.AddHttpContextAccessor();
+        // Runs in the Functions host process. The worker ITelemetryProcessor cannot see host Request/Invoke telemetry.
+        HealthCheckTelemetryHostRegistration.Register(builder.Services);
     }
 }
 

backend/CPS.ComplexCases.API/Attributes/HttpTelemetryAttribute.cs

@@ -1,6 +1,6 @@
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 
-[assembly: ExtensionInformation("CPS.ComplexCases.API.HttpTelemetry", "1.0.41")]
+[assembly: ExtensionInformation("CPS.ComplexCases.API.HttpTelemetry", "1.0.42")]
 namespace CPS.ComplexCases.API.Attributes
 {
     [AttributeUsage(AttributeTargets.Parameter)]

backend/CPS.ComplexCases.API/CPS.ComplexCases.API.csproj

@@ -16,8 +16,8 @@
     <PackageReference Include="Aspose.Imaging" Version="25.2.0" />
     <PackageReference Include="Aspose.PDF.Drawing" Version="25.1.0" />
     <PackageReference Include="Aspose.Slides.NET" Version="25.2.0" />
-    <PackageReference Include="Aspose.Words" Version="25.2.0" />    
-    <PackageReference Include="Ardalis.SmartEnum" Version="8.2.0" />    
+    <PackageReference Include="Aspose.Words" Version="25.2.0" />
+    <PackageReference Include="Ardalis.SmartEnum" Version="8.2.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.27.0" />
     <PackageReference Include="FluentValidation" Version="11.11.0" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.10.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.5" />
-    <PackageReference Include="CPS.ComplexCases.API.HttpTelemetry" Version="1.0.41" />
+    <PackageReference Include="CPS.ComplexCases.API.HttpTelemetry" Version="1.0.42" />
     <PackageReference Include="ThrottlingTroll.AzureFunctions" Version="9.1.0" />
   </ItemGroup>
   <ItemGroup>
@@ -68,4 +68,4 @@
     <None Include="SourceFiles/SecurityGroupMappings.PreProd.json" CopyToOutputDirectory="Always" />
     <None Include="SourceFiles/SecurityGroupMappings.Production.json" CopyToOutputDirectory="Always" />
   </ItemGroup>
-</Project>
+</Project>

backend/CPS.ComplexCases.Common.Tests/Unit/Telemetry/HealthCheckTelemetryFilterTests.cs

@@ -16,11 +16,15 @@ public HealthCheckTelemetryFilterTests()
         _sut = new HealthCheckTelemetryFilter(_next.Object);
     }
 
-    [Fact]
-    public void Process_FiltersRequest_WhenFunctionNameIsStatus()
+    [Theory]
+    [InlineData("Status")]
+    [InlineData("Functions.Status")]
+    [InlineData("functions.status")]
+    [InlineData(" Functions.Status ")]
+    public void Process_FiltersRequest_WhenFunctionNameIsStatus(string functionName)
     {
         var request = new RequestTelemetry { Name = "GetCase" };
-        request.Properties["AzureFunctions_FunctionName"] = "Status";
+        request.Properties["AzureFunctions_FunctionName"] = functionName;
 
         AssertFiltered(request);
     }
@@ -58,6 +62,7 @@ public void Process_FiltersRequest_WhenUrlIsPeriodicHealthEndpoint(string url)
 
     [Theory]
     [InlineData("Status")]
+    [InlineData("Functions.Status")]
     [InlineData("GET /api/status")]
     [InlineData("GET /api/health")]
     public void Process_FiltersRequest_WhenNameIsPeriodicHealthEndpoint(string name)
@@ -83,6 +88,8 @@ public void Process_FiltersDependency_WhenDataIsPeriodicHealthEndpoint(string da
     }
 
     [Theory]
+    [InlineData("Status")]
+    [InlineData("Functions.Status")]
     [InlineData("GET /api/status")]
     [InlineData("GET /api/health")]
     [InlineData("/api/status")]
@@ -109,6 +116,7 @@ public void Process_FiltersDependency_WhenTargetIsPeriodicHealthEndpoint()
 
     [Theory]
     [InlineData("Status")]
+    [InlineData("Functions.Status")]
     [InlineData("GET /api/status")]
     [InlineData("GET /api/health")]
     public void Process_FiltersDependency_WhenOperationNameIsPeriodicHealthEndpoint(string operationName)
@@ -139,6 +147,15 @@ public void Process_DoesNotFilterRequest_WhenPathIsTransferStatus()
         AssertPassedThrough(request);
     }
 
+    [Fact]
+    public void Process_DoesNotFilterRequest_WhenFunctionNameIsPrefixedTransferStatus()
+    {
+        var request = new RequestTelemetry { Name = "GetTransferStatus" };
+        request.Properties["AzureFunctions_FunctionName"] = "Functions.GetTransferStatus";
+
+        AssertPassedThrough(request);
+    }
+
     [Fact]
     public void Process_DoesNotFilterDependency_WhenDataIsTransferStatus()
     {
@@ -154,6 +171,16 @@ public void Process_DoesNotFilterDependency_WhenDataIsTransferStatus()
         AssertPassedThrough(dependency);
     }
 
+    [Fact]
+    public void Process_DoesNotFilterDependency_WhenNameIsInvokeWithoutHealthOperation()
+    {
+        AssertPassedThrough(new DependencyTelemetry
+        {
+            Name = "Invoke",
+            Type = "InProc"
+        });
+    }
+
     [Fact]
     public void Process_DoesNotFilterDependency_WhenUnrelatedToHealthEndpoints()
     {

backend/CPS.ComplexCases.Common/Telemetry/HealthCheckTelemetryFilter.cs

@@ -2,7 +2,11 @@
 using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.ApplicationInsights.Extensibility;
 
+#if HOST_TELEMETRY
+namespace CPS.ComplexCases.API.HttpTelemetry;
+#else
 namespace CPS.ComplexCases.Common.Telemetry;
+#endif
 
 public class HealthCheckTelemetryFilter(ITelemetryProcessor next) : ITelemetryProcessor
 {
@@ -13,6 +17,7 @@ public class HealthCheckTelemetryFilter(ITelemetryProcessor next) : ITelemetryPr
     ];
 
     private const string StatusFunctionName = "Status";
+    private const string FunctionsPrefix = "Functions.";
 
     private readonly ITelemetryProcessor _next = next;
 
@@ -58,15 +63,28 @@ private static bool ShouldFilter(ITelemetry item)
         if (item is DependencyTelemetry dependency)
         {
             return IsPeriodicHealthProbeValue(dependency.Data)
-                || IsPeriodicHealthProbeValue(dependency.Name)
+                || IsPeriodicHealthOperation(dependency.Name)
                 || IsPeriodicHealthProbeValue(dependency.Target);
         }
 
         return false;
     }
 
-    private static bool IsPeriodicHealthFunctionName(string? name) =>
-        string.Equals(name, StatusFunctionName, StringComparison.OrdinalIgnoreCase);
+    private static bool IsPeriodicHealthFunctionName(string? name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+        {
+            return false;
+        }
+
+        var trimmed = name.Trim();
+        if (trimmed.StartsWith(FunctionsPrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            trimmed = trimmed[FunctionsPrefix.Length..];
+        }
+
+        return string.Equals(trimmed, StatusFunctionName, StringComparison.OrdinalIgnoreCase);
+    }
 
     private static bool IsPeriodicHealthOperation(string? name) =>
         IsPeriodicHealthFunctionName(name) || IsPeriodicHealthProbeValue(name);