chore: upgrade towards net6.0 (#104)

stijnmoreels · web-flow · commit 8b19fc7d0c63 · 2022-04-25T13:52:23.000+02:00
* chore: update to netstandard2.1

* pr-add: upgrade towards net6.0

* pr-fix: update with new observability logging

* pr-fix: update with increated time-out

* pr-fix: simplified cloudevent consuming

* pr-fix: introduce test collections for stable test runs

* pr-fix: add all eventgrid integration tests under the same test collection
diff --git a/build/variables/build.yml b/build/variables/build.yml
@@ -1,4 +1,4 @@
 variables:
-  DotNet.Sdk.Version: '3.1.201'
+  DotNet.Sdk.Version: '6.0.100'
   Project: 'Arcus.BackgroundJobs'
   Vm.Image: 'ubuntu-latest'
diff --git a/src/Arcus.BackgroundJobs.AzureActiveDirectory/Arcus.BackgroundJobs.AzureActiveDirectory.csproj b/src/Arcus.BackgroundJobs.AzureActiveDirectory/Arcus.BackgroundJobs.AzureActiveDirectory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <RepositoryType>Git</RepositoryType>
@@ -18,10 +18,21 @@
     <NoWarn>NU5125;NU5048</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Arcus.EventGrid.Publishing" Version="[3.2.0, 4.0.0)" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[2.4.0, 3.0.0)" />
+    <PackageReference Include="Arcus.Security.Core" Version="[1.7.0, 2.0.0)" />
+    <PackageReference Include="Guard.Net" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="Arcus.EventGrid.Publishing" Version="[3.1.0, 4.0.0)" />
     <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[2.0.0, 3.0.0)" />
     <PackageReference Include="Arcus.Security.Core" Version="[1.6.0, 2.0.0)" />
+    <PackageReference Include="Guard.Net" Version="1.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.4.1" />
     <PackageReference Include="CronScheduler.AspNetCore" Version="3.0.1" />
     <PackageReference Include="Microsoft.Graph" Version="4.6.0" />
diff --git a/src/Arcus.BackgroundJobs.AzureAppConfiguration/Arcus.BackgroundJobs.AzureAppConfiguration.csproj b/src/Arcus.BackgroundJobs.AzureAppConfiguration/Arcus.BackgroundJobs.AzureAppConfiguration.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <RepositoryType>Git</RepositoryType>
@@ -18,9 +18,17 @@
     <NoWarn>NU5125;NU5048</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Arcus.EventGrid" Version="[3.2.0,4.0.0)" />
+    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.2.0,2.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="Arcus.EventGrid" Version="[3.0.0,4.0.0)" />
     <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.1.0,2.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="4.5.0" />
   </ItemGroup>
 
diff --git a/src/Arcus.BackgroundJobs.CloudEvents/Arcus.BackgroundJobs.CloudEvents.csproj b/src/Arcus.BackgroundJobs.CloudEvents/Arcus.BackgroundJobs.CloudEvents.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>    
+    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <RepositoryType>Git</RepositoryType>
@@ -18,7 +18,13 @@
     <NoWarn>NU5125;NU5048</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Arcus.EventGrid" Version="[3.2.0,4.0.0)" />
+    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.2.0,2.0.0)" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="Arcus.EventGrid" Version="[3.0.0,4.0.0)" />
     <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.0.1,2.0.0)" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
diff --git a/src/Arcus.BackgroundJobs.Databricks/Arcus.BackgroundJobs.Databricks.csproj b/src/Arcus.BackgroundJobs.Databricks/Arcus.BackgroundJobs.Databricks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <RepositoryType>Git</RepositoryType>
@@ -18,10 +18,19 @@
     <NoWarn>NU5125;NU5048</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[2.4.0,3.0.0)" />
+    <PackageReference Include="Arcus.Security.Core" Version="[1.7.0,2.0.0)" />
+    <PackageReference Include="CronScheduler.AspNetCore" Version="3.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[2.0.0,3.0.0)" />
     <PackageReference Include="Arcus.Security.Core" Version="[1.3.0,2.0.0)" />
     <PackageReference Include="CronScheduler.AspNetCore" Version="3.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Databricks.Client" Version="1.1.1613.2" />
   </ItemGroup>
 
diff --git a/src/Arcus.BackgroundJobs.KeyVault/Arcus.BackgroundJobs.KeyVault.csproj b/src/Arcus.BackgroundJobs.KeyVault/Arcus.BackgroundJobs.KeyVault.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <RepositoryType>Git</RepositoryType>
@@ -18,7 +18,14 @@
     <NoWarn>NU5125;NU5048</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Arcus.EventGrid" Version="[3.2.0,4.0.0)" />
