Refactor code out of host (#215)

Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com>
tomkerkhove · Nov 10, 2018 · d4e338b · d4e338b
1 parent d6353b7
commit d4e338b
Show file tree

Hide file tree

Showing 55 changed files with 212 additions and 218 deletions.
diff --git a/...t/Configuration/Model/AzureCredentials.cs → ...g/Configuration/Model/AzureCredentials.cs b/...t/Configuration/Model/AzureCredentials.cs → ...g/Configuration/Model/AzureCredentials.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host.Configuration.Model
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public class AzureCredentials
     {

diff --git a/...Host/Configuration/Model/AzureMetadata.cs → ...ping/Configuration/Model/AzureMetadata.cs b/...Host/Configuration/Model/AzureMetadata.cs → ...ping/Configuration/Model/AzureMetadata.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host.Configuration.Model
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public class AzureMetadata
     {

diff --git a/...uration/Model/AzureMetricConfiguration.cs → ...uration/Model/AzureMetricConfiguration.cs b/...uration/Model/AzureMetricConfiguration.cs → ...uration/Model/AzureMetricConfiguration.cs
@@ -1,6 +1,6 @@
 using Microsoft.Azure.Management.Monitor.Fluent.Models;
 
-namespace Promitor.Scraper.Host.Configuration.Model
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public class AzureMetricConfiguration
     {

diff --git a/...uration/Model/Metrics/MetricDefinition.cs → ...uration/Model/Metrics/MetricDefinition.cs b/...uration/Model/Metrics/MetricDefinition.cs → ...uration/Model/Metrics/MetricDefinition.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host.Configuration.Model.Metrics
+namespace Promitor.Core.Scraping.Configuration.Model.Metrics
 {
     public class MetricDefinition
     {

diff --git a/...s/ResouceTypes/GenericMetricDefinition.cs → ...s/ResouceTypes/GenericMetricDefinition.cs b/...s/ResouceTypes/GenericMetricDefinition.cs → ...s/ResouceTypes/GenericMetricDefinition.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host.Configuration.Model.Metrics.ResouceTypes
+namespace Promitor.Core.Scraping.Configuration.Model.Metrics.ResouceTypes
 {
     public class GenericMetricDefinition : MetricDefinition
     {

diff --git a/...eTypes/ServiceBusQueueMetricDefinition.cs → ...eTypes/ServiceBusQueueMetricDefinition.cs b/...eTypes/ServiceBusQueueMetricDefinition.cs → ...eTypes/ServiceBusQueueMetricDefinition.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host.Configuration.Model.Metrics.ResouceTypes
+namespace Promitor.Core.Scraping.Configuration.Model.Metrics.ResouceTypes
 {
     public class ServiceBusQueueMetricDefinition : MetricDefinition
     {

diff --git a/...Configuration/Model/MetricsDeclaration.cs → ...Configuration/Model/MetricsDeclaration.cs b/...Configuration/Model/MetricsDeclaration.cs → ...Configuration/Model/MetricsDeclaration.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Promitor.Scraper.Host.Configuration.Model.Metrics;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
 
-namespace Promitor.Scraper.Host.Configuration.Model
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public class MetricsDeclaration
     {

diff --git a/....Host/Configuration/Model/ResourceType.cs → ...aping/Configuration/Model/ResourceType.cs b/....Host/Configuration/Model/ResourceType.cs → ...aping/Configuration/Model/ResourceType.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host.Configuration.Model
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public enum ResourceType
     {

diff --git a/...Interfaces/IMetricsDeclarationProvider.cs → ...Interfaces/IMetricsDeclarationProvider.cs b/...Interfaces/IMetricsDeclarationProvider.cs → ...Interfaces/IMetricsDeclarationProvider.cs
@@ -1,6 +1,6 @@
-using Promitor.Scraper.Host.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model;
 
-namespace Promitor.Scraper.Host.Configuration.Providers.Interfaces
+namespace Promitor.Core.Scraping.Configuration.Providers.Interfaces
 {
     public interface IMetricsDeclarationProvider
     {

diff --git a/...n/Providers/MetricsDeclarationProvider.cs → ...n/Providers/MetricsDeclarationProvider.cs b/...n/Providers/MetricsDeclarationProvider.cs → ...n/Providers/MetricsDeclarationProvider.cs
@@ -1,10 +1,10 @@
 using System;
 using System.IO;
-using Promitor.Scraper.Host.Configuration.Model;
-using Promitor.Scraper.Host.Configuration.Providers.Interfaces;
-using Promitor.Scraper.Host.Configuration.Serialization;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Providers.Interfaces;
+using Promitor.Core.Scraping.Configuration.Serialization;
 
-namespace Promitor.Scraper.Host.Configuration.Providers
+namespace Promitor.Core.Scraping.Configuration.Providers
 {
     public class MetricsDeclarationProvider : IMetricsDeclarationProvider
     {

diff --git a/...erialization/AzureMetadataDeserializer.cs → ...erialization/AzureMetadataDeserializer.cs b/...erialization/AzureMetadataDeserializer.cs → ...erialization/AzureMetadataDeserializer.cs
@@ -1,8 +1,8 @@
-using Promitor.Scraper.Host.Configuration.Model;
-using GuardNet;
+using GuardNet;
+using Promitor.Core.Scraping.Configuration.Model;
 using YamlDotNet.RepresentationModel;
 
-namespace Promitor.Scraper.Host.Configuration.Serialization
+namespace Promitor.Core.Scraping.Configuration.Serialization
 {
     internal class AzureMetadataDeserializer : Deserializer<AzureMetadata>
     {

diff --git a/...n/AzureMetricConfigurationDeserializer.cs → ...n/AzureMetricConfigurationDeserializer.cs b/...n/AzureMetricConfigurationDeserializer.cs → ...n/AzureMetricConfigurationDeserializer.cs
@@ -1,10 +1,10 @@
-using GuardNet;
+using System;
+using GuardNet;
 using Microsoft.Azure.Management.Monitor.Fluent.Models;
-using Promitor.Scraper.Host.Configuration.Model;
-using System;
+using Promitor.Core.Scraping.Configuration.Model;
 using YamlDotNet.RepresentationModel;
 
-namespace Promitor.Scraper.Host.Configuration.Serialization
+namespace Promitor.Core.Scraping.Configuration.Serialization
 {
     internal class AzureMetricConfigurationDeserializer : Deserializer<AzureMetricConfiguration>
     {

diff --git a/.../Serialization/ConfigurationSerializer.cs → .../Serialization/ConfigurationSerializer.cs b/.../Serialization/ConfigurationSerializer.cs → .../Serialization/ConfigurationSerializer.cs
@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Promitor.Scraper.Host.Configuration.Model;
-using Promitor.Scraper.Host.Configuration.Model.Metrics;
-using Promitor.Scraper.Host.Serialization;
 using GuardNet;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
+using Promitor.Core.Serialization.Yaml;
 using YamlDotNet.RepresentationModel;
 
-namespace Promitor.Scraper.Host.Configuration.Serialization
+namespace Promitor.Core.Scraping.Configuration.Serialization
 {
     public class ConfigurationSerializer
     {

diff --git a/...nfiguration/Serialization/Deserializer.cs → ...nfiguration/Serialization/Deserializer.cs b/...nfiguration/Serialization/Deserializer.cs → ...nfiguration/Serialization/Deserializer.cs
@@ -3,7 +3,7 @@
 using GuardNet;
 using YamlDotNet.RepresentationModel;
 
-namespace Promitor.Scraper.Host.Configuration.Serialization
+namespace Promitor.Core.Scraping.Configuration.Serialization
 {
     internal abstract class Deserializer<TObject>
     {

diff --git a/...tion/Serialization/MetricsDeserializer.cs → ...tion/Serialization/MetricsDeserializer.cs b/...tion/Serialization/MetricsDeserializer.cs → ...tion/Serialization/MetricsDeserializer.cs
@@ -1,11 +1,11 @@
 using System;
-using Promitor.Scraper.Host.Configuration.Model;
-using Promitor.Scraper.Host.Configuration.Model.Metrics;
-using Promitor.Scraper.Host.Configuration.Model.Metrics.ResouceTypes;
 using GuardNet;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
+using Promitor.Core.Scraping.Configuration.Model.Metrics.ResouceTypes;
 using YamlDotNet.RepresentationModel;
 
-namespace Promitor.Scraper.Host.Configuration.Serialization
+namespace Promitor.Core.Scraping.Configuration.Serialization
 {
     internal class MetricsDeserializer : Deserializer<MetricDefinition>
     {

diff --git a/src/Promitor.Core.Scraping/Constants.cs b/src/Promitor.Core.Scraping/Constants.cs
@@ -0,0 +1,10 @@
+namespace Promitor.Core.Scraping
+{
+    public static class Constants
+    {
+        public static class Defaults
+        {
+            public const string MetricsDeclarationPath = "/config/metrics-declaration.yaml";
+        }
+    }
+}
diff --git a/.../Scraping/Exceptions/ScrapingException.cs → ....Scraping/Exceptions/ScrapingException.cs b/.../Scraping/Exceptions/ScrapingException.cs → ....Scraping/Exceptions/ScrapingException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Promitor.Scraper.Host.Scraping.Exceptions
+namespace Promitor.Core.Scraping.Exceptions
 {
     public class ScrapingException : Exception
     {

diff --git a/...craping/Factories/MetricScraperFactory.cs → ...craping/Factories/MetricScraperFactory.cs b/...craping/Factories/MetricScraperFactory.cs → ...craping/Factories/MetricScraperFactory.cs
@@ -1,21 +1,21 @@
 using System;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
+using Promitor.Core.Scraping.Interfaces;
+using Promitor.Core.Scraping.ResouceTypes;
 using Promitor.Core.Telemetry.Interfaces;
-using Promitor.Scraper.Host.Configuration.Model;
-using Promitor.Scraper.Host.Configuration.Model.Metrics;
-using Promitor.Scraper.Host.Scraping.Interfaces;
-using Promitor.Scraper.Host.Scraping.ResouceTypes;
 
-namespace Promitor.Scraper.Host.Scraping.Factories
+namespace Promitor.Core.Scraping.Factories
 {
-    internal class MetricScraperFactory
+    public class MetricScraperFactory
     {
         /// <summary>
         ///     Creates a scraper that is capable of scraping a specific resource type
         /// </summary>
         /// <param name="azureMetadata">Metadata concerning the Azure resources</param>
         /// <param name="metricDefinitionResourceType">Resource type to scrape</param>
         /// <param name="exceptionTracker">Tracker used to log exceptions</param>
-        internal static IScraper<MetricDefinition> CreateScraper(AzureMetadata azureMetadata, ResourceType metricDefinitionResourceType, IExceptionTracker exceptionTracker)
+        public static IScraper<MetricDefinition> CreateScraper(AzureMetadata azureMetadata, ResourceType metricDefinitionResourceType, IExceptionTracker exceptionTracker)
         {
             var azureCredentials = DetermineAzureCredentials();
 

diff --git a/src/Promitor.Core.Scraping/Interfaces/IScraper.cs b/src/Promitor.Core.Scraping/Interfaces/IScraper.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
+
+namespace Promitor.Core.Scraping.Interfaces
+{
+    public interface IScraper<in TMetricDefinition> where TMetricDefinition : MetricDefinition
+    {
+        Task ScrapeAsync(TMetricDefinition metricDefinition);
+    }
+}
diff --git a/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj b/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Guard.Net" Version="1.2.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.17.0" />
+    <PackageReference Include="Prometheus.Client" Version="2.0.0" />
+    <PackageReference Include="YamlDotNet" Version="5.2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Promitor.Core.Telemetry\Promitor.Core.Telemetry.csproj" />
+    <ProjectReference Include="..\Promitor.Core\Promitor.Core.csproj" />
+    <ProjectReference Include="..\Promitor.Integrations.AzureMonitor\Promitor.Integrations.AzureMonitor.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...t/Scraping/ResouceTypes/GenericScraper.cs → ...e.Scraping/ResouceTypes/GenericScraper.cs b/...t/Scraping/ResouceTypes/GenericScraper.cs → ...e.Scraping/ResouceTypes/GenericScraper.cs
@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model.Metrics.ResouceTypes;
 using Promitor.Core.Telemetry.Interfaces;
 using Promitor.Integrations.AzureMonitor;
-using Promitor.Scraper.Host.Configuration.Model;
-using Promitor.Scraper.Host.Configuration.Model.Metrics.ResouceTypes;
 
-namespace Promitor.Scraper.Host.Scraping.ResouceTypes
+namespace Promitor.Core.Scraping.ResouceTypes
 {
     internal class GenericScraper : Scraper<GenericMetricDefinition>
     {

diff --git a/...ng/ResouceTypes/ServiceBusQueueScraper.cs → ...ng/ResouceTypes/ServiceBusQueueScraper.cs b/...ng/ResouceTypes/ServiceBusQueueScraper.cs → ...ng/ResouceTypes/ServiceBusQueueScraper.cs
@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model.Metrics.ResouceTypes;
 using Promitor.Core.Telemetry.Interfaces;
-using Promitor.Scraper.Host.Configuration.Model;
 using Promitor.Integrations.AzureMonitor;
-using Promitor.Scraper.Host.Configuration.Model.Metrics.ResouceTypes;
 
-namespace Promitor.Scraper.Host.Scraping.ResouceTypes
+namespace Promitor.Core.Scraping.ResouceTypes
 {
     public class ServiceBusQueueScraper : Scraper<ServiceBusQueueMetricDefinition>
     {

diff --git a/...r.Scraper.Host/Scraping/ScrapeEndpoint.cs → src/Promitor.Core.Scraping/ScrapeEndpoint.cs b/...r.Scraper.Host/Scraping/ScrapeEndpoint.cs → src/Promitor.Core.Scraping/ScrapeEndpoint.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Extensions.Configuration;
 
-namespace Promitor.Scraper.Host.Scraping
+namespace Promitor.Core.Scraping
 {
     public static class ScrapeEndpoint
     {

diff --git a/...Promitor.Scraper.Host/Scraping/Scraper.cs → src/Promitor.Core.Scraping/Scraper.cs b/...Promitor.Scraper.Host/Scraping/Scraper.cs → src/Promitor.Core.Scraping/Scraper.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Threading.Tasks;
+using GuardNet;
 using Newtonsoft.Json;
 using Prometheus.Client;
+using Promitor.Core.Scraping.Configuration.Model;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
+using Promitor.Core.Scraping.Interfaces;
 using Promitor.Core.Telemetry.Interfaces;
 using Promitor.Integrations.AzureMonitor;
-using Promitor.Scraper.Host.Configuration.Model;
-using Promitor.Scraper.Host.Configuration.Model.Metrics;
-using Promitor.Scraper.Host.Scraping.Interfaces;
-using GuardNet;
 
-namespace Promitor.Scraper.Host.Scraping
+namespace Promitor.Core.Scraping
 {
     /// <summary>
     ///     Azure Monitor Scrape

diff --git a/src/Promitor.Core.Telemetry/EnvironmentVariables.cs b/src/Promitor.Core.Telemetry/EnvironmentVariables.cs
diff --git a/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj b/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj
@@ -16,4 +16,8 @@
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Promitor.Core\Promitor.Core.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/...itor.Scraper.Host/EnvironmentVariables.cs → src/Promitor.Core/EnvironmentVariables.cs b/...itor.Scraper.Host/EnvironmentVariables.cs → src/Promitor.Core/EnvironmentVariables.cs
@@ -1,4 +1,4 @@
-namespace Promitor.Scraper.Host
+namespace Promitor.Core
 {
     public class EnvironmentVariables
     {
@@ -18,5 +18,10 @@ public class Scraping
             public const string CronSchedule = "PROMITOR_SCRAPE_SCHEDULE";
             public const string Path = "PROMITOR_SCRAPE_BASEPATH";
         }
+
+        public class Telemetry
+        {
+            public const string InstrumentationKey = "PROMITOR_TELEMETRY_INSTRUMENTATIONKEY";
+        }
     }
 }
diff --git a/src/Promitor.Core/Promitor.Core.csproj b/src/Promitor.Core/Promitor.Core.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Guard.Net" Version="1.2.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
+    <PackageReference Include="YamlDotNet" Version="5.2.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/...r.Host/Serialization/YamlSerialization.cs → ...e/Serialization/Yaml/YamlSerialization.cs b/...r.Host/Serialization/YamlSerialization.cs → ...e/Serialization/Yaml/YamlSerialization.cs
@@ -1,7 +1,7 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace Promitor.Scraper.Host.Serialization
+namespace Promitor.Core.Serialization.Yaml
 {
     public static class YamlSerialization
     {

diff --git a/src/Promitor.Scraper.Host/Constants.cs b/src/Promitor.Scraper.Host/Constants.cs
@@ -21,10 +21,5 @@ internal static class Validation
                 internal const string GeneralValidationSucceeded = "Configuration is valid.";
             }
         }
-
-        internal static class Defaults
-        {
-            internal const string MetricsDeclarationPath = "/config/metrics-declaration.yaml";
-        }
     }
 }
diff --git a/src/Promitor.Scraper.Host/Controllers/v1/ConfigurationController.cs b/src/Promitor.Scraper.Host/Controllers/v1/ConfigurationController.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
-using Promitor.Scraper.Host.Configuration.Model.Metrics;
-using Promitor.Scraper.Host.Configuration.Providers.Interfaces;
+using Promitor.Core.Scraping.Configuration.Model.Metrics;
+using Promitor.Core.Scraping.Configuration.Providers.Interfaces;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Promitor.Scraper.Host.Controllers.v1