idk

Author: Matthew Sainsbury

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Internal/FeatureMetricEmissionHelperTests.cs

@@ -38,17 +38,17 @@ public void ReportsFeaturesSeen()
             using var helper1 = FeatureMetricEmissionHelper.GetOrCreate("a", "b");
 
             var metric = helper1.GetFeatureStatsbeat();
-            
+
             // no features reported should not emit metric
             Assert.Equal(0, metric.Value);
             Assert.Empty(metric.Tags.ToArray());
 
             helper1.MarkFeatureInUse(StatsbeatFeatures.TrackEvent);
             helper1.MarkFeatureInUse(StatsbeatFeatures.TrackDependency);
-            
+
             metric = helper1.GetFeatureStatsbeat();
             var tags = metric.Tags.ToArray().ToDictionary(v => v.Key, v => v.Value);
-            
+
             Assert.Equal(1, metric.Value);
             AssertKey("rp", "unknown", tags);
             AssertKey("attach", "Manual", tags);

BASE/src/Microsoft.ApplicationInsights/Extensibility/TelemetryConfiguration.cs

@@ -29,9 +29,10 @@
     public sealed class TelemetryConfiguration : IDisposable
     {
         // internal readonly SamplingRateStore LastKnownSampleRateStore = new SamplingRateStore();
+
         internal const string ApplicationInsightsActivitySourceName = "Microsoft.ApplicationInsights";
         internal const string ApplicationInsightsMeterName = "Microsoft.ApplicationInsights";
-        
+
         internal FeatureMetricEmissionHelper FeatureReporter;
 
         private static readonly Lazy<TelemetryConfiguration> DefaultInstance =
@@ -222,7 +223,7 @@ internal string ExtensionVersion
                 this.extensionVersion = value;
             }
         }
-        
+
         /// <summary>
         /// Gets the default ActivitySource used by TelemetryClient.
         /// </summary>

BASE/src/Microsoft.ApplicationInsights/Internal/FeatureMetricEmissionHelper.cs

@@ -50,7 +50,7 @@ internal static FeatureMetricEmissionHelper GetOrCreate(string ciKey, string ver
         {
             string key = $"{ciKey};{version}";
 
-            return HelperRegistry.GetOrAdd(key, _ => 
+            return HelperRegistry.GetOrAdd(key, _ =>
             {
                 return new FeatureMetricEmissionHelper(ciKey, version);
             });

BASE/src/Microsoft.ApplicationInsights/Internal/VersionUtils.cs

@@ -19,7 +19,7 @@ internal class VersionUtils
 
         /// <summary>Application Insights Web shim (Microsoft.ApplicationInsights.Web).</summary>
         internal const string ExtensionLabelShimWeb = "shf";
-        
+
         /// <summary>Application Insights NLog shim (Microsoft.ApplicationInsights.NLogTarget).</summary>
         internal const string ExtensionLabelShimNLog = "shn";
 

NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs

@@ -210,15 +210,6 @@ internal static IOpenTelemetryBuilder UseApplicationInsightsTelemetry(this IOpen
                     {
                         exporterOptions.Credential = serviceOptions.Credential;
                     }
-<<<<<<< HEAD
-=======
-
-                    if (!serviceOptions.EnableAdaptiveSampling)
-                    {
-                        exporterOptions.SamplingRatio = 1.0F;
-                        exporterOptions.TracesPerSecond = null;
-                    }
->>>>>>> 51eabb9a (obvious stuff)
 
                     if (serviceOptions.EnableQuickPulseMetricStream)
                     {