Revert "WORK: 3587839 [SDK] Support storage analytic metric schema na…

…tively in Insights SDK to remove dependency on on legacy infra" This reverts commit 0c8adf7.
MabOneSdk · Apr 24, 2015 · d06a022 · d06a022
1 parent f0ab40d
commit d06a022
Show file tree

Hide file tree

Showing 11 changed files with 156 additions and 928 deletions.
diff --git a/src/Insights/Customizations/MetricOperations.Customization.cs b/src/Insights/Customizations/MetricOperations.Customization.cs
diff --git a/src/Insights/Customizations/Shoebox/EmptyMetricRetriever.cs b/src/Insights/Customizations/Shoebox/EmptyMetricRetriever.cs
diff --git a/src/Insights/Customizations/Shoebox/IMetricRetriever.cs b/src/Insights/Customizations/Shoebox/IMetricRetriever.cs
diff --git a/src/Insights/Customizations/Shoebox/ProxyMetricRetriever.cs b/src/Insights/Customizations/Shoebox/ProxyMetricRetriever.cs
diff --git a/src/Insights/Customizations/Shoebox/SasMetricRetriever.cs b/src/Insights/Customizations/Shoebox/SasMetricRetriever.cs
diff --git a/src/Insights/Customizations/Shoebox/ShoeboxClient.cs b/src/Insights/Customizations/Shoebox/ShoeboxClient.cs
@@ -17,16 +17,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Hyak.Common;
 using Microsoft.Azure.Insights.Models;
 using Microsoft.WindowsAzure.Storage.Auth;
 using Microsoft.WindowsAzure.Storage.Table;
 
 namespace Microsoft.Azure.Insights
 {
-    /// <summary>
-    /// Thick client component for retrieving shoebox metrics
-    /// </summary>
     internal static class ShoeboxClient
     {
         internal static int MaxParallelRequestsByName = 4;
@@ -57,22 +53,7 @@ internal static async Task<MetricListResponse> GetMetricsInternalAsync(MetricFil
             // TODO [davmc]: ShoeboxClient doesn't support dimensions
             if (filter.DimensionFilters != null && filter.DimensionFilters.Any(df => df.Dimensions != null))
             {
-                if (TracingAdapter.IsEnabled)
-                {
-                    TracingAdapter.Information("InvocationId: {0}. ShoeboxClient encountered metrics with dimensions specified. These will be ignored.", invocationId);
-                }
-
-                // Remove dimensions from filter (The MetricFilter class has strict mutation rules used in parsing so the best way to modify it is to create a new one)
-                filter = new MetricFilter()
-                {
-                    TimeGrain = filter.TimeGrain,
-                    StartTime = filter.StartTime,
-                    EndTime = filter.EndTime,
-                    DimensionFilters = filter.DimensionFilters.Select(df => new MetricDimension()
-                    {
-                        Name = df.Name
-                    })
-                };
+                throw new ArgumentException("Shoebox client does not support dimensions", "filter");
             }
 
             // If metrics are requested by name, get those metrics specifically, unless too many are requested.

diff --git a/src/Insights/Customizations/Shoebox/ShoeboxHelper.cs b/src/Insights/Customizations/Shoebox/ShoeboxHelper.cs
@@ -22,9 +22,6 @@
 
 namespace Microsoft.Azure.Insights
 {
-    /// <summary>
-    /// Helper class for shoebox operations
-    /// </summary>
     internal static class ShoeboxHelper
     {
         private const int KeyLimit = 432;