Edge Agent / Edge Hub: Bump prometheus versions to 4.2.0 (#5388)

* bump to 5.0.0
Azure · Aug 20, 2021 · 842c8c3 · 842c8c3
1 parent 5b21da9
commit 842c8c3
Show file tree

Hide file tree

Showing 53 changed files with 81 additions and 25 deletions.
diff --git a/Microsoft.Azure.Devices.Edge.sln b/Microsoft.Azure.Devices.Edge.sln
@@ -231,6 +231,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeX509AuthDownstreamDevic
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumberLogger", "test\modules\NumberLogger\NumberLogger.csproj", "{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "edge-util", "edge-util", "{4EE5D86E-5FC8-40DF-9ACD-6046894FA9C2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{274805E4-674A-419A-A30D-314241C16BCD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Devices.Edge.Util.Metrics", "edge-util\src\Microsoft.Azure.Devices.Edge.Util.Metrics\Microsoft.Azure.Devices.Edge.Util.Metrics.csproj", "{67E2BE95-CE65-4531-8F14-E77C28DF1B80}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CheckInBuild|Any CPU = CheckInBuild|Any CPU
@@ -684,6 +690,12 @@ Global
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -776,6 +788,8 @@ Global
 		{7546DB89-643A-477F-AEE3-FA05BDCE4ACD} = {A6D8677F-DB76-459E-B6DE-110AFCEF7F08}
 		{9E809F78-0EFF-4860-94D1-8D0EF1A9C1F1} = {A6D8677F-DB76-459E-B6DE-110AFCEF7F08}
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8} = {F921339B-32F9-4BF3-B364-2DB01FA2F1A1}
+		{274805E4-674A-419A-A30D-314241C16BCD} = {4EE5D86E-5FC8-40DF-9ACD-6046894FA9C2}
+		{67E2BE95-CE65-4531-8F14-E77C28DF1B80} = {274805E4-674A-419A-A30D-314241C16BCD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D71830F5-3AF5-46B4-8A9E-1DCE4F2253AC}

diff --git a/...rc/Microsoft.Azure.Devices.Edge.Agent.Core/Microsoft.Azure.Devices.Edge.Agent.Core.csproj b/...rc/Microsoft.Azure.Devices.Edge.Agent.Core/Microsoft.Azure.Devices.Edge.Agent.Core.csproj
@@ -20,6 +20,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\edge-util\src\Microsoft.Azure.Devices.Edge.Storage\Microsoft.Azure.Devices.Edge.Storage.csproj" />
     <ProjectReference Include="..\..\..\edge-util\src\Microsoft.Azure.Devices.Edge.Util\Microsoft.Azure.Devices.Edge.Util.csproj" />
+    <ProjectReference Include="..\..\..\edge-util\src\Microsoft.Azure.Devices.Edge.Util.Metrics\Microsoft.Azure.Devices.Edge.Util.Metrics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/.../Microsoft.Azure.Devices.Edge.Hub.Service/Microsoft.Azure.Devices.Edge.Hub.Service.csproj b/.../Microsoft.Azure.Devices.Edge.Hub.Service/Microsoft.Azure.Devices.Edge.Hub.Service.csproj
@@ -33,8 +33,13 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
-    <PackageReference Include="prometheus-net" Version="3.4.0" />
-	  <PackageReference Include="prometheus-net.AspNetCore" Version="3.4.0" />
+
+    <!-- 
+      Prometheus version should not go below 4.2.0 or there will be a dll
+      misconfiguration issue.
+    -->
+    <PackageReference Include="prometheus-net" Version="4.2.0" />
+	  <PackageReference Include="prometheus-net.AspNetCore" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...-hub/src/Microsoft.Azure.Devices.Routing.Core/Microsoft.Azure.Devices.Routing.Core.csproj b/...-hub/src/Microsoft.Azure.Devices.Routing.Core/Microsoft.Azure.Devices.Routing.Core.csproj
@@ -87,6 +87,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\edge-util\src\Microsoft.Azure.Devices.Edge.Util\Microsoft.Azure.Devices.Edge.Util.csproj" />
+    <ProjectReference Include="..\..\..\edge-util\src\Microsoft.Azure.Devices.Edge.Util.Metrics\Microsoft.Azure.Devices.Edge.Util.Metrics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/edge-modules/SimulatedTemperatureSensor/src/Program.cs b/edge-modules/SimulatedTemperatureSensor/src/Program.cs
@@ -16,6 +16,7 @@ namespace SimulatedTemperatureSensor
     using Microsoft.Extensions.Configuration;
     using Newtonsoft.Json;
     using ExponentialBackoff = Microsoft.Azure.Devices.Edge.Util.TransientFaultHandling.ExponentialBackoff;
+    using TransportType = Microsoft.Azure.Devices.Client.TransportType;
 
     class Program
     {

diff --git a/edge-modules/azure-monitor/src/Microsoft.Azure.Devices.Edge.Azure.Monitor.csproj b/edge-modules/azure-monitor/src/Microsoft.Azure.Devices.Edge.Azure.Monitor.csproj
@@ -25,20 +25,21 @@
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
 
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="[3.1.5]" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[3.1.5]" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[3.1.5]" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[3.1.5]" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="[3.1.5]" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.5]" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+
     <PackageReference Include="System.Runtime.Loader" Version="[4.3.0]" />
 
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
 
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
 
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="[3.1.5,)" />
     <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.13.1" />
   </ItemGroup>
 

diff --git a/...les/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/ModuleClientCache.cs b/...les/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/ModuleClientCache.cs
@@ -53,7 +53,7 @@ public async Task<ModuleClient> GetOrCreateAsync()
 
         async Task<ModuleClient> CreateModuleClient()
         {
-            ModuleClient moduleClient = await ModuleClient.CreateFromEnvironmentAsync(TransportType.Mqtt_Tcp_Only);
+            ModuleClient moduleClient = await ModuleClient.CreateFromEnvironmentAsync(TransportType.Amqp_Tcp_Only);
 
             moduleClient.ProductInfo = "Microsoft.Azure.WebJobs.Extensions.EdgeHub";
             return moduleClient;

diff --git a/edge-modules/iotedge-diagnostics-dotnet/IotedgeDiagnosticsDotnet.csproj b/edge-modules/iotedge-diagnostics-dotnet/IotedgeDiagnosticsDotnet.csproj
@@ -15,13 +15,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.27.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="ProxyLib" Version="1.0.1" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>

diff --git a/...e.Devices.Edge.Util/metrics/BaseMetric.cs → ...e.Devices.Edge.Util.Metrics/BaseMetric.cs b/...e.Devices.Edge.Util/metrics/BaseMetric.cs → ...e.Devices.Edge.Util.Metrics/BaseMetric.cs
diff --git a/...Devices.Edge.Util/metrics/DurationUnit.cs → ...Devices.Edge.Util.Metrics/DurationUnit.cs b/...Devices.Edge.Util/metrics/DurationUnit.cs → ...Devices.Edge.Util.Metrics/DurationUnit.cs
diff --git a/...Devices.Edge.Util/metrics/IEdgeMetrics.cs → ...Devices.Edge.Util.Metrics/IEdgeMetrics.cs b/...Devices.Edge.Util/metrics/IEdgeMetrics.cs → ...Devices.Edge.Util.Metrics/IEdgeMetrics.cs
diff --git a/...ices.Edge.Util/metrics/IMetricsCounter.cs → ...ices.Edge.Util.Metrics/IMetricsCounter.cs b/...ices.Edge.Util/metrics/IMetricsCounter.cs → ...ices.Edge.Util.Metrics/IMetricsCounter.cs
diff --git a/...ces.Edge.Util/metrics/IMetricsDuration.cs → ...ces.Edge.Util.Metrics/IMetricsDuration.cs b/...ces.Edge.Util/metrics/IMetricsDuration.cs → ...ces.Edge.Util.Metrics/IMetricsDuration.cs
diff --git a/...evices.Edge.Util/metrics/IMetricsGauge.cs → ...evices.Edge.Util.Metrics/IMetricsGauge.cs b/...evices.Edge.Util/metrics/IMetricsGauge.cs → ...evices.Edge.Util.Metrics/IMetricsGauge.cs
diff --git a/...es.Edge.Util/metrics/IMetricsHistogram.cs → ...es.Edge.Util.Metrics/IMetricsHistogram.cs b/...es.Edge.Util/metrics/IMetricsHistogram.cs → ...es.Edge.Util.Metrics/IMetricsHistogram.cs
diff --git a/...ces.Edge.Util/metrics/IMetricsListener.cs → ...ces.Edge.Util.Metrics/IMetricsListener.cs b/...ces.Edge.Util/metrics/IMetricsListener.cs → ...ces.Edge.Util.Metrics/IMetricsListener.cs
diff --git a/...ces.Edge.Util/metrics/IMetricsProvider.cs → ...ces.Edge.Util.Metrics/IMetricsProvider.cs b/...ces.Edge.Util/metrics/IMetricsProvider.cs → ...ces.Edge.Util.Metrics/IMetricsProvider.cs
diff --git a/...evices.Edge.Util/metrics/IMetricsTimer.cs → ...evices.Edge.Util.Metrics/IMetricsTimer.cs b/...evices.Edge.Util/metrics/IMetricsTimer.cs → ...evices.Edge.Util.Metrics/IMetricsTimer.cs
diff --git a/...zure.Devices.Edge.Util/metrics/Metrics.cs → ...zure.Devices.Edge.Util.Metrics/Metrics.cs b/...zure.Devices.Edge.Util/metrics/Metrics.cs → ...zure.Devices.Edge.Util.Metrics/Metrics.cs
diff --git a/...evices.Edge.Util/metrics/MetricsConfig.cs → ...evices.Edge.Util.Metrics/MetricsConfig.cs b/...evices.Edge.Util/metrics/MetricsConfig.cs → ...evices.Edge.Util.Metrics/MetricsConfig.cs
diff --git a/...ces.Edge.Util/metrics/MetricsConstants.cs → ...ces.Edge.Util.Metrics/MetricsConstants.cs b/...ces.Edge.Util/metrics/MetricsConstants.cs → ...ces.Edge.Util.Metrics/MetricsConstants.cs
diff --git a/...ices.Edge.Util/metrics/MetricsListener.cs → ...ices.Edge.Util.Metrics/MetricsListener.cs b/...ices.Edge.Util/metrics/MetricsListener.cs → ...ices.Edge.Util.Metrics/MetricsListener.cs
diff --git a/...dge.Util/metrics/MetricsListenerConfig.cs → ...dge.Util.Metrics/MetricsListenerConfig.cs b/...dge.Util/metrics/MetricsListenerConfig.cs → ...dge.Util.Metrics/MetricsListenerConfig.cs
diff --git a/...icrosoft.Azure.Devices.Edge.Util.Metrics/Microsoft.Azure.Devices.Edge.Util.Metrics.csproj b/...icrosoft.Azure.Devices.Edge.Util.Metrics/Microsoft.Azure.Devices.Edge.Util.Metrics.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\netstandardVersion.props" />
+
+  <PropertyGroup>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <Configurations>Debug;Release;CheckInBuild</Configurations>
+    <HighEntropyVA>true</HighEntropyVA>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="App.Metrics" Version="3.0.0" />
+    <PackageReference Include="App.Metrics.Formatters.Prometheus" Version="3.0.0" />
+
+    <!-- 
+      Prometheus version should not go below 4.2.0 or there will be a dll
+      misconfiguration issue.
+    -->
+    <PackageReference Include="prometheus-net" Version="4.2.0" />
+    <PackageReference Include="prometheus-net.AspNetCore" Version="4.2.0" />
+
+    <ProjectReference Include="..\Microsoft.Azure.Devices.Edge.Util\Microsoft.Azure.Devices.Edge.Util.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\..\stylecop.json" Link="stylecop.json" />
+  </ItemGroup>
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>..\..\..\stylecop.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <Import Project="..\..\..\stylecop.props" />
+</Project>
diff --git a/...Util/metrics/appMetrics/MetricsCounter.cs → ...Util.Metrics/appMetrics/MetricsCounter.cs b/...Util/metrics/appMetrics/MetricsCounter.cs → ...Util.Metrics/appMetrics/MetricsCounter.cs
diff --git a/...til/metrics/appMetrics/MetricsDuration.cs → ...til.Metrics/appMetrics/MetricsDuration.cs b/...til/metrics/appMetrics/MetricsDuration.cs → ...til.Metrics/appMetrics/MetricsDuration.cs
diff --git a/...e.Util/metrics/appMetrics/MetricsGauge.cs → ...e.Util.Metrics/appMetrics/MetricsGauge.cs b/...e.Util/metrics/appMetrics/MetricsGauge.cs → ...e.Util.Metrics/appMetrics/MetricsGauge.cs
diff --git a/...il/metrics/appMetrics/MetricsHistogram.cs → ...il.Metrics/appMetrics/MetricsHistogram.cs b/...il/metrics/appMetrics/MetricsHistogram.cs → ...il.Metrics/appMetrics/MetricsHistogram.cs
diff --git a/...til/metrics/appMetrics/MetricsProvider.cs → ...til.Metrics/appMetrics/MetricsProvider.cs b/...til/metrics/appMetrics/MetricsProvider.cs → ...til.Metrics/appMetrics/MetricsProvider.cs
diff --git a/...e.Util/metrics/appMetrics/MetricsTimer.cs → ...e.Util.Metrics/appMetrics/MetricsTimer.cs b/...e.Util/metrics/appMetrics/MetricsTimer.cs → ...e.Util.Metrics/appMetrics/MetricsTimer.cs
diff --git a/...til/metrics/nullMetrics/NullDisposable.cs → ...til.Metrics/nullMetrics/NullDisposable.cs b/...til/metrics/nullMetrics/NullDisposable.cs → ...til.Metrics/nullMetrics/NullDisposable.cs
diff --git a/...metrics/nullMetrics/NullMetricsCounter.cs → ...Metrics/nullMetrics/NullMetricsCounter.cs b/...metrics/nullMetrics/NullMetricsCounter.cs → ...Metrics/nullMetrics/NullMetricsCounter.cs
diff --git a/...etrics/nullMetrics/NullMetricsDuration.cs → ...etrics/nullMetrics/NullMetricsDuration.cs b/...etrics/nullMetrics/NullMetricsDuration.cs → ...etrics/nullMetrics/NullMetricsDuration.cs
diff --git a/...l/metrics/nullMetrics/NullMetricsGauge.cs → ...l.Metrics/nullMetrics/NullMetricsGauge.cs b/...l/metrics/nullMetrics/NullMetricsGauge.cs → ...l.Metrics/nullMetrics/NullMetricsGauge.cs
diff --git a/...trics/nullMetrics/NullMetricsHistogram.cs → ...trics/nullMetrics/NullMetricsHistogram.cs b/...trics/nullMetrics/NullMetricsHistogram.cs → ...trics/nullMetrics/NullMetricsHistogram.cs
diff --git a/...etrics/nullMetrics/NullMetricsListener.cs → ...etrics/nullMetrics/NullMetricsListener.cs b/...etrics/nullMetrics/NullMetricsListener.cs → ...etrics/nullMetrics/NullMetricsListener.cs
diff --git a/...etrics/nullMetrics/NullMetricsProvider.cs → ...etrics/nullMetrics/NullMetricsProvider.cs b/...etrics/nullMetrics/NullMetricsProvider.cs → ...etrics/nullMetrics/NullMetricsProvider.cs
diff --git a/...l/metrics/nullMetrics/NullMetricsTimer.cs → ...l.Metrics/nullMetrics/NullMetricsTimer.cs b/...l/metrics/nullMetrics/NullMetricsTimer.cs → ...l.Metrics/nullMetrics/NullMetricsTimer.cs
diff --git a/.../metrics/prometheus.net/MetricsCounter.cs → ....Metrics/prometheus.net/MetricsCounter.cs b/.../metrics/prometheus.net/MetricsCounter.cs → ....Metrics/prometheus.net/MetricsCounter.cs
diff --git a/...metrics/prometheus.net/MetricsDuration.cs → ...Metrics/prometheus.net/MetricsDuration.cs b/...metrics/prometheus.net/MetricsDuration.cs → ...Metrics/prometheus.net/MetricsDuration.cs
diff --git a/...il/metrics/prometheus.net/MetricsGauge.cs → ...il.Metrics/prometheus.net/MetricsGauge.cs b/...il/metrics/prometheus.net/MetricsGauge.cs → ...il.Metrics/prometheus.net/MetricsGauge.cs
diff --git a/...etrics/prometheus.net/MetricsHistogram.cs → ...etrics/prometheus.net/MetricsHistogram.cs b/...etrics/prometheus.net/MetricsHistogram.cs → ...etrics/prometheus.net/MetricsHistogram.cs
diff --git a/...metrics/prometheus.net/MetricsListener.cs → ...Metrics/prometheus.net/MetricsListener.cs b/...metrics/prometheus.net/MetricsListener.cs → ...Metrics/prometheus.net/MetricsListener.cs
diff --git a/...metrics/prometheus.net/MetricsProvider.cs → ...Metrics/prometheus.net/MetricsProvider.cs b/...metrics/prometheus.net/MetricsProvider.cs → ...Metrics/prometheus.net/MetricsProvider.cs
diff --git a/...il/metrics/prometheus.net/MetricsTimer.cs → ...il.Metrics/prometheus.net/MetricsTimer.cs b/...il/metrics/prometheus.net/MetricsTimer.cs → ...il.Metrics/prometheus.net/MetricsTimer.cs
diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Util/Microsoft.Azure.Devices.Edge.Util.csproj b/edge-util/src/Microsoft.Azure.Devices.Edge.Util/Microsoft.Azure.Devices.Edge.Util.csproj
@@ -10,17 +10,16 @@
 
   <ItemGroup>
     <PackageReference Include="App.Metrics" Version="3.0.0" />
-    <PackageReference Include="App.Metrics.Formatters.Prometheus" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Nito.AsyncEx" Version="5.0.0" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
-    <PackageReference Include="prometheus-net.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="prometheus-net" Version="3.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/scripts/windows/test/Test-Branch.ps1 b/scripts/windows/test/Test-Branch.ps1
@@ -74,7 +74,7 @@ Write-Host "Running tests in all test projects with filter '$Filter' and $BuildC
 $testProjectRunSerially = @( "Microsoft.Azure.Devices.Edge.Agent.Docker.Test.dll" )
 $testProjectDllsRunSerially = @()
 $testProjectsDlls = ""
-foreach ($testDll in (Get-ChildItem $BuildBinariesDirectory -Include $SUFFIX -Recurse)) {
+foreach ($testDll in (Get-ChildItem "$BuildBinariesDirectory\*" -Include $SUFFIX)) {
     Write-Host "Found test project:$testDll"
 
 	if (($testProjectRunSerially | ?{ $testDll.FullName.EndsWith("\$_") }) -ne $null)

diff --git a/test/modules/DirectMethodReceiver/src/DirectMethodReceiver.cs b/test/modules/DirectMethodReceiver/src/DirectMethodReceiver.cs
@@ -12,6 +12,7 @@ namespace DirectMethodReceiver
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json.Linq;
+    using TransportType = Microsoft.Azure.Devices.Client.TransportType;
 
     class DirectMethodReceiver : IDisposable
     {

diff --git a/test/modules/DirectMethodSender/ReporterClients/EventReporterClient.cs b/test/modules/DirectMethodSender/ReporterClients/EventReporterClient.cs
@@ -10,6 +10,7 @@ namespace DirectMethodSender
     using Microsoft.Azure.Devices.Edge.ModuleUtil.TestResults;
     using Microsoft.Azure.Devices.Edge.Util;
     using Microsoft.Extensions.Logging;
+    using TransportType = Microsoft.Azure.Devices.Client.TransportType;
 
     sealed class EventReporterClient : ReporterClientBase
     {

diff --git a/test/modules/MetricsValidator/docker/linux/amd64/Dockerfile b/test/modules/MetricsValidator/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
 ARG base_tag=3.1.18-alpine3.13
-FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
+FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/test/modules/MetricsValidator/docker/linux/arm32v7/Dockerfile b/test/modules/MetricsValidator/docker/linux/arm32v7/Dockerfile
@@ -1,5 +1,5 @@
 ARG base_tag=1.0.5.13-linux-arm32v7
-FROM azureiotedge/azureiotedge-module-base:${base_tag}
+FROM azureiotedge/azureiotedge-module-base-full:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/test/modules/MetricsValidator/docker/linux/arm64v8/Dockerfile b/test/modules/MetricsValidator/docker/linux/arm64v8/Dockerfile
@@ -1,5 +1,5 @@
 ARG base_tag=1.0.5.13-linux-arm64v8
-FROM azureiotedge/azureiotedge-module-base:${base_tag}
+FROM azureiotedge/azureiotedge-module-base-full:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/test/modules/MetricsValidator/docker/windows/amd64/Dockerfile b/test/modules/MetricsValidator/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
 ARG base_tag=3.1.18-nanoserver-1809
-FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
+FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.