Moving ScrapingInterval -> Scraping model + Interval property so seri…

…alize/deserialize matches the YAML definition
tomkerkhove · Mar 27, 2019 · 9220830 · 9220830
1 parent 008ed5a
commit 9220830
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 23 deletions.
diff --git a/src/Promitor.Core.Scraping/Configuration/Model/MetricDefaults.cs b/src/Promitor.Core.Scraping/Configuration/Model/MetricDefaults.cs
@@ -1,11 +1,9 @@
-using System;
-
-namespace Promitor.Core.Scraping.Configuration.Model
+namespace Promitor.Core.Scraping.Configuration.Model
 {
     public class MetricDefaults
     {
         public Aggregation Aggregation { get; set; } = new Aggregation();
 
-        public TimeSpan ScrapingInterval { get; set; }
+        public Scraping Scraping { get; set; } = new Scraping();
     }
 }
diff --git a/src/Promitor.Core.Scraping/Configuration/Model/Metrics/MetricDefinition.cs b/src/Promitor.Core.Scraping/Configuration/Model/Metrics/MetricDefinition.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Promitor.Core.Scraping.Configuration.Model.Metrics
+namespace Promitor.Core.Scraping.Configuration.Model.Metrics
 {
     public abstract class MetricDefinition
     {
@@ -31,8 +29,8 @@ public abstract class MetricDefinition
         public abstract ResourceType ResourceType { get; }
 
         /// <summary>
-        /// Gets or sets the scraping interval.
+        /// Gets or sets the scraping model.
         /// </summary>
-        public TimeSpan? ScrapingInterval { get; set; }
+        public Scraping Scraping { get; set; } = new Scraping();
     }
 }
diff --git a/src/Promitor.Core.Scraping/Configuration/Model/Scraping.cs b/src/Promitor.Core.Scraping/Configuration/Model/Scraping.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Promitor.Core.Scraping.Configuration.Model
+{
+    public class Scraping
+    {
+        public TimeSpan? Interval { get; set; }
+    }
+}
diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/Core/MetricDefaultsDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/Core/MetricDefaultsDeserializer.cs
@@ -34,7 +34,7 @@ internal override MetricDefaults Deserialize(YamlMappingNode node)
                 if (scrapingIntervalNode != null)
                 {
                     var scrapingIntervalTimeSpan = TimeSpan.Parse(scrapingIntervalNode.ToString());
-                    metricDefaults.ScrapingInterval = scrapingIntervalTimeSpan;
+                    metricDefaults.Scraping.Interval = scrapingIntervalTimeSpan;
                 }
             }
 

diff --git a/src/Promitor.Core.Scraping/Configuration/Serialization/Core/MetricDeserializer.cs b/src/Promitor.Core.Scraping/Configuration/Serialization/Core/MetricDeserializer.cs
@@ -46,7 +46,7 @@ protected virtual TMetricDefinition DeserializeMetricDefinition<TMetricDefinitio
 
                 if (scrapingIntervalNode != null)
                 {
-                    metricDefinition.ScrapingInterval = TimeSpan.Parse(scrapingIntervalNode.ToString());
+                    metricDefinition.Scraping.Interval = TimeSpan.Parse(scrapingIntervalNode.ToString());
                 }
             }
 

diff --git a/...ation/MetricsDeclaration/MetricsDeclarationWithAzureStorageQueueYamlSerializationTests.cs b/...ation/MetricsDeclaration/MetricsDeclarationWithAzureStorageQueueYamlSerializationTests.cs
@@ -78,10 +78,10 @@ private StorageQueueMetricDefinition GenerateBogusAzureStorageQueueMetricDefinit
                 .RuleFor(metricDefinition => metricDefinition.SasToken, faker => $"?sig={Base64UrlEncoder.Encode(faker.Lorem.Sentence(wordCount: 3))}")
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
-                .RuleFor(metricDefinition => metricDefinition.ScrapingInterval, faker =>
+                .RuleFor(metricDefinition => metricDefinition.Scraping.Interval, faker =>
                     string.IsNullOrWhiteSpace(metricScrapingInterval) ? (TimeSpan?)null : TimeSpan.Parse(metricScrapingInterval))
                 .Ignore(metricDefinition => metricDefinition.ResourceGroupName)
-                .Ignore(metricDefinition => metricDefinition.ScrapingInterval);
+                .Ignore(metricDefinition => metricDefinition.Scraping.Interval);
 
             return bogusGenerator.Generate();
         }

