Move featureFlags.disableMetricTimestamps to prometheus.enableMe… (#659)

* Move featureFlags.disableMetricTimestamps to prometheus.enableMetricTimestamps * Remove redundant initializer Signed-off-by: Tom Kerkhove <[email protected]> * Fix test Signed-off-by: Tom Kerkhove <[email protected]> * Redundant initializer * Flag when whole config is passed.
tomkerkhove · Aug 12, 2019 · f4ce88a · f4ce88a
1 parent aa3898c
commit f4ce88a
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 244 deletions.
diff --git a/src/Promitor.Core.Configuration/Defaults.cs b/src/Promitor.Core.Configuration/Defaults.cs
@@ -11,8 +11,9 @@ public static class Server
 
         public static class Prometheus
         {
-            public static string ScrapeEndpointBaseUri { get; } = "/metrics";
+            public static bool EnableMetricTimestamps { get; set; } = false;
             public static double MetricUnavailableValue { get; } = double.NaN;
+            public static string ScrapeEndpointBaseUri { get; } = "/metrics";
         }
 
         public static class MetricsConfiguration
@@ -36,10 +37,5 @@ public class ApplicationInsights
                 public static bool IsEnabled { get; set; } = false;
             }
         }
-
-        public static class FeatureFlags
-        {
-            public static bool DisableMetricTimestamps { get; set; } = false;
-        }
     }
 }
diff --git a/src/Promitor.Core.Configuration/FeatureFlags/FeatureToggleClient.cs b/src/Promitor.Core.Configuration/FeatureFlags/FeatureToggleClient.cs
diff --git a/src/Promitor.Core.Configuration/FeatureFlags/ToggleNames.cs b/src/Promitor.Core.Configuration/FeatureFlags/ToggleNames.cs
diff --git a/src/Promitor.Core.Configuration/Model/FeatureFlags/FeatureFlagsConfiguration.cs b/src/Promitor.Core.Configuration/Model/FeatureFlags/FeatureFlagsConfiguration.cs
diff --git a/src/Promitor.Core.Configuration/Model/Prometheus/PrometheusConfiguration.cs b/src/Promitor.Core.Configuration/Model/Prometheus/PrometheusConfiguration.cs
@@ -4,5 +4,6 @@ public class PrometheusConfiguration
     {
         public ScrapeEndpointConfiguration ScrapeEndpoint { get; set; } = new ScrapeEndpointConfiguration();
         public double? MetricUnavailableValue { get; set; } = Defaults.Prometheus.MetricUnavailableValue;
+        public bool EnableMetricTimestamps { get; set; } = Defaults.Prometheus.EnableMetricTimestamps;
     }
 }
diff --git a/src/Promitor.Core.Configuration/Model/RuntimeConfiguration.cs b/src/Promitor.Core.Configuration/Model/RuntimeConfiguration.cs
@@ -1,5 +1,4 @@
-using Promitor.Core.Configuration.Model.FeatureFlags;
-using Promitor.Core.Configuration.Model.Metrics;
+using Promitor.Core.Configuration.Model.Metrics;
 using Promitor.Core.Configuration.Model.Prometheus;
 using Promitor.Core.Configuration.Model.Server;
 using Promitor.Core.Configuration.Model.Telemetry;
@@ -12,6 +11,5 @@ public class RuntimeConfiguration
         public PrometheusConfiguration Prometheus { get; set; } = new PrometheusConfiguration();
         public MetricsConfiguration MetricsConfiguration { get; set; } = new MetricsConfiguration();
         public TelemetryConfiguration Telemetry { get; set; } = new TelemetryConfiguration();
-        public FeatureFlagsConfiguration FeatureFlags { get; set; } = new FeatureFlagsConfiguration();
     }
 }
