pr feedback

Author: rajkumar-rangaraj

WEB/Src/Web/Web.Tests/SampleConfigValidationTests.cs

@@ -41,6 +41,7 @@ public void SampleConfig_AllCommentedPropertiesParseCorrectly()
             content = content.Replace("<!-- <EnablePerformanceCounterCollectionModule>true</EnablePerformanceCounterCollectionModule> -->", "<EnablePerformanceCounterCollectionModule>true</EnablePerformanceCounterCollectionModule>");
             content = content.Replace("<!-- <AddAutoCollectedMetricExtractor>true</AddAutoCollectedMetricExtractor> -->", "<AddAutoCollectedMetricExtractor>true</AddAutoCollectedMetricExtractor>");
             content = content.Replace("<!-- <EnableDependencyTrackingTelemetryModule>true</EnableDependencyTrackingTelemetryModule> -->", "<EnableDependencyTrackingTelemetryModule>true</EnableDependencyTrackingTelemetryModule>");
+            content = content.Replace("<!-- <EnableRequestTrackingTelemetryModule>true</EnableRequestTrackingTelemetryModule> -->", "<EnableRequestTrackingTelemetryModule>true</EnableRequestTrackingTelemetryModule>");
 
             // Write to temp config file
             string tempConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ApplicationInsights.config");
@@ -65,6 +66,7 @@ public void SampleConfig_AllCommentedPropertiesParseCorrectly()
                 Assert.True(options.EnablePerformanceCounterCollectionModule);
                 Assert.True(options.AddAutoCollectedMetricExtractor);
                 Assert.True(options.EnableDependencyTrackingTelemetryModule);
+                Assert.True(options.EnableRequestTrackingTelemetryModule);
             }
             finally
             {
@@ -128,6 +130,7 @@ public void SampleConfig_AllPropertiesMatchImplementation()
             Assert.Contains("EnableQuickPulseMetricStream", propertyNames);
             Assert.Contains("EnablePerformanceCounterCollectionModule", propertyNames);
             Assert.Contains("AddAutoCollectedMetricExtractor", propertyNames);
+            Assert.Contains("EnableRequestTrackingTelemetryModule", propertyNames);
             Assert.Contains("EnableDependencyTrackingTelemetryModule", propertyNames);
             Assert.Contains("ApplicationVersion", propertyNames);
 
@@ -142,6 +145,7 @@ public void SampleConfig_AllPropertiesMatchImplementation()
             Assert.Contains("EnableQuickPulseMetricStream", content);
             Assert.Contains("EnablePerformanceCounterCollectionModule", content);
             Assert.Contains("AddAutoCollectedMetricExtractor", content);
+            Assert.Contains("EnableRequestTrackingTelemetryModule", content);
             Assert.Contains("EnableDependencyTrackingTelemetryModule", content);
             Assert.Contains("ApplicationVersion", content);
         }

WEB/Src/Web/Web/Implementation/ApplicationInsightsConfigurationReader.cs

@@ -94,7 +94,7 @@ private static string GetConfigFilePath()
         }
 
         /// <summary>
-        /// Reads the connection string from the XML configuration file.
+        /// Reads all configuration options from the XML ApplicationInsights configuration file.
         /// </summary>
         /// <param name="configPath">The path to the config file.</param>
         /// <returns>The configuration options if found; otherwise, null.</returns>
@@ -146,12 +146,13 @@ private static ApplicationInsightsConfigOptions ReadConfigurationFromFile(string
             options.EnableRequestTrackingTelemetryModule = ReadBoolElement(root, "EnableRequestTrackingTelemetryModule");
 
             // Track if any value was set
-            if (options.DisableTelemetry.HasValue || options.SamplingRatio.HasValue || 
-                options.TracesPerSecond.HasValue || options.DisableOfflineStorage.HasValue ||
-                options.EnableQuickPulseMetricStream.HasValue || options.EnableTraceBasedLogsSampler.HasValue ||
-                options.EnablePerformanceCounterCollectionModule.HasValue || options.AddAutoCollectedMetricExtractor.HasValue ||
-                options.EnableDependencyTrackingTelemetryModule.HasValue || options.EnableRequestTrackingTelemetryModule.HasValue ||
-                !string.IsNullOrWhiteSpace(options.StorageDirectory) || !string.IsNullOrWhiteSpace(options.ApplicationVersion))
+            if (!hasAnyValue &&
+                (options.DisableTelemetry.HasValue || options.SamplingRatio.HasValue ||
+                 options.TracesPerSecond.HasValue || options.DisableOfflineStorage.HasValue ||
+                 options.EnableQuickPulseMetricStream.HasValue || options.EnableTraceBasedLogsSampler.HasValue ||
+                 options.EnablePerformanceCounterCollectionModule.HasValue || options.AddAutoCollectedMetricExtractor.HasValue ||
+                 options.EnableDependencyTrackingTelemetryModule.HasValue || options.EnableRequestTrackingTelemetryModule.HasValue ||
+                 !string.IsNullOrWhiteSpace(options.StorageDirectory) || !string.IsNullOrWhiteSpace(options.ApplicationVersion)))
             {
                 hasAnyValue = true;
             }

WEB/Src/Web/Web/applicationinsights.config.sample

@@ -33,7 +33,6 @@
 
   <!-- Enable adaptive (rate-limit) sampling (default: true)
        When false, disables rate-limit sampling by setting SamplingRatio to 1.0 -->
-  <!-- <EnableAdaptiveSampling>true</EnableAdaptiveSampling> -->
 
   <!-- Sampling ratio: 0.0 to 1.0, where 1.0 = 100% of telemetry sent (default: 1.0) -->
   <!-- <SamplingRatio>1.0</SamplingRatio> -->
@@ -59,10 +58,7 @@
     =======================================================================
   -->
 
-  <!-- Enable Live Metrics (default: true) -->
-  <!-- <EnableLiveMetrics>true</EnableLiveMetrics> -->
-  
-  <!-- Enable Quick Pulse Metric Stream - alias for EnableLiveMetrics (default: true) -->
+  <!-- Enable Quick Pulse Metric Stream (default: true) -->
   <!-- <EnableQuickPulseMetricStream>true</EnableQuickPulseMetricStream> -->
 
   <!-- Enable trace-based logs sampler (default: true) -->

WEB/Src/Web/Web/net462/ApplicationInsights.config.uninstall.xdt

@@ -1,6 +1,7 @@
 <ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <!-- Core Configuration -->
   <ConnectionString xdt:Transform="Remove" />
+  <DisableTelemetry xdt:Transform="Remove" />
 
   <!-- Sampling & Rate Limiting -->
   <SamplingRatio xdt:Transform="Remove" />