Migrate to .NET Core 3.1 (#718)

* Build everything for .NET Core 3.0.0 Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Update everything to .NET Core 3.0.0 Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * WIP Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Build everything for .NET Core 3.0.0 Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Update everything to .NET Core 3.0.0 Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * WIP Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Update CronScheduler.AspNetCor Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Initial buildable version Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Fix broken dependencies and use ILogger<T> Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Bring back OpenAPI docs! * Fix Dockerfile * Finalize merge Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Use 3.0.0 as RuntimeFrameworkVersion Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Re-add parameter names Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Provide new Swagger UI Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Fix build Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Update dependencies Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Code quality Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Hook in Serilog Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Remove legacy * Use netcoreapp3.1 LTS * Use 3.1.100 SDK in builds * Install correct version * Fix configuration Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Revert to LogLevel Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> * Document traces for Application Insights * Add issue number & docs for traces * Update badges * Dcoument exploring APIS * Fix order * Use badge instead * Small fix for changelog * Fix markdown styling * Fix broken API endpoints * Wire-up Serilog * Tweak logs * Add request logging * Cleanup for code quality
tomkerkhove · Dec 18, 2019 · b684559 · b684559
1 parent 4134462
commit b684559
Show file tree

Hide file tree

Showing 96 changed files with 406 additions and 367 deletions.
diff --git a/build/azure-devops/agents-scraper-release-official.yml b/build/azure-devops/agents-scraper-release-official.yml
@@ -4,7 +4,7 @@ resources:
 trigger: none
 pr: none
 variables:
-  DotNet.SDK.Version: '2.2.402'
+  DotNet.SDK.Version: '3.1.100'
   Image.Name: 'tomkerkhove/promitor-agent-scraper'
   Image.TaggedName: '$(Image.Name):$(Image.Version)'
   Release.TagName: '$(Build.BuildNumber)'

diff --git a/build/azure-devops/agents-scraper-release-preview.yml b/build/azure-devops/agents-scraper-release-preview.yml
@@ -4,7 +4,7 @@ resources:
 trigger: none
 pr: none
 variables:
-  DotNet.SDK.Version: '2.2.402'
+  DotNet.SDK.Version: '3.1.100'
   Image.Name: 'tomkerkhove/promitor-agent-scraper'
   Image.TaggedName: '$(Image.Name):$(Image.Version)'
   Release.TagName: '$(Build.BuildNumber)'

diff --git a/build/azure-devops/scraper-ci.yml b/build/azure-devops/scraper-ci.yml
@@ -14,7 +14,7 @@ pr:
     - charts/promitor-agent-scraper/*
     - deploy/automation/docker-hub/ci/* # Add Docker Hub bot here to trigger it for testing sake
 variables:
-  DotNet.SDK.Version: '2.2.402'
+  DotNet.SDK.Version: '3.1.100'
   DotNet.Configuration: 'release'
   Image.Name: 'tomkerkhove/promitor-agent-scraper-ci'
   Image.TaggedName: '$(Image.Name):$(Build.BuildNumber)'
@@ -101,6 +101,10 @@ stages:
      pool:
        vmImage: ubuntu-16.04
      steps:
+     - task: DotNetCoreInstaller@0
+       displayName: 'Import .Net Core Sdk ($(DotNet.Sdk.Version))'
+       inputs:
+         version: '$(DotNet.Sdk.Version)'
      - task: DotNetCoreCLI@2
        displayName: 'dotnet test'
        inputs:

diff --git a/changelog/content/experimental/unreleased.md b/changelog/content/experimental/unreleased.md
@@ -6,6 +6,8 @@ version:
 ---
 
 - {{% tag added %}} Azure SQL Database Scraper ([docs](https://promitor.io/configuration/v1.x/metrics/sql-database) | [#317](https://github.com/tomkerkhove/promitor/issues/317))
-- {{% tag added %}} OpenAPI v3.0 support (`/api/v1/docs.json` | [#734](https://github.com/tomkerkhove/promitor/issues/734))
-- {{% tag added %}} OpenAPI UI based on OpenAPI v3.0 (`/api/docs/` | [#734](https://github.com/tomkerkhove/promitor/issues/734))
+- {{% tag added %}} OpenAPI v3.0 support (`/api/v1/docs.json` | [docs](ttps://promitor.io/operations/#exploring-our-rest-apis) | [#734](https://github.com/tomkerkhove/promitor/issues/734))
+- {{% tag added %}} OpenAPI UI based on OpenAPI v3.0 (`/api/docs/` | [docs](ttps://promitor.io/operations/#exploring-our-rest-apis) | [#734](https://github.com/tomkerkhove/promitor/issues/734))
+- {{% tag added %}} Provide traces in Azure Application Insights ([docs](https://promitor.io/configuration/v1.x/runtime#azure-application-insights) | [#29](https://github.com/tomkerkhove/promitor/issues/29))
 - {{% tag changed %}} Helm Chart creates apps/v1 Deployment instead of v1beta1 ([#669](https://github.com/tomkerkhove/promitor/issues/669))
+- {{% tag changed %}} Provide exceptions in Azure Application Insights for all exceptions, not just scraping ([docs](https://promitor.io/configuration/v1.x/runtime#azure-application-insights) | [#29](https://github.com/tomkerkhove/promitor/issues/29))
diff --git a/docs/configuration/v0.x/metrics/generic-azure-resource.md b/docs/configuration/v0.x/metrics/generic-azure-resource.md
@@ -3,7 +3,7 @@ layout: default
 title: Generic Azure Resource Declaration
 ---
 
-## Generic Azure Resource - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.2.0-green.svg)
+## Generic Azure Resource - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.2-green.svg)
 
 You can declare to scrape a generic Azure resource via the `Generic` resource type.
 

diff --git a/docs/configuration/v0.x/metrics/service-bus-queue.md b/docs/configuration/v0.x/metrics/service-bus-queue.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Service Bus Queue Declaration
 ---
 
-## Azure Service Bus Queue - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.1.0-green.svg)
+## Azure Service Bus Queue - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.1-green.svg)
 
 You can declare to scrape an Azure Service Bus Queue via the `ServiceBusQueue`
 resource type.

diff --git a/docs/configuration/v1.x/metrics/container-instances.md b/docs/configuration/v1.x/metrics/container-instances.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Container Instances Declaration
 ---
 
-## Azure Container Instances - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Container Instances - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an Azure Container Instances via the `ContainerInstance`
 resource type.

diff --git a/docs/configuration/v1.x/metrics/container-registry.md b/docs/configuration/v1.x/metrics/container-registry.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Container Registry Declaration
 ---
 
-## Azure Container Registry - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Container Registry - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an Azure Container Registry via the `ContainerRegistry`
 resource type.

diff --git a/docs/configuration/v1.x/metrics/cosmos-db.md b/docs/configuration/v1.x/metrics/cosmos-db.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Cosmos Db Declaration
 ---
 
-## Azure Cosmos Db - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Cosmos Db - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape Cosmos Db via the `CosmosDb` resource type.
 

diff --git a/docs/configuration/v1.x/metrics/generic-azure-resource.md b/docs/configuration/v1.x/metrics/generic-azure-resource.md
@@ -3,7 +3,7 @@ layout: default
 title: Generic Azure Resource Declaration
 ---
 
-## Generic Azure Resource - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.2.0-green.svg)
+## Generic Azure Resource - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.2-green.svg)
 
 You can declare to scrape a generic Azure resource via the `Generic` resource type.
 

diff --git a/docs/configuration/v1.x/metrics/network-interface.md b/docs/configuration/v1.x/metrics/network-interface.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Network Interface Declaration
 ---
 
-## Azure Network Interface - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Network Interface - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an [Azure Network Interface](https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-network-interface)
 via the `NetworkInterface` resource type.

diff --git a/docs/configuration/v1.x/metrics/postgresql.md b/docs/configuration/v1.x/metrics/postgresql.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Database for PostgreSQL
 ---
 
-## Azure Database for PostgreSQL - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Database for PostgreSQL - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an Azure Database for PostgreSQL server via the `PostgreSql`
 resource type.

diff --git a/docs/configuration/v1.x/metrics/redis-cache.md b/docs/configuration/v1.x/metrics/redis-cache.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Cache for Redis Declaration
 ---
 
-## Azure Cache for Redis - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Cache for Redis - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an Azure Cache for Redis via the `RedisCache` resource
 type.

diff --git a/docs/configuration/v1.x/metrics/service-bus-queue.md b/docs/configuration/v1.x/metrics/service-bus-queue.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Service Bus Queue Declaration
 ---
 
-## Azure Service Bus Queue - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.1.0-green.svg)
+## Azure Service Bus Queue - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v0.1-green.svg)
 
 You can declare to scrape an Azure Service Bus Queue via the `ServiceBusQueue`
 resource type.

diff --git a/docs/configuration/v1.x/metrics/sql-database.md b/docs/configuration/v1.x/metrics/sql-database.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure SQL Database Declaration
 ---
 
-## Azure SQL Database - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.1.0-green.svg)
+## Azure SQL Database - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.1-green.svg)
 
 You can scrape an Azure SQL Database via the `SqlDatabase` resource type.
 

diff --git a/docs/configuration/v1.x/metrics/storage-queue.md b/docs/configuration/v1.x/metrics/storage-queue.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Storage Queue Declaration
 ---
 
-## Azure Storage Queue - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Storage Queue - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an Azure Queue via the `StorageQueue` resource type.
 

diff --git a/docs/configuration/v1.x/metrics/virtual-machine.md b/docs/configuration/v1.x/metrics/virtual-machine.md
@@ -3,7 +3,7 @@ layout: default
 title: Azure Virtual Machine Declaration
 ---
 
-## Azure Virtual Machine - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0.0-green.svg)
+## Azure Virtual Machine - ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.0-green.svg)
 
 You can declare to scrape an Azure Virtual Machine via the `VirtualMachine` resource
 type.

diff --git a/docs/configuration/v1.x/runtime.md b/docs/configuration/v1.x/runtime.md
@@ -157,7 +157,8 @@ Promitor can send telemetry to Azure Application Insights when there is a need t
 
 It currently supports:
 
-- Exceptions during scraping
+- Traces  ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.1-green.svg)
+- Exceptions
 
 In order to enable use this sink, the following configuration needs to be provided:
 

diff --git a/docs/operations/index.md b/docs/operations/index.md
@@ -61,4 +61,15 @@ Therefor we provide the following REST APIs:
 For security reasons, some sections of the configuration might be sanitized in
 the response to avoid leaking secrets.
 
+### Exploring our REST APIs
+
+We provide API documentation to make it easier for you to consume our REST APIs them:
+
+- **OpenAPI 3.0 format** ![Availability Badge](https://img.shields.io/badge/Available%20Starting-v1.1-green.svg)
+  - You can explore it with OpenAPI UI on `/api/docs`
+  - You can find the raw documentation on `/api/v1/docs.json`
+- **Swagger 2.0 format** [![Deprecation Badge](https://img.shields.io/badge/Deprecated%20as%20of-v1.1-red)](http://changelog.promitor.io/)
+  - You can explore it with Swagger UI on `/swagger`
+  - You can find the raw documentation on `/swagger/v1/swagger.json`
+
 [&larr; back](/)
diff --git a/src/Promitor.Core.Configuration/Promitor.Core.Configuration.csproj b/src/Promitor.Core.Configuration/Promitor.Core.Configuration.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RuntimeFrameworkVersion>2.2.3</RuntimeFrameworkVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -14,9 +14,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
+    <PackageReference Include="Serilog" Version="2.9.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Promitor.Core.Scraping/Configuration/Providers/MetricsDeclarationProvider.cs b/src/Promitor.Core.Scraping/Configuration/Providers/MetricsDeclarationProvider.cs
@@ -1,13 +1,10 @@
 using System;
 using System.IO;
-using AutoMapper;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using Promitor.Core.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Configuration.Model;
 using Promitor.Core.Scraping.Configuration.Providers.Interfaces;
 using Promitor.Core.Scraping.Configuration.Serialization;
-using Promitor.Core.Scraping.Configuration.Serialization.v1.Model;
 
 namespace Promitor.Core.Scraping.Configuration.Providers
 {
@@ -16,9 +13,9 @@ public class MetricsDeclarationProvider : IMetricsDeclarationProvider
         private readonly ConfigurationSerializer _configurationSerializer;
         private readonly IConfiguration _configuration;
 
-        public MetricsDeclarationProvider(IConfiguration configuration, ILogger logger, IMapper mapper, IDeserializer<MetricsDeclarationV1> v1Deserializer)
+        public MetricsDeclarationProvider(IConfiguration configuration, ConfigurationSerializer configurationSerializer)
         {
-            _configurationSerializer = new ConfigurationSerializer(logger, mapper, v1Deserializer);
+            _configurationSerializer = configurationSerializer;
             _configuration = configuration;
         }
 

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/ConfigurationSerializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/ConfigurationSerializer.cs
@@ -19,7 +19,7 @@ public class ConfigurationSerializer
         private readonly IMapper _mapper;
         private readonly IDeserializer<MetricsDeclarationV1> _v1Deserializer;
 
-        public ConfigurationSerializer(ILogger logger, IMapper mapper, IDeserializer<MetricsDeclarationV1> v1Deserializer)
+        public ConfigurationSerializer(ILogger<ConfigurationSerializer> logger, IMapper mapper, IDeserializer<MetricsDeclarationV1> v1Deserializer)
         {
             _logger = logger;
             _mapper = mapper;

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/AggregationDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/AggregationDeserializer.cs
@@ -11,7 +11,7 @@ public class AggregationDeserializer : Deserializer<AggregationV1>
 
         private readonly TimeSpan _defaultAggregationInterval = TimeSpan.FromMinutes(5);
 
-        public AggregationDeserializer(ILogger logger) : base(logger)
+        public AggregationDeserializer(ILogger<AggregationDeserializer> logger) : base(logger)
         {
         }
 

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/AzureMetadataDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/AzureMetadataDeserializer.cs
@@ -10,7 +10,7 @@ public class AzureMetadataDeserializer : Deserializer<AzureMetadataV1>
         private const string SubscriptionIdTag = "subscriptionId";
         private const string ResourceGroupNameTag = "resourceGroupName";
 
-        public AzureMetadataDeserializer(ILogger logger) : base(logger)
+        public AzureMetadataDeserializer(ILogger<AzureMetadataDeserializer> logger) : base(logger)
         {
         }
 

diff --git a/...Core.Scraping/Configuration/Serialization/v1/Core/AzureMetricConfigurationDeserializer.cs b/...Core.Scraping/Configuration/Serialization/v1/Core/AzureMetricConfigurationDeserializer.cs
@@ -10,7 +10,7 @@ public class AzureMetricConfigurationDeserializer : Deserializer<AzureMetricConf
         private const string AggregationTag = "aggregation";
         private readonly IDeserializer<MetricAggregationV1> _aggregationDeserializer;
 
-        public AzureMetricConfigurationDeserializer(IDeserializer<MetricAggregationV1> aggregationDeserializer, ILogger logger)
+        public AzureMetricConfigurationDeserializer(IDeserializer<MetricAggregationV1> aggregationDeserializer, ILogger<AzureMetricConfigurationDeserializer> logger)
             : base(logger)
         {
             _aggregationDeserializer = aggregationDeserializer;

diff --git a/...tor.Core.Scraping/Configuration/Serialization/v1/Core/AzureResourceDeserializerFactory.cs b/...tor.Core.Scraping/Configuration/Serialization/v1/Core/AzureResourceDeserializerFactory.cs
@@ -9,40 +9,51 @@ namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Core
     public class AzureResourceDeserializerFactory : IAzureResourceDeserializerFactory
     {
         private readonly IDeserializer<SecretV1> _secretDeserializer;
-        private readonly ILogger _logger;
+        private readonly ILoggerFactory _loggerFactory;
 
-        public AzureResourceDeserializerFactory(IDeserializer<SecretV1> secretDeserializer, ILogger logger)
+        public AzureResourceDeserializerFactory(IDeserializer<SecretV1> secretDeserializer, ILoggerFactory loggerFactory)
         {
             _secretDeserializer = secretDeserializer;
-            _logger = logger;
+            _loggerFactory = loggerFactory;
         }
 
         public IDeserializer<AzureResourceDefinitionV1> GetDeserializerFor(ResourceType resourceType)
         {
             switch (resourceType)
             {
                 case ResourceType.ServiceBusQueue:
-                    return new ServiceBusQueueDeserializer(_logger);
+                    var serviceBusLogger = _loggerFactory.CreateLogger<ServiceBusQueueDeserializer>();
+                    return new ServiceBusQueueDeserializer(serviceBusLogger);
                 case ResourceType.Generic:
-                    return new GenericResourceDeserializer(_logger);
+                    var genericLogger = _loggerFactory.CreateLogger<GenericResourceDeserializer>();
+                    return new GenericResourceDeserializer(genericLogger);
                 case ResourceType.StorageQueue:
-                    return new StorageQueueDeserializer(_secretDeserializer, _logger);
+                    var storageQueueLogger = _loggerFactory.CreateLogger<StorageQueueDeserializer>();
+                    return new StorageQueueDeserializer(_secretDeserializer, storageQueueLogger);
                 case ResourceType.ContainerInstance:
-                    return new ContainerInstanceDeserializer(_logger);
+                    var containerInstanceLogger = _loggerFactory.CreateLogger<ContainerInstanceDeserializer>();
+                    return new ContainerInstanceDeserializer(containerInstanceLogger);
                 case ResourceType.VirtualMachine:
-                    return new VirtualMachineDeserializer(_logger);
+                    var virtualMachineLogger = _loggerFactory.CreateLogger<VirtualMachineDeserializer>();
+                    return new VirtualMachineDeserializer(virtualMachineLogger);
                 case ResourceType.ContainerRegistry:
-                    return new ContainerRegistryDeserializer(_logger);
+                    var containerRegistryLogger = _loggerFactory.CreateLogger<ContainerRegistryDeserializer>();
+                    return new ContainerRegistryDeserializer(containerRegistryLogger);
                 case ResourceType.NetworkInterface:
-                    return new NetworkInterfaceDeserializer(_logger);
+                    var networkLogger = _loggerFactory.CreateLogger<NetworkInterfaceDeserializer>();
+                    return new NetworkInterfaceDeserializer(networkLogger);
                 case ResourceType.CosmosDb:
-                    return new CosmosDbDeserializer(_logger);
+                    var cosmosDbLogger = _loggerFactory.CreateLogger<CosmosDbDeserializer>();
+                    return new CosmosDbDeserializer(cosmosDbLogger);
                 case ResourceType.RedisCache:
-                    return new RedisCacheDeserializer(_logger);
+                    var redisCacheLogger = _loggerFactory.CreateLogger<RedisCacheDeserializer>();
+                    return new RedisCacheDeserializer(redisCacheLogger);
                 case ResourceType.PostgreSql:
-                    return new PostgreSqlDeserializer(_logger);
+                    var postgreSqlLogger = _loggerFactory.CreateLogger<PostgreSqlDeserializer>();
+                    return new PostgreSqlDeserializer(postgreSqlLogger);
                 case ResourceType.SqlDatabase:
-                    return new SqlDatabaseDeserializer(_logger);
+                    var sqlDatabaseLogger = _loggerFactory.CreateLogger<SqlDatabaseDeserializer>();
+                    return new SqlDatabaseDeserializer(sqlDatabaseLogger);
                 default:
                     throw new ArgumentOutOfRangeException($"Resource Type {resourceType} not supported.");
             }

diff --git a/...omitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricAggregationDeserializer.cs b/...omitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricAggregationDeserializer.cs
@@ -10,7 +10,7 @@ public class MetricAggregationDeserializer : Deserializer<MetricAggregationV1>
         private const string TypeTag = "type";
         private const string IntervalTag = "interval";
 
-        public MetricAggregationDeserializer(ILogger logger) : base(logger)
+        public MetricAggregationDeserializer(ILogger<MetricAggregationDeserializer> logger) : base(logger)
         {
         }
 

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricDefaultsDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricDefaultsDeserializer.cs
@@ -15,7 +15,7 @@ public class MetricDefaultsDeserializer : Deserializer<MetricDefaultsV1>
         public MetricDefaultsDeserializer(
             IDeserializer<AggregationV1> aggregationDeserializer,
             IDeserializer<ScrapingV1> scrapingDeserializer,
-            ILogger logger) : base(logger)
+            ILogger<MetricDefaultsDeserializer> logger) : base(logger)
         {
             _aggregationDeserializer = aggregationDeserializer;
             _scrapingDeserializer = scrapingDeserializer;

diff --git a/...romitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricDefinitionDeserializer.cs b/...romitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricDefinitionDeserializer.cs
@@ -22,7 +22,7 @@ public class MetricDefinitionDeserializer : Deserializer<MetricDefinitionV1>
         public MetricDefinitionDeserializer(IDeserializer<AzureMetricConfigurationV1> azureMetricConfigurationDeserializer,
             IDeserializer<ScrapingV1> scrapingDeserializer,
             IAzureResourceDeserializerFactory azureResourceDeserializerFactory,
-            ILogger logger) : base(logger)
+            ILogger<MetricDefinitionDeserializer> logger) : base(logger)
         {
             _azureMetricConfigurationDeserializer = azureMetricConfigurationDeserializer;
             _scrapingDeserializer = scrapingDeserializer;

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/ScrapingDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/ScrapingDeserializer.cs
@@ -8,7 +8,7 @@ public class ScrapingDeserializer : Deserializer<ScrapingV1>
     {
         private const string ScheduleTag = "schedule";
 
-        public ScrapingDeserializer(ILogger logger) : base(logger)
+        public ScrapingDeserializer(ILogger<ScrapingDeserializer> logger) : base(logger)
         {
         }
 

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/SecretDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/SecretDeserializer.cs
@@ -9,7 +9,7 @@ public class SecretDeserializer : Deserializer<SecretV1>
         private const string RawValueTag = "rawValue";
         private const string EnvironmentVariableTag = "environmentVariable";
 
-        public SecretDeserializer(ILogger logger) : base(logger)
+        public SecretDeserializer(ILogger<SecretDeserializer> logger) : base(logger)
         {
         }