diff --git a/...ation/MetricsDeclaration/MetricsDeclarationWithContainerInstanceYamlSerializationTests.cs b/...ation/MetricsDeclaration/MetricsDeclarationWithContainerInstanceYamlSerializationTests.cs
@@ -72,10 +72,10 @@ private ContainerInstanceMetricDefinition GenerateBogusContainerInstanceMetricDe
                 .RuleFor(metricDefinition => metricDefinition.ContainerGroup, faker => faker.Name.LastName())
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
-                .RuleFor(metricDefinition => metricDefinition.ScrapingInterval, faker =>
+                .RuleFor(metricDefinition => metricDefinition.Scraping.Interval, faker =>
                     string.IsNullOrWhiteSpace(metricScrapingInterval) ? (TimeSpan?)null : TimeSpan.Parse(metricScrapingInterval))
                 .Ignore(metricDefinition => metricDefinition.ResourceGroupName)
-                .Ignore(metricDefinition => metricDefinition.ScrapingInterval);
+                .Ignore(metricDefinition => metricDefinition.Scraping.Interval);
 
             return bogusGenerator.Generate();
         }

diff --git a/...ation/MetricsDeclaration/MetricsDeclarationWithContainerRegistryYamlSerializationTests.cs b/...ation/MetricsDeclaration/MetricsDeclarationWithContainerRegistryYamlSerializationTests.cs
@@ -68,10 +68,10 @@ private ContainerRegistryMetricDefinition GenerateBogusContainerRegistryMetricDe
                 .RuleFor(metricDefinition => metricDefinition.RegistryName, faker => faker.Name.LastName())
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
-                .RuleFor(metricDefinition => metricDefinition.ScrapingInterval, faker =>
+                .RuleFor(metricDefinition => metricDefinition.Scraping.Interval, faker =>
                     string.IsNullOrWhiteSpace(metricScrapingInterval) ? (TimeSpan?)null : TimeSpan.Parse(metricScrapingInterval))
                 .Ignore(metricDefinition => metricDefinition.ResourceGroupName)
-                .Ignore(metricDefinition => metricDefinition.ScrapingInterval);
+                .Ignore(metricDefinition => metricDefinition.Scraping.Interval);
 
             return bogusGenerator.Generate();
         }

diff --git a/...ization/MetricsDeclaration/MetricsDeclarationWithServiceBusQueueYamlSerializationTests.cs b/...ization/MetricsDeclaration/MetricsDeclarationWithServiceBusQueueYamlSerializationTests.cs
@@ -70,10 +70,10 @@ private ServiceBusQueueMetricDefinition GenerateBogusServiceBusMetricDefinition(
                 .RuleFor(metricDefinition => metricDefinition.QueueName, faker => faker.Name.FirstName())
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
-                .RuleFor(metricDefinition => metricDefinition.ScrapingInterval, faker =>
+                .RuleFor(metricDefinition => metricDefinition.Scraping.Interval, faker =>
                     string.IsNullOrWhiteSpace(metricScrapingInterval) ? (TimeSpan?)null : TimeSpan.Parse(metricScrapingInterval))
-                .Ignore(metricDefinition  => metricDefinition.ResourceGroupName)
-                .Ignore(metricDefinition => metricDefinition.ScrapingInterval);
+                .Ignore(metricDefinition => metricDefinition.ResourceGroupName)
+                .Ignore(metricDefinition => metricDefinition.Scraping.Interval);
 
             return bogusGenerator.Generate();
         }

diff --git a/...lization/MetricsDeclaration/MetricsDeclarationWithVirtualMachineYamlSerializationTests.cs b/...lization/MetricsDeclaration/MetricsDeclarationWithVirtualMachineYamlSerializationTests.cs
@@ -73,10 +73,10 @@ private VirtualMachineMetricDefinition GenerateBogusVirtualMachineMetricDefiniti
                 .RuleFor(metricDefinition => metricDefinition.VirtualMachineName, faker => faker.Name.LastName())
                 .RuleFor(metricDefinition => metricDefinition.AzureMetricConfiguration, faker => bogusAzureMetricConfiguration)
                 .RuleFor(metricDefinition => metricDefinition.ResourceGroupName, faker => resourceGroupName)
-                .RuleFor(metricDefinition => metricDefinition.ScrapingInterval, faker =>
+                .RuleFor(metricDefinition => metricDefinition.Scraping.Interval, faker =>
                     string.IsNullOrWhiteSpace(metricScrapingInterval) ? (TimeSpan?)null : TimeSpan.Parse(metricScrapingInterval))
                 .Ignore(metricDefinition => metricDefinition.ResourceGroupName)
-                .Ignore(metricDefinition => metricDefinition.ScrapingInterval);
+                .Ignore(metricDefinition => metricDefinition.Scraping.Interval);
 
             return bogusGenerator.Generate();
         }

diff --git a/src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/YamlSerializationTests.cs b/src/Promitor.Scraper.Tests.Unit/Serialization/MetricsDeclaration/YamlSerializationTests.cs
@@ -70,7 +70,7 @@ protected MetricDefaults GenerateBogusMetricDefaults(string defaultScrapingInter
 
             if (!string.IsNullOrWhiteSpace(defaultScrapingInterval))
             {
-                metricDefaults.ScrapingInterval = TimeSpan.Parse(defaultScrapingInterval);
+                metricDefaults.Scraping.Interval = TimeSpan.Parse(defaultScrapingInterval);
             }
 
             return metricDefaults;