Merge pull request #12 from AuxMon/master

Taking the bug fix in Metrics
Azure · Aug 12, 2014 · 0eb5f5c · 0eb5f5c
2 parents b2073c2 + 2416594
commit 0eb5f5c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/Insights/Customizations/Shoebox/ShoeboxHelper.cs b/src/Insights/Customizations/Shoebox/ShoeboxHelper.cs
@@ -54,14 +54,12 @@ public static string UnEscapeKey(string key)
 
         public static string GenerateMetricDefinitionFilterString(IEnumerable<string> names)
         {
-            return names.Select(n => "name.value eq '" + n + "'").Aggregate((a, b) => a + " or " + b);
+            return names == null || !names.Any() ? null : names.Select(n => "name.value eq '" + n + "'").Aggregate((a, b) => a + " or " + b);
         }
 
         public static string GenerateMetricFilterString(MetricFilter filter)
         {
-
-            return string.Format(CultureInfo.InvariantCulture,
-                "{0}timeGrain eq duration'{1}' and startTime eq {2} and endTime eq {3}",
+            return string.Format(CultureInfo.InvariantCulture, "{0}timeGrain eq duration'{1}' and startTime eq {2} and endTime eq {3}",
                 filter.Names == null || !filter.Names.Any() ? string.Empty : "(" + GenerateMetricDefinitionFilterString(filter.Names) + ") and ",
                 filter.TimeGrain.To8601String(),
                 filter.StartTime.ToString("O"),

diff --git a/src/Insights/Generated/Insights/MetricDefinitionOperations.cs b/src/Insights/Generated/Insights/MetricDefinitionOperations.cs
@@ -85,10 +85,6 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsAsync(string
             {
                 throw new ArgumentNullException("resourceUri");
             }
-            if (filterString == null)
-            {
-                throw new ArgumentNullException("filterString");
-            }
 
             // Tracing
             bool shouldTrace = CloudContext.Configuration.Tracing.IsEnabled;
@@ -105,7 +101,10 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsAsync(string
             // Construct URL
             string url = "/" + resourceUri.Trim() + "/metricDefinitions?";
             url = url + "api-version=2014-04-01";
-            url = url + "&$filter=" + Uri.EscapeDataString(filterString.Trim());
+            if (filterString != null)
+            {
+                url = url + "&$filter=" + Uri.EscapeDataString(filterString != null ? filterString.Trim() : "");
+            }
             string baseUrl = this.Client.BaseUri.AbsoluteUri;
             // Trim '/' character from the end of baseUrl and beginning of url.
             if (baseUrl[baseUrl.Length - 1] == '/')

diff --git a/src/Insights/OnetimeGenerated/MetricDefinitionOperations.cs b/src/Insights/OnetimeGenerated/MetricDefinitionOperations.cs
@@ -85,10 +85,6 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsInternalAsyn
             {
                 throw new ArgumentNullException("resourceUri");
             }
-            if (filterString == null)
-            {
-                throw new ArgumentNullException("filterString");
-            }
 
             // Tracing
             bool shouldTrace = CloudContext.Configuration.Tracing.IsEnabled;
@@ -105,7 +101,10 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsInternalAsyn
             // Construct URL
             string url = "/" + resourceUri.Trim() + "/metricDefinitions?";
             url = url + "api-version=2014-04-01";
-            url = url + "&$filter=" + Uri.EscapeDataString(filterString.Trim());
+            if (filterString != null)
+            {
+                url = url + "&$filter=" + Uri.EscapeDataString(filterString != null ? filterString.Trim() : "");
+            }
             string baseUrl = this.Client.BaseUri.AbsoluteUri;
             // Trim '/' character from the end of baseUrl and beginning of url.
             if (baseUrl[baseUrl.Length - 1] == '/')