diff --git a/src/Promitor.Core.Scraping/Factories/MetricScraperFactory.cs b/src/Promitor.Core.Scraping/Factories/MetricScraperFactory.cs
@@ -2,7 +2,6 @@
 using GuardNet;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Promitor.Core.Configuration.FeatureFlags;
 using Promitor.Core.Scraping.Configuration.Model;
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Interfaces;
@@ -18,18 +17,15 @@ public class MetricScraperFactory
     {
         private readonly IExceptionTracker _exceptionTracker;
         private readonly IConfiguration _configuration;
-        private readonly FeatureToggleClient _featureToggleClient;
         private readonly ILogger _logger;
 
-        public MetricScraperFactory(IConfiguration configuration, FeatureToggleClient featureToggleClient, ILogger logger, IExceptionTracker exceptionTracker)
+        public MetricScraperFactory(IConfiguration configuration, ILogger logger, IExceptionTracker exceptionTracker)
         {
             Guard.NotNull(configuration, nameof(configuration));
-            Guard.NotNull(featureToggleClient, nameof(featureToggleClient));
             Guard.NotNull(logger, nameof(logger));
             Guard.NotNull(exceptionTracker, nameof(exceptionTracker));
 
             _logger = logger;
-            _featureToggleClient = featureToggleClient;
             _configuration = configuration;
             _exceptionTracker = exceptionTracker;
         }
@@ -45,7 +41,7 @@ public IScraper<MetricDefinition> CreateScraper(ResourceType metricDefinitionRes
             IPrometheusMetricWriter prometheusMetricWriter, IRuntimeMetricsCollector runtimeMetricsCollector)
         {
             var azureMonitorClient = CreateAzureMonitorClient(azureMetadata, runtimeMetricsCollector);
-            var scraperConfiguration = new ScraperConfiguration(azureMetadata, azureMonitorClient, prometheusMetricWriter, _featureToggleClient, _logger, _exceptionTracker);
+            var scraperConfiguration = new ScraperConfiguration(azureMetadata, azureMonitorClient, prometheusMetricWriter, _logger, _exceptionTracker);
 
             switch (metricDefinitionResourceType)
             {

diff --git a/src/Promitor.Core.Scraping/Prometheus/PrometheusMetricWriter.cs b/src/Promitor.Core.Scraping/Prometheus/PrometheusMetricWriter.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.Options;
 using Prometheus.Client;
 using Promitor.Core.Configuration;
-using Promitor.Core.Configuration.FeatureFlags;
 using Promitor.Core.Configuration.Model.Prometheus;
 using Promitor.Core.Scraping.Configuration.Model.Metrics;
 using Promitor.Core.Scraping.Prometheus.Interfaces;
@@ -14,28 +13,24 @@ namespace Promitor.Core.Scraping.Prometheus
 {
     public class PrometheusMetricWriter : IPrometheusMetricWriter
     {
-        private readonly FeatureToggleClient _featureToggleClient;
         private readonly IOptionsMonitor<PrometheusConfiguration> _prometheusConfiguration;
         private readonly ILogger<PrometheusMetricWriter> _logger;
 
-        public PrometheusMetricWriter(FeatureToggleClient featureToggleClient, IOptionsMonitor<PrometheusConfiguration> prometheusConfiguration, ILogger<PrometheusMetricWriter> logger)
+        public PrometheusMetricWriter(IOptionsMonitor<PrometheusConfiguration> prometheusConfiguration, ILogger<PrometheusMetricWriter> logger)
         {
-            Guard.NotNull(featureToggleClient, nameof(featureToggleClient));
             Guard.NotNull(prometheusConfiguration, nameof(prometheusConfiguration));
             Guard.NotNull(logger, nameof(logger));
 
-            _featureToggleClient = featureToggleClient;
             _prometheusConfiguration = prometheusConfiguration;
             _logger = logger;
         }
 
         public void ReportMetric(MetricDefinition metricDefinition, ScrapeResult scrapedMetricResult)
         {
-            var metricsTimestampFeatureFlag = _featureToggleClient.IsActive(ToggleNames.DisableMetricTimestamps, defaultFlagState: true);
-
+            var enableMetricTimestamps = _prometheusConfiguration.CurrentValue.EnableMetricTimestamps;
             var labels = DetermineLabels(metricDefinition, scrapedMetricResult);
 
-            var gauge = Metrics.CreateGauge(metricDefinition.Name, metricDefinition.Description, includeTimestamp: metricsTimestampFeatureFlag, labelNames: labels.Names);
+            var gauge = Metrics.CreateGauge(metricDefinition.Name, metricDefinition.Description, includeTimestamp: enableMetricTimestamps, labelNames: labels.Names);
             var metricValue = DetermineMetricMeasurement(scrapedMetricResult);
             gauge.WithLabels(labels.Values).Set(metricValue);
         }

diff --git a/src/Promitor.Core.Scraping/ScraperConfiguration.cs b/src/Promitor.Core.Scraping/ScraperConfiguration.cs
@@ -1,6 +1,5 @@
 using GuardNet;
 using Microsoft.Extensions.Logging;
-using Promitor.Core.Configuration.FeatureFlags;
 using Promitor.Core.Scraping.Configuration.Model;
 using Promitor.Core.Scraping.Prometheus.Interfaces;
 using Promitor.Core.Telemetry.Interfaces;
@@ -25,11 +24,6 @@ public class ScraperConfiguration
         /// </summary>
         public IPrometheusMetricWriter PrometheusMetricWriter { get; }
 
-        /// <summary>
-        ///     Interaction with feature flags
-        /// </summary>
-        public FeatureToggleClient FeatureToggleClient { get; }
-
         /// <summary>
         ///     Logger used for telemetry
         /// </summary>
@@ -46,22 +40,19 @@ public class ScraperConfiguration
         /// <param name="azureMetadata">Metadata concerning the Azure resources</param>
         /// <param name="azureMonitorClient">Client to communicate with Azure Monitor</param>
         /// <param name="prometheusMetricWriter">Metrics collector for our Prometheus scraping endpoint</param>
-        /// <param name="featureToggleClient">Interaction with feature flags</param>
         /// <param name="logger">General logger</param>
         /// <param name="exceptionTracker">Exception tracker</param>
-        public ScraperConfiguration(AzureMetadata azureMetadata, AzureMonitorClient azureMonitorClient, IPrometheusMetricWriter prometheusMetricWriter, FeatureToggleClient featureToggleClient, ILogger logger, IExceptionTracker exceptionTracker)
+        public ScraperConfiguration(AzureMetadata azureMetadata, AzureMonitorClient azureMonitorClient, IPrometheusMetricWriter prometheusMetricWriter, ILogger logger, IExceptionTracker exceptionTracker)
         {
             Guard.NotNull(azureMetadata, nameof(azureMetadata));
             Guard.NotNull(azureMonitorClient, nameof(azureMonitorClient));
             Guard.NotNull(prometheusMetricWriter, nameof(prometheusMetricWriter));
-            Guard.NotNull(featureToggleClient, nameof(featureToggleClient));
             Guard.NotNull(logger, nameof(logger));
             Guard.NotNull(exceptionTracker, nameof(exceptionTracker));
 
             AzureMetadata = azureMetadata;
             AzureMonitorClient = azureMonitorClient;
             PrometheusMetricWriter = prometheusMetricWriter;
-            FeatureToggleClient = featureToggleClient;
             Logger = logger;
             ExceptionTracker = exceptionTracker;
         }

diff --git a/src/Promitor.Core.Telemetry.Metrics/RuntimeMetricsCollector.cs b/src/Promitor.Core.Telemetry.Metrics/RuntimeMetricsCollector.cs
@@ -1,17 +1,18 @@
 using System.Collections.Generic;
 using System.Linq;
-using Promitor.Core.Configuration.FeatureFlags;
+using Microsoft.Extensions.Options;
+using Promitor.Core.Configuration.Model.Prometheus;
 using Promitor.Core.Telemetry.Metrics.Interfaces;
 
 namespace Promitor.Core.Telemetry.Metrics
 {
     public class RuntimeMetricsCollector : IRuntimeMetricsCollector
     {
-        private readonly FeatureToggleClient _featureToggleClient;
+        private readonly IOptionsMonitor<PrometheusConfiguration> _prometheusConfiguration;
 
-        public RuntimeMetricsCollector(FeatureToggleClient featureToggleClient)
+        public RuntimeMetricsCollector(IOptionsMonitor<PrometheusConfiguration> prometheusConfiguration)
         {
-            _featureToggleClient = featureToggleClient;
+            _prometheusConfiguration = prometheusConfiguration;
         }
 
         /// <summary>
@@ -23,9 +24,9 @@ public RuntimeMetricsCollector(FeatureToggleClient featureToggleClient)
         /// <param name="labels">Labels that are applicable for this measurement</param>
         public void SetGaugeMeasurement(string name, string description, double value, Dictionary<string, string> labels)
         {
-            var metricsTimestampFeatureFlag = _featureToggleClient.IsActive(ToggleNames.DisableMetricTimestamps);
+            var enableMetricTimestamps = _prometheusConfiguration.CurrentValue.EnableMetricTimestamps;
 
-            var gauge = Prometheus.Client.Metrics.CreateGauge($"promitor_{name}", help: description, includeTimestamp: metricsTimestampFeatureFlag, labelNames: labels.Keys.ToArray());
+            var gauge = Prometheus.Client.Metrics.CreateGauge($"promitor_{name}", help: description, includeTimestamp: enableMetricTimestamps, labelNames: labels.Keys.ToArray());
             gauge.WithLabels(labels.Values.ToArray()).Set(value);
         }
     }

diff --git a/src/Promitor.Scraper.Host/Extensions/IServiceCollectionExtensions.cs b/src/Promitor.Scraper.Host/Extensions/IServiceCollectionExtensions.cs
@@ -8,8 +8,6 @@
 using Microsoft.Extensions.Logging;
 using Promitor.Core.Scraping.Configuration.Providers;
 using Promitor.Core.Scraping.Configuration.Providers.Interfaces;
-using Promitor.Core.Configuration.FeatureFlags;
-using Promitor.Core.Configuration.Model.FeatureFlags;
 using Promitor.Core.Configuration.Model.Metrics;
 using Promitor.Core.Configuration.Model.Prometheus;
 using Promitor.Core.Configuration.Model.Server;
@@ -69,7 +67,6 @@ public static IServiceCollection DefineDependencies(this IServiceCollection serv
             services.AddTransient<ILogger, RuntimeLogger>();
             services.AddTransient<IMetricsDeclarationProvider, MetricsDeclarationProvider>();
             services.AddTransient<IRuntimeMetricsCollector, RuntimeMetricsCollector>();
-            services.AddTransient<FeatureToggleClient>();
             services.AddTransient<MetricScraperFactory>();
             services.AddTransient<RuntimeValidator>();
             services.AddTransient<ValidationLogger>();
@@ -110,7 +107,6 @@ public static IServiceCollection UseWebApi(this IServiceCollection services)
         /// </summary>
         public static IServiceCollection ConfigureYamlConfiguration(this IServiceCollection services, IConfiguration configuration)
         {
-            services.Configure<FeatureFlagsConfiguration>(configuration.GetSection("featureFlags"));
             services.Configure<MetricsConfiguration>(configuration.GetSection("metricsConfiguration"));
             services.Configure<TelemetryConfiguration>(configuration.GetSection("telemetry"));
             services.Configure<ApplicationInsightsConfiguration>(configuration.GetSection("telemetry:applicationInsights"));