Merge pull request #564 from Microsoft/develop

* Metrics: When we made MetricManager private, we forgot the Metric class. Catching up on that.
* Metrics: Add a temporary workaround for a suspected but unconfirmed issue with Extractor performance on telemetry when no metrics are extracted.
* Updated version for 2.4.0-beta4. (#563)

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 This changelog will be used to generate documentation on [release notes page](http://azure.microsoft.com/en-us/documentation/articles/app-insights-release-notes-dotnet/).
 
+## Version 2.4.0-beta4
+- Made Metric class private and fixed various metrics related issues.
+
+## Version 2.4.0-beta3
+
 ## Version 2.4.0-beta2
 - Removed metric aggregation functionality as there is not enough feedback on the API surface yet.
 

GlobalStaticVersion.props

@@ -8,7 +8,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>4</SemanticVersionMinor>
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta3</PreReleaseMilestone>
+    <PreReleaseMilestone>beta4</PreReleaseMilestone>
     <!-- 
       Date when Semantic Version was changed. 
       Update for every public release.

src/Core/Managed/Shared/Extensibility/AutocollectedMetricsExtractor.cs

@@ -239,6 +239,13 @@ private void InitializeExtractors()
         /// <param name="fromItem">The item from which to extract metrics.</param>
         private void ExtractMetrics(ITelemetry fromItem)
         {
+            //// Workaround: There is a suspected but unconfirmed issue around Extractor performance with telemetry from which no metrics need to be extracted.
+            //// Putting this IF as a temporary workaround until this can be investigated. 
+            if (!((fromItem is RequestTelemetry) || (fromItem is DependencyTelemetry)))
+            {
+                return;
+            }
+
             if (!this.EnsureItemNotSampled(fromItem))
             {
                 return;

src/Core/Managed/Shared/Extensibility/Metric.cs

@@ -12,7 +12,7 @@
     /// <summary>
     /// Represents aggregator for a single time series of a given metric.
     /// </summary>
-    public class Metric : IEquatable<Metric>
+    internal class Metric : IEquatable<Metric>
     {
         /// <summary>
         /// Aggregator manager for the aggregator.