+    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.2.0,2.0.0)" />
+    <PackageReference Include="Arcus.Security.Core" Version="[1.7.0,2.0.0)" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="Arcus.EventGrid" Version="[3.0.0,4.0.0)" />
     <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.0.1,2.0.0)" />
     <PackageReference Include="Arcus.Security.Core" Version="[1.4.0,2.0.0)" />
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/AppConfiguration/AutoRefreshAppConfigurationBackgroundJobTests.cs b/src/Arcus.BackgroundJobs.Tests.Integration/AppConfiguration/AutoRefreshAppConfigurationBackgroundJobTests.cs
@@ -17,6 +17,7 @@
 namespace Arcus.BackgroundJobs.Tests.Integration.AppConfiguration
 {
     [Trait("Category", "Integration")]
+    [Collection(TestCollections.Integration)]
     public class AutoRefreshAppConfigurationBackgroundJobTests
     {
         private readonly ILogger _logger;
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/Arcus.BackgroundJobs.Tests.Integration.csproj b/src/Arcus.BackgroundJobs.Tests.Integration/Arcus.BackgroundJobs.Tests.Integration.csproj
@@ -1,27 +1,23 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.EventGrid.Publishing" Version="3.2.0-preview-3" />
-    <PackageReference Include="Arcus.EventGrid.Testing" Version="3.2.0-preview-3" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.0.0" />
-    <PackageReference Include="Arcus.Testing.Logging" Version="0.2.0-preview-2" />
+    <PackageReference Include="Arcus.EventGrid.Testing" Version="3.2.0" />
+     <PackageReference Include="Arcus.Testing.Logging" Version="0.3.0" />
     <PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.3.0" />
     <PackageReference Include="Azure.Data.AppConfiguration" Version="1.1.0" />
     <PackageReference Include="Bogus" Version="29.0.2" />
-    <PackageReference Include="Guard.Net" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.10" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
 
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/AzureActiveDirectory/ClientSecretExpirationJobTests.cs b/src/Arcus.BackgroundJobs.Tests.Integration/AzureActiveDirectory/ClientSecretExpirationJobTests.cs
@@ -1,13 +1,9 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Arcus.BackgroundJobs.AzureActiveDirectory;
 using Arcus.BackgroundJobs.Tests.Integration.AzureActiveDirectory.Fixture;
 using Arcus.BackgroundJobs.Tests.Integration.Fixture;
 using Arcus.BackgroundJobs.Tests.Integration.Hosting;
-using Arcus.EventGrid;
-using Arcus.EventGrid.Contracts;
 using Arcus.Testing.Logging;
 using CloudNative.CloudEvents;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,6 +14,7 @@
 namespace Arcus.BackgroundJobs.Tests.Integration.AzureActiveDirectory
 {
     [Trait(name: "Category", value: "Integration")]
+    [Collection(TestCollections.Integration)]
     public class ClientSecretExpirationJobTests
     {
         private readonly ILogger _logger;
@@ -61,24 +58,19 @@ public async Task CheckExpiredOrAboutToExpireClientSecretsInAzureActiveDirectory
                 await using (var consumer = await TestServiceBusEventConsumer.StartNewAsync(_config, _logger))
                 {
                     // Assert
-                    EventBatch<Event> eventBatch = consumer.Consume();
-                    Assert.NotEmpty(eventBatch.Events);
-                    IEnumerable<CloudEvent> cloudEvents = eventBatch.Events.Select(ev => ev.AsCloudEvent());
-                    Assert.All(cloudEvents, ev =>
-                    {
-                        Assert.NotNull(ev.Id);
-                        Assert.True(Enum.TryParse(ev.Type, out ClientSecretExpirationEventType eventType), 
-                            $"Event should have either '{ClientSecretExpirationEventType.ClientSecretAboutToExpire}' or '{ClientSecretExpirationEventType.ClientSecretExpired}' as event type");
+                   CloudEvent cloudEvent = consumer.Consume();
+                   Assert.NotNull(cloudEvent.Id);
+                   Assert.True(Enum.TryParse(cloudEvent.Type, out ClientSecretExpirationEventType eventType),
+                       $"Event should have either '{ClientSecretExpirationEventType.ClientSecretAboutToExpire}' or '{ClientSecretExpirationEventType.ClientSecretExpired}' as event type");
 
-                        var data = ev.GetPayload<AzureApplication>();
-                        Assert.IsType<Guid>(data.KeyId);
+                   var data = cloudEvent.GetPayload<AzureApplication>();
+                   Assert.IsType<Guid>(data.KeyId);
 
-                        bool isAboutToExpire = eventType == ClientSecretExpirationEventType.ClientSecretAboutToExpire;
-                        bool isExpired = eventType == ClientSecretExpirationEventType.ClientSecretExpired;
-                        
-                        Assert.True(isAboutToExpire == (data.RemainingValidDays > 0 && data.RemainingValidDays < expirationThreshold), $"Remaining days should be between 1-{expirationThreshold - 1} when the secret is about to expire");
-                        Assert.True(isExpired == data.RemainingValidDays < 0, "Remaining days should be negative when the secret is expired");
-                    });
+                   bool isAboutToExpire = eventType == ClientSecretExpirationEventType.ClientSecretAboutToExpire;
+                   bool isExpired = eventType == ClientSecretExpirationEventType.ClientSecretExpired;
+
+                   Assert.True(isAboutToExpire == (data.RemainingValidDays > 0 && data.RemainingValidDays < expirationThreshold), $"Remaining days should be between 1-{expirationThreshold - 1} when the secret is about to expire");
+                   Assert.True(isExpired == data.RemainingValidDays < 0, "Remaining days should be negative when the secret is expired");
                 }
             }
         }
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/AzureActiveDirectory/Fixture/TestServiceBusEventConsumer.cs b/src/Arcus.BackgroundJobs.Tests.Integration/AzureActiveDirectory/Fixture/TestServiceBusEventConsumer.cs
@@ -6,6 +6,7 @@
 using Arcus.EventGrid;
 using Arcus.EventGrid.Contracts;
 using Arcus.EventGrid.Testing.Infrastructure.Hosts.ServiceBus;
+using CloudNative.CloudEvents;
 using GuardNet;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -49,17 +50,13 @@ public static async Task<TestServiceBusEventConsumer> StartNewAsync(TestConfig c
         /// <summary>
         /// Receives an event produced on the Azure Service Bus.
         /// </summary>
-        public EventBatch<Event> Consume()
+        public CloudEvent Consume()
         {
-            List<Event> eventList = new List<Event>();
-            Event receivedEvent = _serviceBusEventConsumerHost.GetReceivedEvent(
+            CloudEvent receivedEvent = _serviceBusEventConsumerHost.GetReceivedEvent(
                         data => data.Source == new Uri("https://github.com/arcus-azure/arcus.backgroundjobs"),
-                        TimeSpan.FromSeconds(300));
+                        TimeSpan.FromMinutes(8));
 
-            eventList.Add(receivedEvent);
-            EventBatch<Event> eventBatch = new EventBatch<Event>(receivedEvent.Id, eventList);
-
-            return eventBatch;
+            return receivedEvent;
         }
 
         /// <summary>
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/CloudEvents/CloudEventBackgroundJobTests.cs b/src/Arcus.BackgroundJobs.Tests.Integration/CloudEvents/CloudEventBackgroundJobTests.cs
@@ -28,6 +28,7 @@
 namespace Arcus.BackgroundJobs.Tests.Integration.CloudEvents
 {
     [Trait("Category", "Integration")]
+    [Collection(TestCollections.Integration)]
     public class CloudEventBackgroundJobTests
     {
         private const string TopicConnectionStringSecretKey = "Arcus:CloudEvents:ServiceBus:ConnectionStringWithTopic",
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/Hosting/Extensions/SecretStoreBuilderExtensions.cs b/src/Arcus.BackgroundJobs.Tests.Integration/Hosting/Extensions/SecretStoreBuilderExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Arcus.BackgroundJobs.Tests.Integration.Fixture;
 using Arcus.BackgroundJobs.Tests.Integration.Hosting;
+using Arcus.Security.Core.Caching.Configuration;
 using GuardNet;
 
 // ReSharper disable once CheckNamespace
@@ -34,7 +35,8 @@ public static SecretStoreBuilder AddAzureKeyVaultWithServicePrincipal(
                 keyVaultUri,
                 environment.TenantId,
                 servicePrincipal.ClientId,
-                servicePrincipal.ClientSecret);
+                servicePrincipal.ClientSecret,
+                CacheConfiguration.Default);
         }
     }
 }
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/KeyVault/AutoInvalidateKeyVaultSecretJobTests.cs b/src/Arcus.BackgroundJobs.Tests.Integration/KeyVault/AutoInvalidateKeyVaultSecretJobTests.cs
@@ -18,6 +18,7 @@
 namespace Arcus.BackgroundJobs.Tests.Integration.KeyVault
 {
     [Trait(name: "Category", value: "Integration")]
+    [Collection(TestCollections.Integration)]
     public class AutoInvalidateKeyVaultSecretJobTests
     {
         private readonly ILogger _logger;
@@ -75,7 +76,7 @@ public async Task NewSecretVersion_TriggersKeyVaultJob_AutoInvalidatesSecret()
                 RetryAssertion(
                     // ReSharper disable once AccessToDisposedClosure - disposal happens after retry.
                     () => cachedSecretProvider.Verify(p => p.InvalidateSecretAsync(It.Is<string>(n => n == tempSecret.Name)), Times.Once), 
-                    timeout: TimeSpan.FromMinutes(6),
+                    timeout: TimeSpan.FromMinutes(8),
                     interval: TimeSpan.FromMilliseconds(500));
             }
         }
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/KeyVault/AutoRestartServiceBusMessagePumpOnRotatedCredentialsJobTests.cs b/src/Arcus.BackgroundJobs.Tests.Integration/KeyVault/AutoRestartServiceBusMessagePumpOnRotatedCredentialsJobTests.cs
@@ -25,6 +25,7 @@
 namespace Arcus.BackgroundJobs.Tests.Integration.KeyVault
 {
     [Trait("Category", "Integration")]
+    [Collection(TestCollections.Integration)]
     public class AutoRestartServiceBusMessagePumpOnRotatedCredentialsJobTests
     {
         private const string ConnectionStringSecretKey = "ARCUS_KEYVAULT_SECRETNEWVERSIONCREATED_CONNECTIONSTRING",
diff --git a/src/Arcus.BackgroundJobs.Tests.Integration/TestCollections.cs b/src/Arcus.BackgroundJobs.Tests.Integration/TestCollections.cs
@@ -0,0 +1,13 @@
+﻿namespace Arcus.BackgroundJobs.Tests.Integration
+{
+    /// <summary>
+    /// Represents all the test integration collections.
+    /// </summary>
+    public static class TestCollections
+    {
+        /// <summary>
+        /// Gets the test collection for the integration test.
+        /// </summary>
+        public const string Integration = nameof(Integration);
+    }
+}
diff --git a/src/Arcus.BackgroundJobs.Tests.Unit/Arcus.BackgroundJobs.Tests.Unit.csproj b/src/Arcus.BackgroundJobs.Tests.Unit/Arcus.BackgroundJobs.Tests.Unit.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Testing.Logging" Version="0.2.0-preview-1" />
+    <PackageReference Include="Arcus.Testing.Logging" Version="0.3.0" />
     <PackageReference Include="Bogus" Version="29.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
diff --git a/src/Arcus.BackgroundJobs.Tests.Unit/Databricks/DatabricksJobMetricJobTests.cs b/src/Arcus.BackgroundJobs.Tests.Unit/Databricks/DatabricksJobMetricJobTests.cs
@@ -52,7 +52,7 @@ public async Task ExecuteJob_WithDatabricksClientWithFinishedJobs_ReportsJobsAsM
             Assert.NotEmpty(spyLogger.Messages);
             Assert.Equal(
                 runs.Count(),
-                spyLogger.Messages.Count(m => m.StartsWith("Metric Databricks Job Completed")));
+                spyLogger.Messages.Count(m => m.StartsWith("Databricks Job Completed")));
         }
 
         private static IEnumerable<Run> CreateRandomRuns(DateTimeOffset startWindow, DateTimeOffset endWindow)
diff --git a/src/Arcus.BackgroundJobs.Tests.Unit/Databricks/ILoggerExtensionsTests.cs b/src/Arcus.BackgroundJobs.Tests.Unit/Databricks/ILoggerExtensionsTests.cs
@@ -75,7 +75,7 @@ public void LogMetricFinishedJobOutcome_WithRunOutcome_LogsRunOutcome()
 
             // Assert
             Assert.Single(spyLogger.Messages, msg => msg.Contains(resultState.ToString(), StringComparison.OrdinalIgnoreCase));
-            Assert.Single(spyLogger.Messages, msg => msg.StartsWith("Metric " + metricName));
+            Assert.Single(spyLogger.Messages, msg => msg.Contains(metricName));
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`namespace Arcus.BackgroundJobs.Tests.Integration.AppConfiguration`
`18`	`18`	`{`
`19`	`19`	`[Trait("Category", "Integration")]`
	`20`	`+ [Collection(TestCollections.Integration)]`
`20`	`21`	`public class AutoRefreshAppConfigurationBackgroundJobTests`
`21`	`22`	`{`
`22`	`23`	`private readonly ILogger _logger;`